From patchwork Fri Oct 27 18:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13438788 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 DDCDFC25B72 for ; Fri, 27 Oct 2023 18:09:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74BEF6B03E6; Fri, 27 Oct 2023 14:09:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D3DA6B03E7; Fri, 27 Oct 2023 14:09:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59B9E6B03E8; Fri, 27 Oct 2023 14:09:48 -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 4842B6B03E6 for ; Fri, 27 Oct 2023 14:09:48 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 21F761A08F9 for ; Fri, 27 Oct 2023 18:09:48 +0000 (UTC) X-FDA: 81392029656.30.36DE3C1 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 7A4102001F for ; Fri, 27 Oct 2023 18:09:46 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698430186; 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=kps3hoRbmyPaRWG7aZnx7NFq6J9Im7o7f7nMifIm3Cs=; b=KcELRCwb4JsYCY/GJi+AuSOBkXllLXpWbBSEN7vBh09CK46nqRttXBZCCJu1kqauQN2HUc Otf4qFi4OMCCECKhNNvkC0rr7QNvf16yu+o8SVFYVjMwY0eAFXIUnktaonZQt/1aM7hb6c D04h3nobT/Oof1WIV7wPt1SGvlNkuo8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698430186; a=rsa-sha256; cv=none; b=E1rXoG7SuKla4NDMejVQSVo21XILGWo8ClMpJC/HxbrfaSE9JfZoFuGCi2Z+NwRaTYHh93 4ZikJVpOwWezrTJts0aciZ0tcib1WOJMQBHbOPT2x4oGtFewnhST7RbIprgDXsN6UREPfg xd0B5jf/z2TjFMlbOyQrEj4wnjLXhP0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 570A0143D; Fri, 27 Oct 2023 11:10: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 88EF03F64C; Fri, 27 Oct 2023 11:09:43 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@linux.ibm.com, broonie@kernel.org, catalin.marinas@arm.com, dave.hansen@linux.intel.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, shuah@kernel.org, will@kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, James Morse , Suzuki K Poulose , Zenghui Yu Subject: [PATCH v2 17/24] arm64: enable POE and PIE to coexist Date: Fri, 27 Oct 2023 19:08:43 +0100 Message-Id: <20231027180850.1068089-18-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231027180850.1068089-1-joey.gouly@arm.com> References: <20231027180850.1068089-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7A4102001F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: s1anf8wiodmb8o9fyzzn3dshzem4pwdo X-HE-Tag: 1698430186-171295 X-HE-Meta: U2FsdGVkX19EDaZXynRtx6GtkP5ZcPz0Ze4Y+r7qAIIZI7nmFN8XDWmvnvoLBG4GwaCXUqu57AME3O3sfyn5J5bXfUft40WhSCOyl9d2JFXSsDduNqhKuuPg1pPJ+LYB+VCEPsbVK2kHxwJVyBxWyRzA0TQi/EiUZlj4mK7jbgsv0Hn52xJ0JnBaY+cbmXmzYip1RFg/IZgSc7xbglL511jFliJQNumIRtKGKN+I+AEtp/r7OvHHhy5bH/u9iOBD9/TuYbCfvVt097E77pzlPwy9wrDoZWWbeQA+YhjFgZUGvgDQEyB+crk2d5e9G1YUHLi/u9XOkB1T6KRLZXGI+xapwoj2d4disXwF3STDo7IVDghkPp6MkBAo/u+coXGEZLOw/IQxTM3PNiAAAigQom3UVe/87q0Uka7dKQ5zbUV6aVZXWNf2sn4CS8Ry1F3PgTDcl1zkBmnJczZ0BrH75nPXo22rkSMRNWdeOfkhAtDFqsoayoWTGg3eYX1kJ26iIce/tYWEoXLSyW0N1ulpwgXr3N4kKHv6VJyu/4MCIy3fbLEMTNJvQ4c0xHkPxPMGsKmqIsVoK+wglqg+yZvnqsysIO4szPoJTiiS/fZ4AIoBBAGytyfncGUOew3crFIv9Fycysbc/9481z+isfMODJEB3F+Dkb+0q6j+uUweisJVjnVb5TT84tO4Ngaz6AyCbzTPqWmfuPWlYTNVpChw7RbIRrYPSpGbnG6Fl/PFGpHYz92zw/w+Alj5DU1QFiwuOgAFeYKMh8cLKZN0BXsh/9FUi9C5STva6kHRkCfqbYTkJI1Se/KP6HnUyH1I19LTL+JI7QXI8Tvs3oFvtAkgj9ErlLFqr14h5paovMWxchqUHghpFH+8UPiLfW4dkMDwQVnls48kNlr3J+PjfYW7s8JP5Xnsn1v8uB4/D63wIEhXmotDj6NC9/8irWythyoS0DuFtv+fDaSJlEsLQfv jTJn8ceU Ek0ZmKrwQDw0ozfKcmQ7FdPDFqKqp/7AaacjXOqkSFKrHBOsTqrAmaNBl7Ao5iVOV55a4KYNh0H0hcN/bbV9DTS6jScjN3KFCFKosRqR6Hgdz3BCDJhFmjGWn+ytTceQTLfbLDg+HC6tE0xyuhTd7k2t4n4kZ/YTp66c76Kp2XrwqS0QpHIP5JdgWgmLyV0OkkoYPZBNaH1mASHJSQrym8GKg/r6KoWuFwcFe 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 eed814b00a38..06fb944ef252 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -141,10 +141,10 @@ extern bool arm64_use_ng_mappings; #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) | \