From: Connor Williamson <[email protected]> The SNP paths assume every guest_memfd PFN has a struct page and a direct map alias. That is not true for memory handed out by an external guest_memfd provider that backs guest RAM with device or carved-out physical memory (e.g. via mem=), which has no struct page.
Relax the RMP helpers in arch/x86/virt/svm/sev.c: - psmash(): drop the pfn_valid() gate. PSMASH operates on the RMP entry for a physical address and touches neither the direct map nor struct page. - adjust_direct_map(): return 0 instead of -EINVAL for a page-less PFN, which has no direct map alias to split. Checked before the 2M range test, which would otherwise reject the span. - __snp_leak_pages(): compute the struct page per iteration and skip list insertion when it is NULL; a page-less PFN cannot be chained onto the leaked pages list. And the KVM SNP gmem paths in arch/x86/kvm/svm/sev.c: - sev_gmem_map_pfn()/sev_gmem_unmap_pfn() fall back to memremap() for the launch-update copy and the CPUID error read-back in sev_gmem_post_populate(). The destination PFN is mapped before the atomic kmap_local_page() of the source, since memremap() may sleep. - sev_clflush_pfn() falls back to memremap() for the cache flush in sev_gmem_invalidate(). No functional change for page-backed PFNs. Signed-off-by: Connor Williamson <[email protected]> Signed-off-by: David Woodhouse <[email protected]> --- arch/x86/kvm/svm/sev.c | 83 +++++++++++++++++++++++++++++++++++------ arch/x86/virt/svm/sev.c | 27 ++++++++++---- 2 files changed, 90 insertions(+), 20 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 427229347876..2be9e3b80d85 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -12,6 +12,7 @@ #include <linux/kvm_host.h> #include <linux/kernel.h> #include <linux/highmem.h> +#include <linux/io.h> #include <linux/psp.h> #include <linux/psp-sev.h> #include <linux/pagemap.h> @@ -2321,6 +2322,30 @@ struct sev_gmem_populate_args { int fw_error; }; +/* + * Map a guest_memfd PFN for CPU access. A PFN provided by an external + * guest_memfd provider may have no struct page, so fall back to memremap() + * for those. Pair each call with sev_gmem_unmap_pfn(). + */ +static void *sev_gmem_map_pfn(kvm_pfn_t pfn) +{ + if (pfn_valid(pfn)) + return kmap_local_pfn(pfn); + + return memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB); +} + +static void sev_gmem_unmap_pfn(kvm_pfn_t pfn, void *vaddr) +{ + if (!vaddr) + return; + + if (pfn_valid(pfn)) + kunmap_local(vaddr); + else + memunmap(vaddr); +} + static int sev_gmem_post_populate(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, struct page *src_page, void *opaque) { @@ -2343,13 +2368,23 @@ static int sev_gmem_post_populate(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, } if (src_page) { - void *src_vaddr = kmap_local_page(src_page); - void *dst_vaddr = kmap_local_pfn(pfn); + void *dst_vaddr = sev_gmem_map_pfn(pfn); + void *src_vaddr; - memcpy(dst_vaddr, src_vaddr, PAGE_SIZE); + if (!dst_vaddr) { + ret = -ENOMEM; + goto out; + } - kunmap_local(dst_vaddr); + /* + * Map the destination (which may be page-less and thus sleep in + * memremap()) before the atomic kmap_local_page() of the source. + */ + src_vaddr = kmap_local_page(src_page); + memcpy(dst_vaddr, src_vaddr, PAGE_SIZE); kunmap_local(src_vaddr); + + sev_gmem_unmap_pfn(pfn, dst_vaddr); } ret = rmp_make_private(pfn, gfn << PAGE_SHIFT, PG_LEVEL_4K, @@ -2379,14 +2414,17 @@ static int sev_gmem_post_populate(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, if (ret && !snp_page_reclaim(kvm, pfn) && sev_populate_args->type == KVM_SEV_SNP_PAGE_TYPE_CPUID && sev_populate_args->fw_error == SEV_RET_INVALID_PARAM) { - void *src_vaddr = kmap_local_page(src_page); - void *dst_vaddr = kmap_local_pfn(pfn); + void *dst_vaddr = sev_gmem_map_pfn(pfn); + void *src_vaddr; - memcpy(src_vaddr, dst_vaddr, PAGE_SIZE); - set_page_dirty(src_page); + if (dst_vaddr) { + src_vaddr = kmap_local_page(src_page); + memcpy(src_vaddr, dst_vaddr, PAGE_SIZE); + set_page_dirty(src_page); + kunmap_local(src_vaddr); - kunmap_local(dst_vaddr); - kunmap_local(src_vaddr); + sev_gmem_unmap_pfn(pfn, dst_vaddr); + } } out: @@ -5117,6 +5155,28 @@ int sev_gmem_prepare(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order) return 0; } +/* + * Flush the CPU caches for a guest_memfd PFN. A PFN from an external + * guest_memfd provider may have no direct map alias, so fall back to a + * temporary memremap() mapping for the cache flush. + */ +static void sev_clflush_pfn(kvm_pfn_t pfn, size_t size) +{ + void *va; + + if (pfn_valid(pfn)) { + clflush_cache_range(__va(pfn_to_hpa(pfn)), size); + return; + } + + va = memremap(pfn_to_hpa(pfn), size, MEMREMAP_WB); + if (WARN_ON_ONCE(!va)) + return; + + clflush_cache_range(va, size); + memunmap(va); +} + void sev_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) { kvm_pfn_t pfn; @@ -5172,8 +5232,7 @@ void sev_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) * cache entries for these pages before free'ing them back to * the host. */ - clflush_cache_range(__va(pfn_to_hpa(pfn)), - use_2m_update ? PMD_SIZE : PAGE_SIZE); + sev_clflush_pfn(pfn, use_2m_update ? PMD_SIZE : PAGE_SIZE); next_pfn: pfn += use_2m_update ? PTRS_PER_PMD : 1; cond_resched(); diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 8bcdce98f6dc..3623b52fbb11 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -897,8 +897,11 @@ int psmash(u64 pfn) if (!cc_platform_has(CC_ATTR_HOST_SEV_SNP)) return -ENODEV; - if (!pfn_valid(pfn)) - return -EINVAL; + /* + * Do not require a struct page. PSMASH operates on the RMP entry for + * a physical address; a valid PFN with no struct page backing (e.g. + * memory handed out by an external guest_memfd provider) is fine. + */ /* Binutils version 2.36 supports the PSMASH mnemonic. */ asm volatile(".byte 0xF3, 0x0F, 0x01, 0xFF" @@ -953,8 +956,13 @@ static int adjust_direct_map(u64 pfn, int rmp_level) if (WARN_ON_ONCE(rmp_level > PG_LEVEL_2M)) return -EINVAL; + /* + * A PFN with no struct page has no direct map alias to split, so + * there is nothing to do. This is checked before the 2M range test + * below, which would otherwise reject the whole span. + */ if (!pfn_valid(pfn)) - return -EINVAL; + return 0; if (rmp_level == PG_LEVEL_2M && (!IS_ALIGNED(pfn, PTRS_PER_PMD) || !pfn_valid(pfn + PTRS_PER_PMD - 1))) @@ -1060,32 +1068,35 @@ EXPORT_SYMBOL_GPL(rmp_make_shared); void __snp_leak_pages(u64 pfn, unsigned int npages, bool dump_rmp) { - struct page *page = pfn_to_page(pfn); - pr_warn("Leaking PFN range 0x%llx-0x%llx\n", pfn, pfn + npages); spin_lock(&snp_leaked_pages_list_lock); while (npages--) { + struct page *page = pfn_valid(pfn) ? pfn_to_page(pfn) : NULL; /* * Reuse the page's buddy list for chaining into the leaked * pages list. This page should not be on a free list currently * and is also unsafe to be added to a free list. + * + * A page-less PFN (e.g. memory backed by an external + * guest_memfd provider) has no struct page to chain, so it is + * only accounted and, optionally, its RMP entry dumped. */ - if (likely(!PageCompound(page)) || + if (page && + (likely(!PageCompound(page)) || /* * Skip inserting tail pages of compound page as * page->buddy_list of tail pages is not usable. */ - (PageHead(page) && compound_nr(page) <= npages)) + (PageHead(page) && compound_nr(page) <= npages))) list_add_tail(&page->buddy_list, &snp_leaked_pages_list); if (dump_rmp) dump_rmpentry(pfn); snp_nr_leaked_pages++; pfn++; - page++; } spin_unlock(&snp_leaked_pages_list_lock); } -- 2.54.0
