Skip to content

KVM: Enable mmap() for guest_memfd

Sean Christopherson kvm kvmarm linux-arm-kernel lkml 1 version Applied

Status from this message: Applied to kvm/next, thanks!

Get series with b4
b4 am [email protected]

Versions newest first

  1. v17 Latest24 patches 33 repliesApplied

Changes in v17 from the cover letter

- Collect reviews. [Xiaoyao, David H.]
- Write a better changelog for the CONFIG_KVM_GENERIC_PRIVATE_MEM => CONFIG_HAVE_KVM_ARCH_GMEM_POPULATE rename. [Xiaoyao]
- Correctly gmem_max_mapping_level()'s '0' return in the right patch. [Xiaoyao]
- Replace call to kvm_gmem_get_pfn() with a WARN_ONCE() in the hugepage recovery path. [Ackerley]
- Add back "KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory". [Ackerley]
- Rework the selftest flags testcase to query MMAP support for a given VM type instead of hardcoding expectations in the test. [Sean]
- Add a testcase to verify KVM can map guest_memfd memory into the guest even if the userspace address in the memslot isn't (properly) mmap'd. [Sean]

Patches in v17 Applied

#Subject and filesSizeRepliesApplied
1/24KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GUEST_MEMFDarch/x86/include/asm/kvm_host.h include/linux/kvm_host.h virt/kvm/Kconfig +3 more+17 -170 replies
2/24KVM: x86: Have all vendor neutral sub-configs depend on KVM_X86, not just KVMarch/x86/kvm/Kconfig+8 -81 reply
3/24KVM: x86: Select KVM_GENERIC_PRIVATE_MEM directly from KVM_SW_PROTECTED_VMarch/x86/kvm/Kconfig+1 -11 reply
4/24KVM: x86: Select TDX's KVM_GENERIC_xxx dependencies iff CONFIG_KVM_INTEL_TDX=yarch/x86/kvm/Kconfig+2 -21 reply
5/24KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to CONFIG_HAVE_KVM_ARCH_GMEM_POPULATEarch/x86/kvm/Kconfig include/linux/kvm_host.h virt/kvm/Kconfig +1 more+16 -110 replies
6/24KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem()arch/x86/kvm/mmu/mmu.c arch/x86/kvm/svm/sev.c include/linux/kvm_host.h +1 more+6 -60 replies
7/24KVM: Fix comments that refer to slots_lockinclude/linux/kvm_host.h virt/kvm/kvm_main.c+2 -20 replies
8/24KVM: Fix comment that refers to kvm uapi header pathinclude/linux/kvm_host.h+1 -10 replies
9/24KVM: x86: Enable KVM_GUEST_MEMFD for all 64-bit buildsarch/x86/include/asm/kvm_host.h arch/x86/kvm/Kconfig include/linux/kvm_host.h +1 more+9 -200 replies
10/24KVM: guest_memfd: Add plumbing to host to map guest_memfd pagesarch/x86/kvm/x86.c include/linux/kvm_host.h virt/kvm/guest_memfd.c+85 -00 replies
11/24KVM: guest_memfd: Track guest_memfd mmap support in memslotinclude/linux/kvm_host.h virt/kvm/guest_memfd.c+12 -10 replies
12/24KVM: x86/mmu: Rename .private_max_mapping_level() to .gmem_max_mapping_level()arch/x86/include/asm/kvm-x86-ops.h arch/x86/include/asm/kvm_host.h arch/x86/kvm/mmu/mmu.c +6 more+12 -123 replies
13/24KVM: x86/mmu: Hoist guest_memfd max level/order helpers "up" in mmu.carch/x86/kvm/mmu/mmu.c+36 -362 replies
14/24KVM: x86/mmu: Enforce guest_memfd's max order when recovering hugepagesarch/x86/kvm/mmu/mmu.c arch/x86/kvm/mmu/mmu_internal.h arch/x86/kvm/mmu/tdp_mmu.c+49 -373 replies
15/24KVM: x86/mmu: Extend guest_memfd's max mapping level to shared mappingsarch/x86/include/asm/kvm_host.h arch/x86/kvm/mmu/mmu.c arch/x86/kvm/svm/sev.c +4 more+19 -133 replies
16/24KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memoryarch/x86/kvm/mmu/mmu.c+4 -41 reply
17/24KVM: arm64: Refactor user_mem_abort()arch/arm64/kvm/mmu.c+59 -510 replies
18/24KVM: arm64: Handle guest_memfd-backed guest page faultsarch/arm64/kvm/mmu.c+83 -30 replies
19/24KVM: arm64: nv: Handle VNCR_EL2-triggered faults backed by guest_memfdarch/arm64/kvm/nested.c+35 -60 replies
20/24KVM: arm64: Enable support for guest_memfd backed memoryarch/arm64/kvm/Kconfig arch/arm64/kvm/mmu.c+8 -00 replies
21/24KVM: Allow and advertise support for host mmap() on guest_memfd filesDocumentation/virt/kvm/api.rst include/uapi/linux/kvm.h virt/kvm/guest_memfd.c +1 more+19 -10 replies
22/24KVM: selftests: Do not use hardcoded page sizes in guest_memfd testtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/guest_memfd_test.c+7 -51 reply
23/24KVM: selftests: guest_memfd mmap() test when mmap is supportedtools/testing/selftests/kvm/guest_memfd_test.c+139 -224 replies
24/24KVM: selftests: Add guest_memfd testcase to fault-in on !mmap()'d memorytools/testing/selftests/kvm/guest_memfd_test.c+64 -06 replies

