kvm: arm64: allow the VM to select DEVICE_* and NORMAL_NC for IO memory
Subsystems (6)
v4 cover kvm: arm64: allow the VM to select DEVICE_* and NORMAL_NC for IO memory
From: Ankit Agrawal <[email protected]>
Currently, KVM for ARM64 maps at stage 2 memory that is considered device (i.e. it is not RAM) with DEVICE_nGnRE memory attributes; this setting overrides (as per the ARM architecture [1]) any device MMIO mapping present at stage 1, resulting in a set-up whereby a guest operating system cannot determine device MMIO mapping memory attributes on its own but it is always overridden by the KVM stage 2 default.
This set-up does not allow guest operating systems to select device memory attributes independently from KVM stage-2 mappings (refer to [1], "Combining stage 1 and stage 2 memory type attributes"), which turns out to be an issue in that guest operating systems (e.g. Linux) may request to map devices MMIO regions with memory attributes that guarantee better performance (e.g. gathering attribute - that for some devices can generate larger PCIe memory writes TLPs) and specific operations (e.g. unaligned transactions) such as the NormalNC memory type.
The default device stage 2 mapping was chosen in KVM for ARM64 since it was considered safer (i.e. it would not allow guests to trigger uncontained failures ultimately crashing the machine) but this turned out to be asynchronous (SError) defeating the purpose.
Failures containability is a property of the platform and is independent from the memory type used for MMIO device memory mappings.
Actually, DEVICE_nGnRE memory type is even more problematic than Normal-NC memory type in terms of faults containability in that e.g. aborts triggered on DEVICE_nGnRE loads cannot be made, architecturally, synchronous (i.e. that would imply that the processor should issue at most 1 load transaction at a time - it cannot pipeline them - otherwise the synchronous abort semantics would break the no-speculation attribute attached to DEVICE_XXX memory).
This means that regardless of the combined stage1+stage2 mappings a platform is safe if and only if device transactions cannot trigger uncontained failures and that in turn relies on platform capabilities and the device type being assigned (i.e. PCIe AER/DPC error containment and RAS architecture[3]); therefore the default KVM device stage 2 memory attributes play no role in making device assignment safer for a given platform (if the platform design adheres to design guidelines outlined in [3]) and therefore can be relaxed.
For all these reasons, relax the KVM stage 2 device memory attributes from DEVICE_nGnRE to Normal-NC.
The NormalNC was chosen over a different Normal memory type default at stage-2 (e.g. Normal Write-through) to avoid cache allocation/snooping.
Relaxing S2 KVM device MMIO mappings to Normal-NC is not expected to trigger any issue on guest device reclaim use cases either (i.e. device MMIO unmap followed by a device reset) at least for PCIe devices, in that in PCIe a device reset is architected and carried out through PCI config space transactions that are naturally ordered with respect to MMIO transactions according to the PCI ordering rules.
Having Normal-NC S2 default puts guests in control (thanks to stage1+stage2 combined memory attributes rules [1]) of device MMIO regions memory mappings, according to the rules described in [1] and summarized here ([(S1) - stage1], [(S2) - stage 2]):
S1 | S2 | Result NORMAL-WB | NORMAL-NC | NORMAL-NC NORMAL-WT | NORMAL-NC | NORMAL-NC NORMAL-NC | NORMAL-NC | NORMAL-NC DEVICE<attr> | NORMAL-NC | DEVICE<attr>
It is worth noting that currently, to map devices MMIO space to user space in a device pass-through use case the VFIO framework applies memory attributes derived from pgprot_noncached() settings applied to VMAs, which result in device-nGnRnE memory attributes for the stage-1 VMM mappings.
This means that a userspace mapping for device MMIO space carried out with the current VFIO framework and a guest OS mapping for the same MMIO space may result in a mismatched alias as described in [2].
Defaulting KVM device stage-2 mappings to Normal-NC attributes does not change anything in this respect, in that the mismatched aliases would only affect (refer to [2] for a detailed explanation) ordering between the userspace and GuestOS mappings resulting stream of transactions (i.e. it does not cause loss of property for either stream of transactions on its own), which is harmless given that the userspace and GuestOS access to the device is carried out through independent transactions streams.
Generalizing to other devices may be problematic. E.g. GICv2 VCPU interface, which is effectively a shared peripheral, can allow a guest to affect another guest's interrupt distribution. Hence limit the change to VFIO PCI as caution. This is achieved by making the VFIO PCI core module set a flag that is tested by KVM to activate the code. This could be extended to other devices in the future once that is deemed safe.
[1] section D8.5 - DDI0487J_a_a-profile_architecture_reference_manual.pdf
[2] section B2.8 - DDI0487J_a_a-profile_architecture_reference_manual.pdf
[3] sections 1.7.7.3/1.8.5.2/appendix C - DEN0029H_SBSA_7.1.pdf
Applied over next-20231211
History
=======
v3 -> v4
- Moved the vfio-pci change to use the VM_VFIO_ALLOW_WC into separate patch.
- Added check to warn on the case NORMAL_NC and DEVICE are set simultaneously.
- Fixed miscellaneous nitpicks suggested in v3.
v2 -> v3
- Added a new patch (and converted to patch series) suggested by Catalin Marinas to ensure the code changes are restricted to VFIO PCI devices.
- Introduced VM_VFIO_ALLOW_WC flag for VFIO PCI to communicate with VMM.
- Reverted GIC mapping to DEVICE.
v1 -> v2
- Updated commit log to the one posted by
Lorenzo Pieralisi <[email protected]> (Thanks!)
- Added new flag to represent the NORMAL_NC setting. Updated stage2_set_prot_attr() to handle new flag.
v3 Link:
https://lore.kernel.org/all/[email protected]/
Ankit Agrawal (3):
kvm: arm64: introduce new flag for non-cacheable IO memory
kvm: arm64: set io memory s2 pte as normalnc for vfio pci devices
vfio: convey kvm that the vfio-pci device is wc safe
arch/arm64/include/asm/kvm_pgtable.h | 2 ++ arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/kvm/hyp/pgtable.c | 13 +++++++++++-- arch/arm64/kvm/mmu.c | 18 ++++++++++++++---- drivers/vfio/pci/vfio_pci_core.c | 3 ++- include/linux/mm.h | 13 +++++++++++++ 6 files changed, 44 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/3 kvm: arm64: introduce new flag for non-cacheable IO memory
From: Ankit Agrawal <[email protected]>
For various reasons described in the cover letter, and primarily to allow VM get IO memory with NORMALNC properties, it is desired to relax the KVM stage 2 device memory attributes from DEVICE_nGnRE to NormalNC. So set S2 PTE for IO memory as NORMAL_NC.
A Normal-NC flag is not present today. So add a new kvm_pgtable_prot (KVM_PGTABLE_PROT_NORMAL_NC) flag for it, along with its corresponding PTE value 0x5 (0b101) determined from [1].
Lastly, adapt the stage2 PTE property setter function (stage2_set_prot_attr) to handle the NormalNC attribute.
[1] section D8.5.5 of DDI0487J_a_a-profile_architecture_reference_manual.pdf
--- arch/arm64/include/asm/kvm_pgtable.h | 2 ++ arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/kvm/hyp/pgtable.c | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_pgtable.h +2 -0
@@ -197,6 +197,7 @@ enum kvm_pgtable_stage2_flags {* @KVM_PGTABLE_PROT_W: Write permission. * @KVM_PGTABLE_PROT_R: Read permission. * @KVM_PGTABLE_PROT_DEVICE: Device attributes. +* @KVM_PGTABLE_PROT_NORMAL_NC: Normal noncacheable attributes. * @KVM_PGTABLE_PROT_SW0: Software bit 0. * @KVM_PGTABLE_PROT_SW1: Software bit 1. * @KVM_PGTABLE_PROT_SW2: Software bit 2.
@@ -208,6 +209,7 @@ enum kvm_pgtable_prot {KVM_PGTABLE_PROT_R =BIT (2 ),KVM_PGTABLE_PROT_DEVICE =BIT (3 ), +KVM_PGTABLE_PROT_NORMAL_NC =BIT (4 ),KVM_PGTABLE_PROT_SW0 =BIT (55 ), KVM_PGTABLE_PROT_SW1 = BIT(56),
arch/arm64/include/asm/memory.h +2 -0
@@ -147,6 +147,7 @@* Memory types for Stage-2 translation */ #define MT_S2_NORMAL 0xf +#define MT_S2_NORMAL_NC 0x5#define MT_S2_DEVICE_nGnRE 0x1/*
@@ -154,6 +155,7 @@* Stage-2 enforces Normal-WB and Device-nGnRE */ #define MT_S2_FWB_NORMAL 6 +#define MT_S2_FWB_NORMAL_NC 5#define MT_S2_FWB_DEVICE_nGnRE 1#ifdef CONFIG_ARM64_4K_PAGES
arch/arm64/kvm/hyp/pgtable.c +11 -2
@@ -718,10 +718,19 @@ static int stage2_set_prot_attr(struct kvm_pgtable *pgt, enum kvm_pgtable_prot p kvm_pte_t *ptep) {bool device = prot &KVM_PGTABLE_PROT_DEVICE ; -kvm_pte_t attr = device ?KVM_S2_MEMATTR (pgt, DEVICE_nGnRE) : -KVM_S2_MEMATTR (pgt,NORMAL ); +bool normal_nc = prot &KVM_PGTABLE_PROT_NORMAL_NC ; +kvm_pte_t attr;u32 sh =KVM_PTE_LEAF_ATTR_LO_S2_SH_IS ; +WARN_ON_ONCE (device && normal_nc); + +if (device) + attr =KVM_S2_MEMATTR (pgt, DEVICE_nGnRE); +else if (normal_nc) + attr =KVM_S2_MEMATTR (pgt,NORMAL_NC ); +else + attr =KVM_S2_MEMATTR (pgt,NORMAL ); +if (!(prot &KVM_PGTABLE_PROT_X )) attr |=KVM_PTE_LEAF_ATTR_HI_S2_XN ;else if (device)
Signature · 1 line
2.17.1
Marc Zyngier
maintainerRe: [PATCH v4 1/3] kvm: arm64: introduce new flag for non-cacheable IO memory
Quoted 4 lines · On Mon, 18 Dec 2023 09:07:17 +0000, <[email protected]> wrote:
From: Ankit Agrawal <[email protected]>
For various reasons described in the cover letter, and primarily to
Well, the cover letter does not end-up in the git tree, so you must put some actual information here.
Quoted 76 lines
allow VM get IO memory with NORMALNC properties, it is desired to relax the KVM stage 2 device memory attributes from
DEVICE_nGnREto NormalNC. So set S2 PTE for IO memory asNORMAL_NC.A Normal-NC flag is not present today. So add a new
kvm_pgtable_prot(KVM_PGTABLE_PROT_NORMAL_NC) flag for it, along with its corresponding PTE value0x5(0b101) determined from [1].Lastly, adapt the stage2 PTE property setter function (
stage2_set_prot_attr) to handle the NormalNC attribute.[1] section D8.5.5 of DDI0487J_a_a-profile_architecture_reference_manual.pdf
Signed-off-by Ankit Agrawal <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>Acked-by Catalin Marinas <[email protected]>Tested-by Ankit Agrawal <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 2 ++ arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/kvm/hyp/pgtable.c | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +2
-0@@ -197,6 +197,7 @@ enum kvm_pgtable_stage2_flags {* @KVM_PGTABLE_PROT_W: Write permission. * @KVM_PGTABLE_PROT_R: Read permission. * @KVM_PGTABLE_PROT_DEVICE: Device attributes. +* @KVM_PGTABLE_PROT_NORMAL_NC: Normal noncacheable attributes. * @KVM_PGTABLE_PROT_SW0: Software bit 0. * @KVM_PGTABLE_PROT_SW1: Software bit 1. * @KVM_PGTABLE_PROT_SW2: Software bit 2. @@ -208,6 +209,7 @@ enum kvm_pgtable_prot {KVM_PGTABLE_PROT_R =BIT (2 ),KVM_PGTABLE_PROT_DEVICE =BIT (3 ), +KVM_PGTABLE_PROT_NORMAL_NC =BIT (4 ),KVM_PGTABLE_PROT_SW0 =BIT (55 ), KVM_PGTABLE_PROT_SW1 = BIT(56),arch/arm64/include/asm/memory.h +2
-0@@ -147,6 +147,7 @@* Memory types for Stage-2 translation */ #define MT_S2_NORMAL 0xf +#define MT_S2_NORMAL_NC 0x5#define MT_S2_DEVICE_nGnRE 0x1/* @@ -154,6 +155,7 @@* Stage-2 enforces Normal-WB and Device-nGnRE */ #define MT_S2_FWB_NORMAL 6 +#define MT_S2_FWB_NORMAL_NC 5#define MT_S2_FWB_DEVICE_nGnRE 1#ifdef CONFIG_ARM64_4K_PAGES arch/arm64/kvm/hyp/pgtable.c +2
-2@@ -718,10 +718,19 @@ static int stage2_set_prot_attr(struct kvm_pgtable *pgt, enum kvm_pgtable_prot p kvm_pte_t *ptep) {bool device = prot &KVM_PGTABLE_PROT_DEVICE ; -kvm_pte_t attr = device ?KVM_S2_MEMATTR (pgt, DEVICE_nGnRE) : -KVM_S2_MEMATTR (pgt,NORMAL ); +bool normal_nc = prot &KVM_PGTABLE_PROT_NORMAL_NC ; +kvm_pte_t attr;u32 sh =KVM_PTE_LEAF_ATTR_LO_S2_SH_IS ;
arch/arm64/kvm/hyp/pgtable.c static int stage2_set_prot_attr(struct kvm_pgtable *pgt, enum kvm_pgtable_prot p · line 733
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +9
-0+WARN_ON_ONCE (device && normal_nc); + +if (device) + attr =KVM_S2_MEMATTR (pgt, DEVICE_nGnRE); +else if (normal_nc) + attr =KVM_S2_MEMATTR (pgt,NORMAL_NC ); +else + attr =KVM_S2_MEMATTR (pgt,NORMAL ); +
This whole thing can be written a bit more elegantly:
switch (prot & (KVM_PGTABLE_PROT_DEVICE |
KVM_PGTABLE_PROT_NORMAL_NC)) {
case 0:
attr = KVM_S2_MEMATTR(pgt, NORMAL);
break;
case KVM_PGTABLE_PROT_DEVICE:
if (prot & KVM_PGTABLE_PROT_X)
return -EINVAL;
attr = KVM_S2_MEMATTR(pgt, DEVICE_nGnRE);
break;
case KVM_PGTABLE_PROT_NORMAL_NC:
attr = KVM_S2_MEMATTR(pgt, NORMAL_NC);
break;
default:
WARN_ON_ONCE(1);
}and you can get rid of all of the boolean crud.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH v4 2/3 kvm: arm64: set io memory s2 pte as normalnc for vfio pci devices
In reply to [email protected]From: Ankit Agrawal <[email protected]>
To provide VM with the ability to get device IO memory with NormalNC property, map device MMIO in KVM for ARM64 at stage2 as NormalNC. Having NormalNC S2 default puts guests in control (based on [1], "Combining stage 1 and stage 2 memory type attributes") of device MMIO regions memory mappings. The rules are summarized below:
([(S1) - stage1], [(S2) - stage 2])
S1 | S2 | Result NORMAL-WB | NORMAL-NC | NORMAL-NC NORMAL-WT | NORMAL-NC | NORMAL-NC NORMAL-NC | NORMAL-NC | NORMAL-NC DEVICE<attr> | NORMAL-NC | DEVICE<attr>
Generalizing this to non PCI devices may be problematic. E.g. GICv2 vCPU interface, which is effectively a shared peripheral, can allow a guest to affect another guest's interrupt distribution. The issue may be solved by limiting the relaxation to mappings that have a user VMA. Still There is insufficient information and uncertainity in the behavior of non PCI driver. Hence caution is maintained and the change is restricted to the VFIO-PCI devices. PCIe on the other hand is safe because the PCI bridge does not generate errors, and thus do not cause uncontained failures.
A new flag VM_VFIO_ALLOW_WC to indicate KVM that the device is WC capable. KVM use this flag to activate the code.
This could be extended to other devices in the future once that is deemed safe.
[1] section D8.5.5 of DDI0487J_a_a-profile_architecture_reference_manual.pdf
--- arch/arm64/kvm/mmu.c | 18 ++++++++++++++---- include/linux/mm.h | 13 +++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-)
arch/arm64/kvm/mmu.c +14 -4
@@ -1381,7 +1381,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,int ret =0 ;bool write_fault, writable, force_pte = false;bool exec_fault, mte_allowed; -bool device = false; +bool device = false, vfio_allow_wc = false;unsigned long mmu_seq;struct kvm *kvm = vcpu->kvm;struct kvm_mmu_memory_cache *memcache = &vcpu->arch.mmu_page_cache;
@@ -1472,6 +1472,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, gfn = fault_ipa >>PAGE_SHIFT ; mte_allowed =kvm_vma_mte_allowed (vma); + vfio_allow_wc = (vma->vm_flags &VM_VFIO_ALLOW_WC ); +/* Don't use the VMA after the unlock -- it may have vanished */ vma =NULL ;
@@ -1557,10 +1559,18 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,if (exec_fault) prot |=KVM_PGTABLE_PROT_X ; -if (device) - prot |=KVM_PGTABLE_PROT_DEVICE ; -else if (cpus_have_final_cap (ARM64_HAS_CACHE_DIC )) +if (device) { +/* +* To provide VM with the ability to get device IO memory +* with NormalNC property, map device MMIO as NormalNC in S2. +*/ +if (vfio_allow_wc) + prot |=KVM_PGTABLE_PROT_NORMAL_NC ; +else + prot |=KVM_PGTABLE_PROT_DEVICE ; + }else if (cpus_have_final_cap (ARM64_HAS_CACHE_DIC )) { prot |=KVM_PGTABLE_PROT_X ; + }/* * Under the premise of getting a FSC_PERM fault, we just need to relax
include/linux/mm.h +13 -0
@@ -391,6 +391,19 @@ extern unsigned int kobjsize(const void *objp);# define VM_UFFD_MINOR VM_NONE#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ +/* This flag is used to connect VFIO to arch specific KVM code. It +* indicates that the memory under this VMA is safe for use with any +* non-cachable memory type inside KVM. Some VFIO devices, on some +* platforms, are thought to be unsafe and can cause machine crashes if +* KVM does not lock down the memory type. +*/ +#ifdef CONFIG_64BIT +#define VM_VFIO_ALLOW_WC_BIT 39 +#define VM_VFIO_ALLOW_WC BIT(VM_VFIO_ALLOW_WC_BIT) +#else +#define VM_VFIO_ALLOW_WC VM_NONE +#endif +/* Bits set in the VMA until the stack is in its final location */ #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)
Signature · 1 line
2.17.1
Marc Zyngier
maintainerRe: [PATCH v4 2/3] kvm: arm64: set io memory s2 pte as normalnc for vfio pci devices
Quoted 92 lines · On Mon, 18 Dec 2023 09:07:18 +0000, <[email protected]> wrote:
From: Ankit Agrawal <[email protected]>
To provide VM with the ability to get device IO memory with NormalNC property, map device MMIO in KVM for ARM64 at stage2 as NormalNC. Having NormalNC S2 default puts guests in control (based on [1], "Combining stage 1 and stage 2 memory type attributes") of device MMIO regions memory mappings. The rules are summarized below:
([(S1) - stage1], [(S2) - stage 2])S1 | S2 | Result NORMAL-WB | NORMAL-NC | NORMAL-NC NORMAL-WT | NORMAL-NC | NORMAL-NC NORMAL-NC | NORMAL-NC | NORMAL-NC DEVICE<attr> | NORMAL-NC | DEVICE<attr>Generalizing this to non PCI devices may be problematic. E.g. GICv2 vCPU interface, which is effectively a shared peripheral, can allow a guest to affect another guest's interrupt distribution. The issue may be solved by limiting the relaxation to mappings that have a user VMA. Still There is insufficient information and uncertainity in the behavior of non PCI driver. Hence caution is maintained and the change is restricted to the VFIO-PCI devices. PCIe on the other hand is safe because the PCI bridge does not generate errors, and thus do not cause uncontained failures.
A new flag
VM_VFIO_ALLOW_WCto indicate KVM that the device is WC capable. KVM use this flag to activate the code.This could be extended to other devices in the future once that is deemed safe.
[1] section D8.5.5 of DDI0487J_a_a-profile_architecture_reference_manual.pdf
Signed-off-by Ankit Agrawal <[email protected]>Suggested-by Catalin Marinas <[email protected]>Acked-by Jason Gunthorpe <[email protected]>Tested-by Ankit Agrawal <[email protected]>--- arch/arm64/kvm/mmu.c | 18 ++++++++++++++---- include/linux/mm.h | 13 +++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-)arch/arm64/kvm/mmu.c +14
-4@@ -1381,7 +1381,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,int ret =0 ;bool write_fault, writable, force_pte = false;bool exec_fault, mte_allowed; -bool device = false; +bool device = false, vfio_allow_wc = false;unsigned long mmu_seq;struct kvm *kvm = vcpu->kvm;struct kvm_mmu_memory_cache *memcache = &vcpu->arch.mmu_page_cache;@@ -1472,6 +1472,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, gfn = fault_ipa >>PAGE_SHIFT ; mte_allowed =kvm_vma_mte_allowed (vma); + vfio_allow_wc = (vma->vm_flags &VM_VFIO_ALLOW_WC ); +/* Don't use the VMA after the unlock -- it may have vanished */ vma =NULL ;@@ -1557,10 +1559,18 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,if (exec_fault) prot |=KVM_PGTABLE_PROT_X ; -if (device) - prot |=KVM_PGTABLE_PROT_DEVICE ; -else if (cpus_have_final_cap (ARM64_HAS_CACHE_DIC )) +if (device) { +/* +* To provide VM with the ability to get device IO memory +* with NormalNC property, map device MMIO as NormalNC in S2. +*/ +if (vfio_allow_wc) + prot |=KVM_PGTABLE_PROT_NORMAL_NC ; +else + prot |=KVM_PGTABLE_PROT_DEVICE ; + }else if (cpus_have_final_cap (ARM64_HAS_CACHE_DIC )) { prot |=KVM_PGTABLE_PROT_X ; + }/* * Under the premise of getting a FSC_PERM fault, we just need to relax include/linux/mm.h +0
-0
include/linux/mm.h extern unsigned int kobjsize(const void *objp); · line 399
Quoted 9 lines
include/linux/mm.h +6
-0@@ -391,6 +391,19 @@ extern unsigned int kobjsize(const void *objp);# define VM_UFFD_MINOR VM_NONE#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ +/* This flag is used to connect VFIO to arch specific KVM code. It +* indicates that the memory under this VMA is safe for use with any +* non-cachable memory type inside KVM. Some VFIO devices, on some +* platforms, are thought to be unsafe and can cause machine crashes if +* KVM does not lock down the memory type. +*/
Comment format.
include/linux/mm.h extern unsigned int kobjsize(const void *objp); · line 408
Quoted 9 lines
include/linux/mm.h +7
-0+#ifdef CONFIG_64BIT +#define VM_VFIO_ALLOW_WC_BIT 39 +#define VM_VFIO_ALLOW_WC BIT(VM_VFIO_ALLOW_WC_BIT) +#else +#define VM_VFIO_ALLOW_WC VM_NONE +#endif +/* Bits set in the VMA until the stack is in its final location */ #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)
The mm.h change should be standalone, separate from the KVM stuff.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH v4 3/3 vfio: convey kvm that the vfio-pci device is wc safe
In reply to [email protected]From: Ankit Agrawal <[email protected]>
The code to map the MMIO in S2 as NormalNC is enabled when conveyed that the device is WC safe using a new flag VM_VFIO_ALLOW_WC.
Make vfio-pci set the VM_VFIO_ALLOW_WC flag.
--- drivers/vfio/pci/vfio_pci_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_core.c +2 -1
@@ -1863,7 +1863,8 @@ int vfio_pci_core_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma* See remap_pfn_range(), called from vfio_pci_fault() but we can't * change vm_flags within the fault handler. Set them now. */ -vm_flags_set (vma,VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ); +vm_flags_set (vma,VM_VFIO_ALLOW_WC |VM_IO |VM_PFNMAP | +VM_DONTEXPAND |VM_DONTDUMP ); vma->vm_ops = &vfio_pci_mmap_ops;return 0 ;
Signature · 1 line
2.17.1
Marc Zyngier
maintainerQuoted 2 lines · On Mon, 18 Dec 2023 09:07:16 +0000, <[email protected]> wrote:
From: Ankit Agrawal <[email protected]>
[...]
Quoted 1 line
Applied over next-20231211
In the future, please post patches that are generated against a tag from Linus' tree. The usual wisdom is to use -rc3 as the base.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.