From: Joey Gouly <joey.gouly@arm.com> To: <linux-arm-kernel@lists.infradead.org> Cc: <nd@arm.com>, <akpm@linux-foundation.org>, <aneesh.kumar@linux.ibm.com>, <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> Subject: [PATCH v1 10/20] arm64: mask out POIndex when modifying a PTE Date: Wed, 27 Sep 2023 15:01:13 +0100 [thread overview] Message-ID: <20230927140123.5283-11-joey.gouly@arm.com> (raw) In-Reply-To: <20230927140123.5283-1-joey.gouly@arm.com> When a PTE is modified, the POIndex must be masked off so that it can be modified. Signed-off-by: Joey Gouly <joey.gouly@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> --- arch/arm64/include/asm/pgtable.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7f7d9b1df4e5..98ccfda05716 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -818,9 +818,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) * Normal and Normal-Tagged are two different memory types and indices * in MAIR_EL1. The mask below has to include PTE_ATTRINDX_MASK. */ - const pteval_t mask = PTE_USER | PTE_PXN | PTE_UXN | PTE_RDONLY | + pteval_t mask = PTE_USER | PTE_PXN | PTE_UXN | PTE_RDONLY | PTE_PROT_NONE | PTE_VALID | PTE_WRITE | PTE_GP | - PTE_ATTRINDX_MASK; + PTE_ATTRINDX_MASK | PTE_PO_IDX_MASK; + /* preserve the hardware dirty information */ if (pte_hw_dirty(pte)) pte = set_pte_bit(pte, __pgprot(PTE_DIRTY)); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Joey Gouly <joey.gouly@arm.com> To: <linux-arm-kernel@lists.infradead.org> Cc: <nd@arm.com>, <akpm@linux-foundation.org>, <aneesh.kumar@linux.ibm.com>, <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> Subject: [PATCH v1 10/20] arm64: mask out POIndex when modifying a PTE Date: Wed, 27 Sep 2023 15:01:13 +0100 [thread overview] Message-ID: <20230927140123.5283-11-joey.gouly@arm.com> (raw) In-Reply-To: <20230927140123.5283-1-joey.gouly@arm.com> When a PTE is modified, the POIndex must be masked off so that it can be modified. Signed-off-by: Joey Gouly <joey.gouly@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> --- arch/arm64/include/asm/pgtable.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7f7d9b1df4e5..98ccfda05716 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -818,9 +818,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) * Normal and Normal-Tagged are two different memory types and indices * in MAIR_EL1. The mask below has to include PTE_ATTRINDX_MASK. */ - const pteval_t mask = PTE_USER | PTE_PXN | PTE_UXN | PTE_RDONLY | + pteval_t mask = PTE_USER | PTE_PXN | PTE_UXN | PTE_RDONLY | PTE_PROT_NONE | PTE_VALID | PTE_WRITE | PTE_GP | - PTE_ATTRINDX_MASK; + PTE_ATTRINDX_MASK | PTE_PO_IDX_MASK; + /* preserve the hardware dirty information */ if (pte_hw_dirty(pte)) pte = set_pte_bit(pte, __pgprot(PTE_DIRTY)); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-09-27 14:02 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-27 14:01 [PATCH v1 00/20] Permission Overlay Extension Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 01/20] arm64/sysreg: add system register POR_EL{0,1} Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-05 14:03 ` Mark Brown 2023-10-05 14:03 ` Mark Brown 2023-09-27 14:01 ` [PATCH v1 02/20] arm64/sysreg: update CPACR_EL1 register Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-05 14:02 ` Mark Brown 2023-10-05 14:02 ` Mark Brown 2023-09-27 14:01 ` [PATCH v1 03/20] arm64: cpufeature: add Permission Overlay Extension cpucap Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 04/20] arm64: disable trapping of POR_EL0 to EL2 Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 05/20] arm64: context switch POR_EL0 register Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-04 16:49 ` Catalin Marinas 2023-10-04 16:49 ` Catalin Marinas 2023-10-05 14:14 ` Mark Brown 2023-10-05 14:14 ` Mark Brown 2023-10-10 9:54 ` Joey Gouly 2023-10-10 9:54 ` Joey Gouly 2023-10-10 11:47 ` Mark Brown 2023-10-10 11:47 ` Mark Brown 2023-09-27 14:01 ` [PATCH v1 06/20] KVM: arm64: Save/restore POE registers Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-28 16:47 ` Oliver Upton 2023-09-28 16:47 ` Oliver Upton 2023-09-27 14:01 ` [PATCH v1 07/20] arm64: enable the Permission Overlay Extension for EL0 Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-05 14:17 ` Mark Brown 2023-10-05 14:17 ` Mark Brown 2023-10-05 14:19 ` Mark Brown 2023-10-05 14:19 ` Mark Brown 2023-09-27 14:01 ` [PATCH v1 08/20] arm64: add POIndex defines Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 09/20] arm64: define VM_PKEY_BIT* for arm64 Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-30 11:57 ` kernel test robot 2023-09-30 11:57 ` kernel test robot 2023-10-03 16:51 ` Dave Hansen 2023-10-03 16:51 ` Dave Hansen 2023-09-27 14:01 ` Joey Gouly [this message] 2023-09-27 14:01 ` [PATCH v1 10/20] arm64: mask out POIndex when modifying a PTE Joey Gouly 2023-09-27 14:01 ` [PATCH v1 11/20] arm64: enable ARCH_HAS_PKEYS on arm64 Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-30 13:05 ` kernel test robot 2023-09-30 13:05 ` kernel test robot 2023-09-27 14:01 ` [PATCH v1 12/20] arm64: handle PKEY/POE faults Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 13/20] arm64: stop using generic mm_hooks.h Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 14/20] arm64: implement PKEYS support Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 15/20] arm64: add POE signal support Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-05 14:34 ` Mark Brown 2023-10-05 14:34 ` Mark Brown 2023-10-09 14:49 ` Mark Brown 2023-10-09 14:49 ` Mark Brown 2023-10-10 9:58 ` Joey Gouly 2023-10-10 9:58 ` Joey Gouly 2023-10-10 11:48 ` Mark Brown 2023-10-10 11:48 ` Mark Brown 2023-10-10 9:57 ` Joey Gouly 2023-10-10 9:57 ` Joey Gouly 2023-10-10 11:56 ` Mark Brown 2023-10-10 11:56 ` Mark Brown 2023-09-27 14:01 ` [PATCH v1 16/20] arm64: enable PKEY support for CPUs with S1POE Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 17/20] arm64: enable POE and PIE to coexist Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 18/20] kselftest/arm64: move get_header() Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-09-27 14:01 ` [PATCH v1 19/20] selftests: mm: move fpregs printing Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-03 16:46 ` Dave Hansen 2023-10-03 16:46 ` Dave Hansen 2023-09-27 14:01 ` [PATCH v1 20/20] selftests: mm: make protection_keys test work on arm64 Joey Gouly 2023-09-27 14:01 ` Joey Gouly 2023-10-03 16:46 ` Dave Hansen 2023-10-03 16:46 ` Dave Hansen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230927140123.5283-11-joey.gouly@arm.com \ --to=joey.gouly@arm.com \ --cc=akpm@linux-foundation.org \ --cc=aneesh.kumar@linux.ibm.com \ --cc=catalin.marinas@arm.com \ --cc=dave.hansen@linux.intel.com \ --cc=kvmarm@lists.linux.dev \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=maz@kernel.org \ --cc=nd@arm.com \ --cc=oliver.upton@linux.dev \ --cc=shuah@kernel.org \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.