From: Fred Griffoul <[email protected]> A guest_memfd backing cannot map a page read-only for the guest: get_pfn() returns only a frame, and KVM_MEM_READONLY is refused on guest_memfd slots. A hypervisor therefore cannot give a guest a page it may read but not write.
Let get_pfn() clear a writable result. The x86 and arm64 fault paths then map the page without write permission, and a guest write exits with KVM_EXIT_MEMORY_FAULT. The result covers the whole block that max_order allows. Callers that hand the page to something that writes it must refuse a read-only page: the arm64 VNCR page and the SEV-SNP VMSA. populate() has no writable result, so a backing cannot report read-only state through it. The result does not cover KVM's own writes through the slot's host address. David's gmem_provider sample gains a read-only ioctl, and a selftest checks that a guest write to such a page exits and lands once the page is writable again. Signed-off-by: Fred Griffoul <[email protected]> --- arch/arm64/kvm/mmu.c | 13 +- arch/arm64/kvm/nested.c | 16 +- arch/x86/kvm/mmu/mmu.c | 18 ++- arch/x86/kvm/svm/sev.c | 13 +- include/linux/kvm_host.h | 16 +- samples/kvm/gmem_provider.c | 67 +++++++- samples/kvm/gmem_provider.h | 17 ++ tools/testing/selftests/kvm/Makefile.kvm | 1 + .../kvm/x86/gmem_provider_readonly_test.c | 150 ++++++++++++++++++ virt/kvm/guest_memfd.c | 21 ++- 10 files changed, 309 insertions(+), 23 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/gmem_provider_readonly_test.c diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 6c941aaa10c6..32e591edc69d 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1607,7 +1607,7 @@ struct kvm_s2_fault_desc { static int gmem_abort(const struct kvm_s2_fault_desc *s2fd) { - bool write_fault, exec_fault; + bool write_fault, exec_fault, writable; bool perm_fault = kvm_vcpu_trap_is_permission_fault(s2fd->vcpu); enum kvm_pgtable_walk_flags flags = KVM_PGTABLE_WALK_SHARED; enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R; @@ -1641,14 +1641,17 @@ static int gmem_abort(const struct kvm_s2_fault_desc *s2fd) /* Pairs with the smp_wmb() in kvm_mmu_invalidate_end(). */ smp_rmb(); - ret = kvm_gmem_get_pfn(kvm, s2fd->memslot, gfn, &pfn, &page, NULL); - if (ret) { + ret = kvm_gmem_get_pfn(kvm, s2fd->memslot, gfn, &pfn, &page, NULL, + &writable); + if (ret || (write_fault && !writable)) { kvm_prepare_memory_fault_exit(s2fd->vcpu, s2fd->fault_ipa, PAGE_SIZE, write_fault, exec_fault, false); - return ret; + if (!ret) + kvm_release_faultin_page(kvm, page, true, false); + return ret ?: -EFAULT; } - if (!(s2fd->memslot->flags & KVM_MEM_READONLY)) + if (!(s2fd->memslot->flags & KVM_MEM_READONLY) && writable) prot |= KVM_PGTABLE_PROT_W; if (s2fd->nested) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index fb54f6dad995..fa86705df949 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -1411,11 +1411,19 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) if (is_error_noslot_pfn(pfn) || (write_fault && !writable)) return -EFAULT; } else { - ret = kvm_gmem_get_pfn(vcpu->kvm, memslot, gfn, &pfn, &page, NULL); - if (ret) { + ret = kvm_gmem_get_pfn(vcpu->kvm, memslot, gfn, &pfn, &page, NULL, + &writable); + /* + * The VNCR page is always written, so a read-only page cannot + * back it. Exit on the first access, even a read, rather than + * map it read-only and fault on the next write. + */ + if (ret || !writable) { kvm_prepare_memory_fault_exit(vcpu, vt->wr.pa, PAGE_SIZE, - write_fault, false, false); - return ret; + true, false, false); + if (!ret) + kvm_release_faultin_page(vcpu->kvm, page, true, false); + return ret ?: -EFAULT; } } diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 234d0a95abf5..f689ef5c2b46 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4612,6 +4612,7 @@ static void kvm_mmu_finish_page_fault(struct kvm_vcpu *vcpu, static int kvm_mmu_faultin_pfn_gmem(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) { + bool writable; int max_order, r; if (!kvm_slot_has_gmem(fault->slot)) { @@ -4620,13 +4621,26 @@ static int kvm_mmu_faultin_pfn_gmem(struct kvm_vcpu *vcpu, } r = kvm_gmem_get_pfn(vcpu->kvm, fault->slot, fault->gfn, &fault->pfn, - &fault->refcounted_page, &max_order); + &fault->refcounted_page, &max_order, &writable); if (r) { kvm_mmu_prepare_memory_fault_exit(vcpu, fault); return r; } - fault->map_writable = !(fault->slot->flags & KVM_MEM_READONLY); + /* + * get_pfn() may clear writable, on top of the memslot's read-only flag: + * a read-only page is mapped read-only, and a guest write to it exits to + * userspace rather than being installed. + */ + fault->map_writable = !(fault->slot->flags & KVM_MEM_READONLY) && + writable; + if (fault->write && !fault->map_writable) { + kvm_mmu_prepare_memory_fault_exit(vcpu, fault); + kvm_release_faultin_page(vcpu->kvm, fault->refcounted_page, + true, false); + fault->refcounted_page = NULL; + return -EFAULT; + } fault->max_level = kvm_max_level_for_order(max_order); return RET_PF_CONTINUE; diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 125779c82bc4..f4f944c7da10 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4026,6 +4026,7 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); struct kvm_memory_slot *slot; struct page *page; + bool writable; kvm_pfn_t pfn; gfn_t gfn; @@ -4063,9 +4064,17 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) * The new VMSA will be private memory guest memory, so retrieve the * PFN from the gmem backend. */ - if (kvm_gmem_get_pfn(vcpu->kvm, slot, gfn, &pfn, &page, NULL)) + if (kvm_gmem_get_pfn(vcpu->kvm, slot, gfn, &pfn, &page, NULL, + &writable)) return; + /* The CPU writes the VMSA on every VMRUN: a read-only page cannot be one. */ + if (!writable) { + if (page) + kvm_release_page_clean(page); + return; + } + /* * From this point forward, the VMSA will always be a guest-mapped page * rather than the initial one allocated by KVM in svm->sev_es.vmsa. In @@ -4996,7 +5005,7 @@ void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) return; } - ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, &page, &order); + ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, &page, &order, NULL); if (ret) { pr_warn_ratelimited("SEV: Unexpected RMP fault, no backing page for private GPA 0x%llx\n", gpa); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 04fa0cb126f6..7281d0e94121 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -649,6 +649,15 @@ static inline bool kvm_slot_has_gmem(const struct kvm_memory_slot *slot) * is responsible for put_page() after use. If *page is left NULL the PFN * is treated as non-refcounted, and its lifetime is owned by the * implementation across bind()/unbind(). + * - *writable, when the caller passes it, is true on entry. Clear it to + * have KVM map the page read-only; a guest write then exits as a memory + * fault. It covers the whole block that *max_order allows, so that block + * must be all writable or all read-only. It applies to stage-2 mappings + * only, not to KVM's own writes through the memslot's host address. A + * caller that hands the page to hardware that writes it passes @writable + * and refuses a read-only page. Only a caller that never writes the page + * itself passes NULL. populate() has no writable result, so KVM cannot + * learn read-only state through it; it is used only to fill a page. * * Memory intended to back guest RAM MUST be reported as E820_TYPE_RAM by the * host so KVM maps it write-back (and applies the memory-encryption bit on @@ -662,7 +671,8 @@ struct kvm_gmem_ops { struct kvm_memory_slot *slot); int (*get_pfn)(struct file *file, struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, - kvm_pfn_t *pfn, struct page **page, int *max_order); + kvm_pfn_t *pfn, struct page **page, int *max_order, + bool *writable); int (*populate)(struct file *file, struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page *src_page, int order); @@ -2651,12 +2661,12 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) #ifdef CONFIG_KVM_GUEST_MEMFD int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order); + int *max_order, bool *writable); #else static inline int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order) + int *max_order, bool *writable) { KVM_BUG_ON(1, kvm); return -EIO; diff --git a/samples/kvm/gmem_provider.c b/samples/kvm/gmem_provider.c index 9728f5a8029b..99b288302d98 100644 --- a/samples/kvm/gmem_provider.c +++ b/samples/kvm/gmem_provider.c @@ -95,6 +95,7 @@ struct gmem_info { gfn_t base_gfn; /* recorded at bind, for revoke */ pgoff_t pgoff; /* provider offset (pages) of the slot */ unsigned long *absent; /* bitmap of currently-revoked pages */ + unsigned long *readonly; /* bitmap of pages the guest may not write */ struct list_head dmabufs; /* struct gmem_dmabuf entries */ struct mutex dmabufs_lock; }; @@ -142,6 +143,22 @@ static int gmem_max_order(struct gmem_info *info, gfn_t gfn, unsigned long index remaining = min(remaining, absent_next - index); } + /* + * Likewise a hugepage must be uniformly writable or uniformly + * read-only: clamp at the next page whose read-only bit differs. + */ + if (info->readonly) { + unsigned long next; + + if (test_bit(index, info->readonly)) + next = find_next_zero_bit(info->readonly, info->npages, + index + 1); + else + next = find_next_bit(info->readonly, info->npages, + index + 1); + remaining = min(remaining, next - index); + } + if (IS_ALIGNED(pfn, 1UL << pud_order) && IS_ALIGNED(gfn, 1UL << pud_order) && remaining >= (1UL << pud_order)) @@ -157,7 +174,8 @@ static int gmem_max_order(struct gmem_info *info, gfn_t gfn, unsigned long index static int gmem_get_pfn(struct file *file, struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, - kvm_pfn_t *pfn, struct page **page, int *max_order) + kvm_pfn_t *pfn, struct page **page, int *max_order, + bool *writable) { struct gmem_info *info = to_gmem_info(file); pgoff_t index = gfn - slot->base_gfn + slot->gmem.pgoff; @@ -172,6 +190,8 @@ static int gmem_get_pfn(struct file *file, struct kvm *kvm, *pfn = info->base_pfn + index; if (max_order) *max_order = gmem_max_order(info, gfn, index); + if (writable) + *writable = !(info->readonly && test_bit(index, info->readonly)); return 0; } @@ -371,6 +391,7 @@ static void gmem_release(struct file *file) if (info->cma_pages) free_contig_range(info->base_pfn, info->npages); kvfree(info->absent); + kvfree(info->readonly); kfree(info); module_put(THIS_MODULE); } @@ -581,6 +602,46 @@ static long gmem_fd_ioctl(struct file *file, unsigned int cmd, unsigned long arg if (cmd == GMEM_PROVIDER_GET_DMABUF) return gmem_provider_get_dmabuf(file); + if (cmd == GMEM_PROVIDER_SET_READONLY) { + struct gmem_provider_readonly r; + unsigned long clamped_start; + + if (copy_from_user(&r, (void __user *)arg, sizeof(r))) + return -EFAULT; + if (!r.len || !PAGE_ALIGNED(r.offset) || !PAGE_ALIGNED(r.len) || + r.pad) + return -EINVAL; + start_index = r.offset >> PAGE_SHIFT; + end_index = start_index + (r.len >> PAGE_SHIFT); + if (end_index > info->npages || end_index < start_index) + return -EINVAL; + + /* + * Flip the bits, then drop the guest's existing mappings of the + * range so the next access re-faults through get_pfn() and + * picks up the new permission. Making a range read-only must + * tear down writable mappings; making it writable again is + * also invalidated so a stale read-only mapping does not keep + * exiting. + */ + mutex_lock(&info->lock); + if (r.readonly) + bitmap_set(info->readonly, start_index, + end_index - start_index); + else + bitmap_clear(info->readonly, start_index, + end_index - start_index); + clamped_start = max_t(unsigned long, start_index, info->pgoff); + if (info->kvm && end_index > clamped_start) + kvm_gmem_invalidate_range(info->kvm, + info->base_gfn + clamped_start - + info->pgoff, + info->base_gfn + end_index - + info->pgoff); + mutex_unlock(&info->lock); + return 0; + } + if (cmd != GMEM_PROVIDER_SET_PRESENT) return -ENOTTY; if (copy_from_user(&p, (void __user *)arg, sizeof(p))) @@ -694,7 +755,8 @@ static long gmem_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long ar info->absent = kvzalloc(BITS_TO_LONGS(info->npages) * sizeof(unsigned long), GFP_KERNEL); - if (!info->absent) { + info->readonly = kvzalloc_objs(unsigned long, BITS_TO_LONGS(info->npages)); + if (!info->absent || !info->readonly) { ret = -ENOMEM; goto err_free_pages; } @@ -733,6 +795,7 @@ static long gmem_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long ar free_contig_range(page_to_pfn(pages), npages); err_free_info: kvfree(info->absent); + kvfree(info->readonly); kfree(info); err_put_kvm: kvm_put_kvm(kvm); diff --git a/samples/kvm/gmem_provider.h b/samples/kvm/gmem_provider.h index 45f1b8257f60..51b49ef9a3c5 100644 --- a/samples/kvm/gmem_provider.h +++ b/samples/kvm/gmem_provider.h @@ -41,6 +41,23 @@ struct gmem_provider_present { #define GMEM_PROVIDER_SET_PRESENT _IOW(GMEM_PROVIDER_IOCTL_BASE, 2, struct gmem_provider_present) +/* + * ioctl on a provider fd: make a byte range read-only for the guest, or + * writable again. KVM maps a read-only page without write permission and a + * guest write to it exits to userspace with KVM_EXIT_MEMORY_FAULT. Existing + * mappings of the range are dropped so the change takes effect on the next + * access. + */ +struct gmem_provider_readonly { + __u64 offset; /* byte offset into the provider region, page aligned */ + __u64 len; /* byte length, page aligned */ + __u32 readonly; /* 1 = guest may not write, 0 = guest may write */ + __u32 pad; +}; + +#define GMEM_PROVIDER_SET_READONLY \ + _IOW(GMEM_PROVIDER_IOCTL_BASE, 4, struct gmem_provider_readonly) + /* * ioctl on a provider fd (returned by SETUP): export the backing region as a * dynamic dma-buf and return an fd for it, suitable for diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm index 12004a487c32..4d7082448cea 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -81,6 +81,7 @@ TEST_GEN_PROGS_x86 += x86/fix_hypercall_test TEST_GEN_PROGS_x86 += x86/gmem_provider_test TEST_GEN_PROGS_x86 += x86/gmem_provider_hugepage_test TEST_GEN_PROGS_x86 += x86/gmem_provider_revoke_test +TEST_GEN_PROGS_x86 += x86/gmem_provider_readonly_test TEST_GEN_PROGS_x86 += x86/gmem_provider_iommufd_test TEST_GEN_PROGS_x86 += x86/gmem_provider_vfio_test TEST_GEN_PROGS_x86 += x86/hwcr_msr_test diff --git a/tools/testing/selftests/kvm/x86/gmem_provider_readonly_test.c b/tools/testing/selftests/kvm/x86/gmem_provider_readonly_test.c new file mode 100644 index 000000000000..c3eedba7a16d --- /dev/null +++ b/tools/testing/selftests/kvm/x86/gmem_provider_readonly_test.c @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * gmem_provider_readonly_test - exercise per-range read-only from a provider. + * + * Marks a provider-backed page read-only via an ioctl on the provider fd and + * checks that KVM honours the provider's answer: the guest can still read the + * page, a guest write exits to userspace with KVM_EXIT_MEMORY_FAULT rather than + * landing, and clearing the bit lets the write through. This is the mechanism + * a hypervisor uses to protect a page it shares with the guest, such as a + * sidecar's info page, without giving up the mapping. + * + * The test opens the provider with GMEM_PROVIDER_FLAG_MMAP_CAPABLE at SETUP time + * (gmem-only). Load the module with a backing region of at least DATA_SIZE. + */ +#include <fcntl.h> +#include <errno.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/mman.h> + +#include "test_util.h" +#include "kvm_util.h" +#include "processor.h" + +/* Mirrors samples/kvm/gmem_provider.h */ +struct gmem_provider_setup { + __s32 kvm_fd; + __u32 flags; + __u64 size; +}; + +struct gmem_provider_readonly { + __u64 offset; + __u64 len; + __u32 readonly; + __u32 pad; +}; + +#define GMEM_PROVIDER_SETUP _IOW('G', 1, struct gmem_provider_setup) +#define GMEM_PROVIDER_FLAG_MMAP_CAPABLE (1u << 0) +#define GMEM_PROVIDER_SET_READONLY _IOW('G', 4, struct gmem_provider_readonly) + +#define DATA_SLOT 10 +#define DATA_GPA (1ULL << 32) +#define DATA_SIZE 0x200000ULL /* 2 MiB region */ +#define MAGIC 0x1234abcdULL +#define MAGIC2 0xfeedf00dULL + +/* + * Phase 1: read the page and report it. + * Phase 2: write to it. With the page read-only this never returns to the + * guest until userspace clears the bit; then it completes and the + * guest reports what it wrote. + */ +static void guest_code(void) +{ + GUEST_SYNC(*(volatile uint64_t *)DATA_GPA); + *(volatile uint64_t *)DATA_GPA = MAGIC2; + GUEST_SYNC(*(volatile uint64_t *)DATA_GPA); + GUEST_DONE(); +} + +int main(void) +{ + struct vm_shape shape = { + .mode = VM_MODE_DEFAULT, + .type = KVM_X86_SW_PROTECTED_VM, + }; + struct gmem_provider_setup setup = { .flags = GMEM_PROVIDER_FLAG_MMAP_CAPABLE }; + struct gmem_provider_readonly req; + struct kvm_vcpu *vcpu; + struct kvm_vm *vm; + struct ucall uc; + int gmem_ctl, gmem_fd, r; + void *hva; + + TEST_REQUIRE(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM)); + + gmem_ctl = open("/dev/gmem_provider", O_RDWR); + __TEST_REQUIRE(gmem_ctl >= 0, + "gmem_provider module not loaded (/dev/gmem_provider absent)"); + + vm = vm_create_shape_with_one_vcpu(shape, &vcpu, guest_code); + + setup.kvm_fd = vm->fd; + setup.size = DATA_SIZE; + gmem_fd = ioctl(gmem_ctl, GMEM_PROVIDER_SETUP, &setup); + TEST_ASSERT(gmem_fd >= 0, "GMEM_PROVIDER_SETUP failed, errno %d", errno); + + hva = mmap(NULL, DATA_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, gmem_fd, 0); + TEST_ASSERT(hva != MAP_FAILED, "mmap(provider) failed, errno %d", errno); + + r = __vm_set_user_memory_region2(vm, DATA_SLOT, KVM_MEM_GUEST_MEMFD, + DATA_GPA, DATA_SIZE, hva, gmem_fd, 0); + TEST_ASSERT(!r, "KVM_SET_USER_MEMORY_REGION2 failed: %d errno %d", r, errno); + virt_map(vm, DATA_GPA, DATA_GPA, 1); + + /* Seed the page from the host before the guest ever touches it. */ + *(volatile uint64_t *)hva = MAGIC; + + /* 1) Make the page read-only for the guest. */ + req = (struct gmem_provider_readonly){ .offset = 0, .len = 4096, .readonly = 1 }; + r = ioctl(gmem_fd, GMEM_PROVIDER_SET_READONLY, &req); + TEST_ASSERT(!r, "set readonly ioctl failed, errno %d", errno); + + /* 2) Guest read must still work and see the host's value. */ + vcpu_run(vcpu); + TEST_ASSERT(get_ucall(vcpu, &uc) == UCALL_SYNC, "expected UCALL_SYNC"); + TEST_ASSERT(uc.args[1] == MAGIC, "guest read 0x%lx, want MAGIC", + (unsigned long)uc.args[1]); + pr_info("read-only: guest read 0x%llx\n", MAGIC); + + /* 3) Guest write must exit to userspace, not land. */ + r = _vcpu_run(vcpu); + TEST_ASSERT(r == -1 && errno == EFAULT && + vcpu->run->exit_reason == KVM_EXIT_MEMORY_FAULT, + "read-only write: expected KVM_EXIT_MEMORY_FAULT (r=%d errno=%d exit_reason=%u %s)", + r, errno, vcpu->run->exit_reason, + exit_reason_str(vcpu->run->exit_reason)); + TEST_ASSERT(*(volatile uint64_t *)hva == MAGIC, + "guest write landed on a read-only page: host sees 0x%lx", + (unsigned long)*(volatile uint64_t *)hva); + pr_info("read-only: guest write exited with KVM_EXIT_MEMORY_FAULT, page unchanged\n"); + + /* 4) Make it writable again; the retried write must complete. */ + req.readonly = 0; + r = ioctl(gmem_fd, GMEM_PROVIDER_SET_READONLY, &req); + TEST_ASSERT(!r, "clear readonly ioctl failed, errno %d", errno); + + vcpu_run(vcpu); + TEST_ASSERT(get_ucall(vcpu, &uc) == UCALL_SYNC, "expected UCALL_SYNC after clear"); + TEST_ASSERT(uc.args[1] == MAGIC2, "after clear guest read 0x%lx, want MAGIC2", + (unsigned long)uc.args[1]); + TEST_ASSERT(*(volatile uint64_t *)hva == MAGIC2, + "host sees 0x%lx after guest write, want MAGIC2", + (unsigned long)*(volatile uint64_t *)hva); + pr_info("writable: guest write 0x%llx landed -- read-only path works\n", MAGIC2); + + vcpu_run(vcpu); + TEST_ASSERT(get_ucall(vcpu, &uc) == UCALL_DONE, "expected UCALL_DONE"); + + kvm_vm_free(vm); + munmap(hva, DATA_SIZE); + close(gmem_fd); + close(gmem_ctl); + return 0; +} diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index d284bb70fe05..a509f1a96c0b 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -624,7 +624,7 @@ static void kvm_gmem_native_unbind(struct file *slot_file, struct kvm *kvm, static int kvm_gmem_native_get_pfn(struct file *file, struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order); + int *max_order, bool *writable); static void kvm_gmem_native_release(struct file *file); static int kvm_gmem_native_mmap(struct file *file, struct vm_area_struct *vma); @@ -988,7 +988,7 @@ static struct folio *__kvm_gmem_get_pfn(struct file *file, static int kvm_gmem_native_get_pfn(struct file *file, struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order) + int *max_order, bool *writable) { pgoff_t index = kvm_gmem_get_index(slot, gfn); struct folio *folio; @@ -1016,7 +1016,7 @@ static int kvm_gmem_native_get_pfn(struct file *file, struct kvm *kvm, int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, - int *max_order) + int *max_order, bool *writable) { const struct kvm_gmem_ops *ops; @@ -1029,7 +1029,10 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, return -EFAULT; *page = NULL; - return ops->get_pfn(file, kvm, slot, gfn, pfn, page, max_order); + if (writable) + *writable = true; + return ops->get_pfn(file, kvm, slot, gfn, pfn, page, max_order, + writable); } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_gmem_get_pfn); @@ -1080,6 +1083,7 @@ static int kvm_gmem_populate_one(const struct kvm_gmem_ops *ops, void *opaque) { struct page *ignored_page = NULL; + bool writable = true; kvm_pfn_t pfn; int ret; @@ -1093,10 +1097,17 @@ static int kvm_gmem_populate_one(const struct kvm_gmem_ops *ops, src_page, 0); else ret = ops->get_pfn(file, kvm, slot, gfn, &pfn, - &ignored_page, NULL); + &ignored_page, NULL, &writable); if (ret) return ret; + /* post_populate() writes the page, so it cannot be read-only. */ + if (!writable) { + if (ignored_page) + put_page(ignored_page); + return -EPERM; + } + ret = post_populate(kvm, gfn, pfn, src_page, opaque); /*