Reviews trailers per patch

All 24 patches have a Reviewed-by or Acked-by.

PatchIra WeinyGavin ShanShivank GargVlastimil BabkaXiaoyao LiDavid HildenbrandAckerley TngMarc ZyngierTao ChanJames HoughtonFuad Tabba
1/24R-b R-b R-b R-b R-b
2/24R-b R-b R-b
3/24R-b R-b R-b
4/24R-b R-b R-b
5/24R-b R-b R-b R-b R-b
6/24R-b R-b R-b R-b R-b
7/24R-b R-b R-b R-b R-b R-b
8/24R-b R-b R-b R-b R-b
9/24R-b R-b
10/24R-b R-b R-b A-b
11/24R-b R-b R-b A-b
12/24R-b A-b R-b
13/24R-b R-b R-b R-b
14/24R-b R-b
15/24R-b R-b R-b
16/24R-b
17/24R-b R-b R-b
18/24R-b R-b R-b
19/24R-b
20/24R-b A-b R-b R-b
21/24R-b R-b R-b R-b
22/24R-b R-b R-b R-b
23/24R-b R-b
24/24R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 11 reviewers.

Read the v17 thread

Cover letter [PATCH v17 00/24] KVM: Enable mmap() for guest_memfd

Paolo,

The arm64 patches have been Reviewed-by Marc, and AFAICT the x86 side of things is a go. Barring a screwup on my end, this just needs your approval.

Assuming everything looks good, it'd be helpful to get this into kvm/next shortly after rc1. The x86 Kconfig changes in particular create semantic conflicts with in-flight series.

Add support for host userspace mapping of guest_memfd-backed memory for VM types that do NOT use support KVM_MEMORY_ATTRIBUTE_PRIVATE (which isn't precisely the same thing as CoCo VMs, since x86's SEV-MEM and SEV-ES have no way to detect private vs. shared).

mmap() support paves the way for several evolving KVM use cases:

* Allows VMMs like Firecracker to run guests entirely backed by guest_memfd [1]. This provides a unified memory management model for both confidential and non-confidential guests, simplifying VMM design.

* Enhanced Security via direct map removal: When combined with Patrick's series for direct map removal [2], this provides additional hardening against Spectre-like transient execution attacks by eliminating the need for host kernel direct maps of guest memory.

* Lays the groundwork for *restricted* mmap() support for guest_memfd-backed memory on CoCo platforms [3] that permit in-place
sharing of guest memory with the host.

Based on kvm/queue.

[1] https://github.com/firecracker-microvm/firecracker/tree/feature/secret-hiding
[2] https://lore.kernel.org/all/[email protected]
[3] https://lore.kernel.org/all/[email protected]

v17:
- Collect reviews. [Xiaoyao, David H.]
- Write a better changelog for the CONFIG_KVM_GENERIC_PRIVATE_MEM => CONFIG_HAVE_KVM_ARCH_GMEM_POPULATE rename. [Xiaoyao]
- Correctly gmem_max_mapping_level()'s '0' return in the right patch. [Xiaoyao]
- Replace call to kvm_gmem_get_pfn() with a WARN_ONCE() in the hugepage recovery path. [Ackerley]
- Add back "KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory". [Ackerley]
- Rework the selftest flags testcase to query MMAP support for a given VM type instead of hardcoding expectations in the test. [Sean]
- Add a testcase to verify KVM can map guest_memfd memory into the guest even if the userspace address in the memslot isn't (properly) mmap'd. [Sean]

v16:
- https://lore.kernel.org/all/[email protected]
- Rework and simplify Kconfig selection and dependencies.
- Always enable guest_memfd for KVM x86 (64-bit) and arm64, which simplifies the enablement checks.
- Based on kvm-x86/next: commit 33f843444e28 ("Merge branch 'vmx'").

