From nobody Fri Jun 17 19:36:57 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5D23A85A4B3; Fri, 17 Jun 2022 19:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPq6x1p7Sz3PPH; Fri, 17 Jun 2022 19:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7UXKGAMFsABayUK0NxLgAIkQSARrUi2BZ3gUDzrmns=; b=aB5G7ViNSKB2OSzSXpu5dYgKJ1f1q6KUaSaNYwSjA6WkE7FQYxI9GXFshXfOl93A0+2GQJ h1b//d4c7feccZarnjE+KA8y/ATF4mGtoaKYD8wmv9iV6XlSmjvSwbE5jqkL24kJht82TL e53SBnpnmXHPPT/ghK8Pcb3dNC8WoK63BY7V7etQig9Y8IeMQ64Bi4I1zrLsQdCKLuDmRi YwIWdQ0+J1dVN/f9QvqkglWPNPo7wBnVH2dUbmijjBA9Nvo4ISqoP09SAln9g38tzq6NyD rJwB5/UrHq9Pa0bJn9dXY+KZ6RwltKwAptShFMPH1ObKmDsSzTac/P8TD5Ssyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B06625AB0; Fri, 17 Jun 2022 19:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJavur012703; Fri, 17 Jun 2022 19:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJavEi012702; Fri, 17 Jun 2022 19:36:57 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:36:57 GMT Message-Id: <202206171936.25HJavEi012702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 213f60737fa7 - stable/13 - linprocfs: Fixup vDSO name in the procmaps after 9931033bbf. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 213f60737fa72d2df5dd70003846d8eeec5640c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7UXKGAMFsABayUK0NxLgAIkQSARrUi2BZ3gUDzrmns=; b=QDkqvPpzoTwQYAgHSbT6GaZGRWa6vm9jVK8SXHu9VA1CziKrI0UFX+WGwCliCPti/ch2RA trGklIlG1nuXAUmt2HXfEm2fezlI9lBXEKbl1N8Il34fkRPbAhJ1n62YwuBc+oKqNV8CUZ o8ET1YupgQSr3u0QSl0XZkQ2S6KG+6T3QbOvTIcHKG+XrGR4a3bs9QFAwGDWYPDbFbM+qb W92tm1Qtb1xz9BDqXvxNsLLW5nLSg+M7bLAA6mn3pE6jT19fOIknbbi+gZHfdTpxoshmwx GT/ERhfTNTxP1sAH1YtYq08eYr0ilKacZwNhWgFHeyOitf8rBZ4zVcbQCP5q2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494617; a=rsa-sha256; cv=none; b=U0xzYux69HoeEeEFIHZCqOB9NcO5Pu34FLLN+TWW6Tjnqu/SDF6Ipgn6VQAZ9qrRVzZIrB OoJZJRrzYeKuNS3xc3afA0TP3t68Dbnnt5NJd2gB+EgDUPecegxeTSeVC3vs3krtvOanjj kAkmb8Vsvf+F2Q/XIq1GzW/dN2keIU9EB/9n+f/O7E4j+bajW1Ms1Wo2HYc1ewRw5XCGDQ PoNWodak4QKMOAZnd310GTL6QdfQMiRGN4bWwMYFNTc4PAweIfZoySkPNiuiQ6iDmeNgG5 LCxqOcuPb1uNME3BHxA2YqDNOr7v2V0bUmBSJTbMeSEtyatOlzWXv9pkkY/o0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=213f60737fa72d2df5dd70003846d8eeec5640c0 commit 213f60737fa72d2df5dd70003846d8eeec5640c0 Author: Dmitry Chagin AuthorDate: 2021-07-20 07:04:20 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:08 +0000 linprocfs: Fixup vDSO name in the procmaps after 9931033bbf. As the sv_shared_page_base now pointed out to the native sharedpage and the process VA layout has changed as follows: VDSOPAGE (2 * PAGE_SIZE) SHAREDPAGE (PAGE_SIZE) USRSTACK fixup the vDSO name by calculating the start of page relative to the native sharedpage. Differential revision: https://reviews.freebsd.org/D30903 MFC after: 2 weeks (cherry picked from commit fe7409530c5420c739aee72b3dfd036c05628a2c) --- sys/compat/linprocfs/linprocfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 27acd7d651a7..42e1b5e075d3 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1342,7 +1342,13 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) ino = vat.va_fileid; vput(vp); } else if (SV_PROC_ABI(p) == SV_ABI_LINUX) { - if (e_start == p->p_sysent->sv_shared_page_base) + /* + * sv_shared_page_base pointed out to the + * FreeBSD sharedpage, PAGE_SIZE is a size + * of it. The vDSO page is above. + */ + if (e_start == p->p_sysent->sv_shared_page_base + + PAGE_SIZE) name = vdso_str; if (e_end == p->p_sysent->sv_usrstack) name = stack_str;