diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-12-05 15:38:24 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-12-05 15:38:24 +0100 |
| commit | 382b5b87a97d0958d0ee7d1f2a56df3c6e431770 (patch) | |
| tree | 2499fab7d5a7ed825b302f42010b777b06241ec5 /fs | |
| parent | Merge branch kvm-arm64/pkvm-vcpu-state into kvmarm-master/next (diff) | |
| parent | Documentation: document the ABI changes for KVM_CAP_ARM_MTE (diff) | |
| download | linux-382b5b87a97d0958d0ee7d1f2a56df3c6e431770.tar.xz linux-382b5b87a97d0958d0ee7d1f2a56df3c6e431770.zip | |
Merge branch kvm-arm64/mte-map-shared into kvmarm-master/next
* kvm-arm64/mte-map-shared:
: .
: Update the MTE support to allow the VMM to use shared mappings
: to back the memslots exposed to MTE-enabled guests.
:
: Patches courtesy of Catalin Marinas and Peter Collingbourne.
: .
: Fix a number of issues with MTE, such as races on the tags
: being initialised vs the PG_mte_tagged flag as well as the
: lack of support for VM_SHARED when KVM is involved.
:
: Patches from Catalin Marinas and Peter Collingbourne.
: .
Documentation: document the ABI changes for KVM_CAP_ARM_MTE
KVM: arm64: permit all VM_MTE_ALLOWED mappings with MTE enabled
KVM: arm64: unify the tests for VMAs in memslots when MTE is enabled
arm64: mte: Lock a page for MTE tag initialisation
mm: Add PG_arch_3 page flag
KVM: arm64: Simplify the sanitise_mte_tags() logic
arm64: mte: Fix/clarify the PG_mte_tagged semantics
mm: Do not enable PG_arch_2 for all 64-bit architectures
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/page.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/page.c b/fs/proc/page.c index f2273b164535..6249c347809a 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -219,8 +219,9 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_PRIVATE_2, PG_private_2); u |= kpf_copy_bit(k, KPF_OWNER_PRIVATE, PG_owner_priv_1); u |= kpf_copy_bit(k, KPF_ARCH, PG_arch_1); -#ifdef CONFIG_64BIT +#ifdef CONFIG_ARCH_USES_PG_ARCH_X u |= kpf_copy_bit(k, KPF_ARCH_2, PG_arch_2); + u |= kpf_copy_bit(k, KPF_ARCH_3, PG_arch_3); #endif return u; |