From patchwork Fri May 3 13:01:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47530C4345F for ; Fri, 3 May 2024 13:03:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C69066B00B2; Fri, 3 May 2024 09:03:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF3F46B00B3; Fri, 3 May 2024 09:03:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6AC96B00B4; Fri, 3 May 2024 09:03:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 85DA26B00B2 for ; Fri, 3 May 2024 09:03:04 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3AE3E140F7E for ; Fri, 3 May 2024 13:03:04 +0000 (UTC) X-FDA: 82077099888.13.05CF97B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id 8B90E1C001B for ; Fri, 3 May 2024 13:03:02 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741382; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eB19ddR2DWz24xNZl612MbQy7DTD7VV83qSPNmMAQnc=; b=oVJRmTCKawHcAaE2qVS84LmqgBGdBHXSjdAMywfisw7lKC4y1nillVfOuHpd56TeCUR9R/ 65FTiIxocRj46Lvslt7Iks/pzPd1wScCve7/5rQsN+VWWSRqhjMhu9cXt/B14NLSgmF/A9 8XVlrjd25RCog36OiSMaeCy+d9h/GPg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741382; a=rsa-sha256; cv=none; b=mRQgG2j6+utlRK26luJdhr9rpL7YMQaoS1ckk7I/dPiiAp8QcKVOdlKc5LJYgzlivPnk71 l2O8eciI95Q8Vi+Tqig+LyACI+4/1P/W5VW3N00eHDakf1BCp9iu9Km7A2aL5H7TgINLZZ jR8ZxeOboc7tHgo/FiyQBpE0TnVQRSg= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2499E1758; Fri, 3 May 2024 06:03:27 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C7F013F73F; Fri, 3 May 2024 06:02:58 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 20/29] arm64: enable POE and PIE to coexist Date: Fri, 3 May 2024 14:01:38 +0100 Message-Id: <20240503130147.1154804-21-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Stat-Signature: t7k1654kjxapi4mnc6cxfifsrwyea1ro X-Rspamd-Queue-Id: 8B90E1C001B X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714741382-629576 X-HE-Meta: U2FsdGVkX19WVjQzAmeUKxJmP43YlEXXZnjES0xwCb2shk/X8Psu3b0cDph8oPk1ft4FKH2mEQX328DDbkvrxKi6kP8huiDTWv4FvHMXbFt59lNaSHowY4VNWumaXDDtvL9Pi/jHdahuTlx9g5RNpUhrrAN97hG1qKfjRUkpZCd+jgdEmsfa6NdtNS63kU2169GxTkBucN8LtX8sJWoSC7Xy9eqPO/U1qF5xcpGGnaM3A9eX9pQck89n0079T8+X7dL88KpYz0+m/6XnoMC+t9iO4gdzoiKMv5NNQdMbDsxBYcW79EWqzWJi8EvWxrLZ7UWf0ZD7cmgGhvTmPzDm5w7kZolEuVNtZsK2baUBS7gMbyrId2GAywIQ2YVcniu5Y9DTm9niUZ7dMJkhuNkcHLMwnVM6wDz8Ssfna13L5s7y0HvHusuUxp606ChstXcaA+ZrmXvrolxpAlUYE6JcN4VYNbz6YPnC/ZJ4llTKH17VWDBarch6NCCc9ZwAiq1vGwoIK0GIWpiU6bL9VCBOPFbgxSigTX9VAa8z7Im7saG+LIVgyJLhbnBS8IsmfmMrj44GUF4LiVGVc/Or6MwvuonnTxalizcYs9xcoDm8PFRYIBrhu53E3lfQ1T/tYgPTOfi1dPc5akxIvUGbwfURPEyYGW9WJF2Z46OtBNZncjxCSh6WuhSeQJjnS+7bveI8uljqvqj+0VQ12ZaZGfZqe2RnWCrRIvYn5cqnRcJtaHxfNQ1Z5JKgWM9xxO6PDNUdOQLsWbOuoYzjr1oudwPEX7xEZQPgG6GSBSOm1bWdHDaBdEQkg9GxG89nutUV1tLrthTRPQVsG0FTIIctDduf4fdf0AES0mxMVI6aPgPh8JQfsCHAP1D978nAOCc1TNND5y/BNQa1vEFA/0MMNwwO3ugMJZTAPkNe9U85F9SEs3n4DkUDoDakFMJ6QaTgxQVI9/vZ/tTOnZi62i6vzZR p9T0w4X6 NAt9MFu4KjTb2b2Ut6xA1iI4qrZb80B6kOEbDb5jMGirzrLCw+HJN8w4Va6KEWO0kEhEyRD5nmRGpv8nAZo1RC7MVxm5tQ18VlE67g8ktPm8aIytHQG74MoaTgFVWLwGJArFGFDDSahoxFvQuAjsrny0tcLYFUvbps/jTC2EP9EHtFn+iDMNLNmuCOyIyaK7adzwbIRwuzxcNGlLxqiI8yRFtABBNZ5gQEe2z X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Set the EL0/userspace indirection encodings to be the overlay enabled variants of the permissions. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/pgtable-prot.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index dd9ee67d1d87..4f9f85437d3d 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -147,10 +147,10 @@ static inline bool __pure lpa2_is_enabled(void) #define PIE_E0 ( \ PIRx_ELx_PERM(pte_pi_index(_PAGE_EXECONLY), PIE_X_O) | \ - PIRx_ELx_PERM(pte_pi_index(_PAGE_READONLY_EXEC), PIE_RX) | \ - PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED_EXEC), PIE_RWX) | \ - PIRx_ELx_PERM(pte_pi_index(_PAGE_READONLY), PIE_R) | \ - PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED), PIE_RW)) + PIRx_ELx_PERM(pte_pi_index(_PAGE_READONLY_EXEC), PIE_RX_O) | \ + PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED_EXEC), PIE_RWX_O) | \ + PIRx_ELx_PERM(pte_pi_index(_PAGE_READONLY), PIE_R_O) | \ + PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED), PIE_RW_O)) #define PIE_E1 ( \ PIRx_ELx_PERM(pte_pi_index(_PAGE_EXECONLY), PIE_NONE_O) | \