v15:
- https://lore.kernel.org/all/[email protected]
- Removed KVM_SW_PROTECTED_VM dependency on KVM_GENERIC_GMEM_POPULATE
- Fixed some commit messages

v14:
- https://lore.kernel.org/all/[email protected]
- Fixed handling of guest faults in case of invalidation in arm64
- Handle VNCR_EL2-triggered faults backed by guest_memfd (arm64 nested virt)
- Applied suggestions from latest feedback
- Rebase on Linux 6.16-rc6

Ackerley Tng (2):
KVM: x86/mmu: Rename .private_max_mapping_level() to
.gmem_max_mapping_level()
KVM: x86/mmu: Handle guest page faults for guest_memfd with shared
memory

Fuad Tabba (15):
KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GUEST_MEMFD
KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to
CONFIG_HAVE_KVM_ARCH_GMEM_POPULATE
KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem()
KVM: Fix comments that refer to slots_lock
KVM: Fix comment that refers to kvm uapi header path
KVM: x86: Enable KVM_GUEST_MEMFD for all 64-bit builds
KVM: guest_memfd: Add plumbing to host to map guest_memfd pages
KVM: guest_memfd: Track guest_memfd mmap support in memslot
KVM: arm64: Refactor user_mem_abort()
KVM: arm64: Handle guest_memfd-backed guest page faults
KVM: arm64: nv: Handle VNCR_EL2-triggered faults backed by guest_memfd
KVM: arm64: Enable support for guest_memfd backed memory
KVM: Allow and advertise support for host mmap() on guest_memfd files
KVM: selftests: Do not use hardcoded page sizes in guest_memfd test
KVM: selftests: guest_memfd mmap() test when mmap is supported

Sean Christopherson (7):
KVM: x86: Have all vendor neutral sub-configs depend on KVM_X86, not
just KVM
KVM: x86: Select KVM_GENERIC_PRIVATE_MEM directly from
KVM_SW_PROTECTED_VM
KVM: x86: Select TDX's KVM_GENERIC_xxx dependencies iff
CONFIG_KVM_INTEL_TDX=y
KVM: x86/mmu: Hoist guest_memfd max level/order helpers "up" in mmu.c
KVM: x86/mmu: Enforce guest_memfd's max order when recovering
hugepages
KVM: x86/mmu: Extend guest_memfd's max mapping level to shared
mappings
KVM: selftests: Add guest_memfd testcase to fault-in on !mmap()'d
memory

 Documentation/virt/kvm/api.rst                |   9 +
 arch/arm64/kvm/Kconfig                        |   1 +
 arch/arm64/kvm/mmu.c                          | 203 +++++++++++----
 arch/arm64/kvm/nested.c                       |  41 ++-
 arch/x86/include/asm/kvm-x86-ops.h            |   2 +-
 arch/x86/include/asm/kvm_host.h               |   6 +-
 arch/x86/kvm/Kconfig                          |  26 +-
 arch/x86/kvm/mmu/mmu.c                        | 142 ++++++-----
 arch/x86/kvm/mmu/mmu_internal.h               |   2 +-
 arch/x86/kvm/mmu/tdp_mmu.c                    |   2 +-
 arch/x86/kvm/svm/sev.c                        |   6 +-
 arch/x86/kvm/svm/svm.c                        |   2 +-
 arch/x86/kvm/svm/svm.h                        |   4 +-
 arch/x86/kvm/vmx/main.c                       |   7 +-
 arch/x86/kvm/vmx/tdx.c                        |   5 +-
 arch/x86/kvm/vmx/x86_ops.h                    |   2 +-
 arch/x86/kvm/x86.c                            |  11 +
 include/linux/kvm_host.h                      |  38 +--
 include/uapi/linux/kvm.h                      |   2 +
 tools/testing/selftests/kvm/Makefile.kvm      |   1 +
 .../testing/selftests/kvm/guest_memfd_test.c  | 236 ++++++++++++++++--
 virt/kvm/Kconfig                              |  15 +-
 virt/kvm/Makefile.kvm                         |   2 +-
 virt/kvm/guest_memfd.c                        |  81 +++++-
 virt/kvm/kvm_main.c                           |  12 +-
 virt/kvm/kvm_mm.h                             |   4 +-
 26 files changed, 648 insertions(+), 214 deletions(-)

base-commit: beafd7ecf2255e8b62a42dc04f54843033db3d24

Signature · 1 line
2.50.1.552.g942d659e1b-goog