From nobody Fri Jun 17 19:32:12 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 8CEA485409D; Fri, 17 Jun 2022 19:32:13 +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 4LPq1T0dqfz3KHP; Fri, 17 Jun 2022 19:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494333; 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=MSxoJmLTGKtIhnl2Cz62GFdScSf5HV7vS6DZ4mKM3AI=; b=Qh8JH4IGT7ho2S8Fjmdf0VG2P4tl5+l6jKuawgL6fnXIsj2jgKLqdyPdou5e0U5YfPsM3u hXcxMj94Jx79sZpmAxBo40RG2bot0V4/EuqB8ClQmKSLq629P6EgTCuaadAT/f+9RwSY32 ympDtxuXTsIqIJv6b0zcAGfgA/UsPRO4D8zmlsbI2GtgpdK/+JNc116wuomnjjM3vC/1N5 ILD5bxvO28yYOCxW04/nzwwEmp/408JQeEP0SiS0ohCr7jh2gni8GG0WFG5IxL8x+J0wlD o3MIjUa5aZhVm5oVvZ6wq/cIds6LirTTWBs9l0N0guBqOnv+5Bep7bxv2l5UIA== 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 CC0BE25668; Fri, 17 Jun 2022 19:32:12 +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 25HJWC9i008167; Fri, 17 Jun 2022 19:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJWCDb008166; Fri, 17 Jun 2022 19:32:12 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:12 GMT Message-Id: <202206171932.25HJWCDb008166@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: a13f21b252e8 - stable/13 - linux(4): Make vDSO defines private. 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: a13f21b252e8f943968262f0397b88cd4c8f486d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494333; 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=MSxoJmLTGKtIhnl2Cz62GFdScSf5HV7vS6DZ4mKM3AI=; b=xAOgiYaxw5EUsRM0Wy/CsZIx+uvZsdBAiCDxIlaC7tQOYoGsdjgMuyCT9+QgC/f5jSs9gx Gnf8tmt19shiqDsO1LMMjRJoMemmAVXxKEashG2NdgVWLK5dTLoKV8vKXtkFeiOG3ITfIn l8iKFTGaRdjBNQA5Q+5sIoCDCZt0b6y0c57CrXB1Y1Ev6uE5TId2NPk99a2/IbXPBUhti1 BmN7gskTpMeQMze/E1fSYkemhzvUKbIe+yKDlWYy/ow5Y5lw3JYd7Q22iVGf6belwcvlk3 hPhbEKxJ+BUe37d0ScJL8/YTP2IGVKoYbfPriVSX54KxPP2PVPV9EmMU8kUh1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494333; a=rsa-sha256; cv=none; b=uM+hIHWqRW3Xlhj0a9DXjg8VIrGD/CUBOj34bMstR8wACej4moPwhxtti/srT+riK7yF3F MPs/3lIhd80Yg7U25cu0XCghXb4I4p2X75XhdNYWzFDUEYJfbBbxK2pITmJQJRZS+Pd8Ky Q4x2EtwJ9cAyaZwprurO8CAvVrwGD1nmLekMctOHH2I6KZq7DQ3kF/Br4W2rxwEousO8hE 2aMFdIErgL+hu6Wo54fbybL67AKvuM8woD8+sWvKEKZ3CZNutaKF5Rie4425n3U2E5kGuh 6rl1fqE/bA2jQJP2g4Ge9WQ45+C7EdLsEyc0Db7UJ6brxVQ11Ou3ixgF5uQvxw== 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=a13f21b252e8f943968262f0397b88cd4c8f486d commit a13f21b252e8f943968262f0397b88cd4c8f486d Author: Dmitry Chagin AuthorDate: 2021-06-25 15:41:04 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:24 +0000 linux(4): Make vDSO defines private. Hide the vDSO defines to the linux32_sysvec as they are not intended to be used outside of it. Fix LINUX32_PS_STRINGS, use the size of struct linux32_ps_strings instead of a numeric constant. MFC after: 2 weeks (cherry picked from commit 4aae133469c6bc4ace55bc54eee552971e37e1c4) --- sys/amd64/linux32/linux.h | 6 ------ sys/amd64/linux32/linux32_sysvec.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index a95545619640..8d7a36eedee9 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -44,12 +44,6 @@ #define LINUX_DTRACE linuxulator32 -#define LINUX32_MAXUSER ((1ul << 32) - PAGE_SIZE) -#define LINUX32_SHAREDPAGE (LINUX32_MAXUSER - PAGE_SIZE) -#define LINUX32_USRSTACK LINUX32_SHAREDPAGE - -/* XXX 16 = sizeof(linux32_ps_strings) */ -#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - 16) #define LINUX32_MAXDSIZ (512 * 1024 * 1024) /* 512MB */ #define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ #define LINUX32_MAXVMEM 0 /* Unlimited */ diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 2670f9ff7b83..13ba0c883c42 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -90,6 +90,10 @@ __FBSDID("$FreeBSD$"); MODULE_VERSION(linux, 1); +#define LINUX32_MAXUSER ((1ul << 32) - PAGE_SIZE) +#define LINUX32_SHAREDPAGE (LINUX32_MAXUSER - PAGE_SIZE) +#define LINUX32_USRSTACK LINUX32_SHAREDPAGE + static int linux_szsigcode; static vm_object_t linux_shared_page_obj; static char *linux_shared_page_mapping; @@ -158,6 +162,8 @@ struct linux32_ps_strings { u_int32_t ps_envstr; /* first of 0 or more environment strings */ u_int ps_nenvstr; /* the number of environment strings */ }; +#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - \ + sizeof(struct linux32_ps_strings)) LINUX_VDSO_SYM_INTPTR(linux32_sigcode); LINUX_VDSO_SYM_INTPTR(linux32_rt_sigcode);