From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FD3CC3ABCC for ; Tue, 13 May 2025 16:35:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79FA26B00D9; Tue, 13 May 2025 12:34:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FD0F6B00DA; Tue, 13 May 2025 12:34:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52F776B00DB; Tue, 13 May 2025 12:34:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 252B26B00D9 for ; Tue, 13 May 2025 12:34:57 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8C00C1A1125 for ; Tue, 13 May 2025 16:34:58 +0000 (UTC) X-FDA: 83438433876.19.D0C9FCD Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf01.hostedemail.com (Postfix) with ESMTP id ABAF740007 for ; Tue, 13 May 2025 16:34:56 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=jMyuFdm2; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3r3QjaAUKCG4fMNNMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3r3QjaAUKCG4fMNNMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154096; a=rsa-sha256; cv=none; b=SAtfWofy3xj0vklHt6dn2lm/7hkv8WXO/MByPhWz1wcGRElfcDVLlLAFH1GklDMisgBsZe UBMCx79PXfymPQaUxRB3euVzNV5aegpqmlmPxmQOFoF66+HOkddnKOoKjKdblsJJgVa8H+ M+wG2i2Xyhnw3j28RQ3cpv5yxbQc7jA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=jMyuFdm2; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3r3QjaAUKCG4fMNNMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3r3QjaAUKCG4fMNNMSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747154096; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xkiFt+XKx4YC9meq4bLaztuX851NYA6IvyxpfbaNDQM=; b=07hFNXhbE3wKIu9evKuqtvxJfFq6/118jdkMXAUKOG0+dKhWSjsbQeNiaEvfq4sGuO8Ymp /TFroPwchtFK1v20XF/l8RTX92Cqr+LqLW+qxDZ1rzXtw+6BFbm97osarUfRZ96KVUYwR+ mngfxIk+p1558YWH1t0vr73ojMdB2Sw= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cf44b66f7so33780705e9.1 for ; Tue, 13 May 2025 09:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154095; x=1747758895; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xkiFt+XKx4YC9meq4bLaztuX851NYA6IvyxpfbaNDQM=; b=jMyuFdm2ANAH3MOGIY1iRkfL1ZZJ58hMwSRTOip+BFxV/jYVGTiqyta9Eojb/D3avN X2ibyi2xv6DocyTkRnxdJUZvTCtDnt/bidsYCM8lsuJvUq81GYTlwbah/pgjNpRlP8s2 6xEwJemVnm81Ziahp9mhQf/+z6jyg9NqfwjEunE3pXepPwqv//UAjyxlOYrLecwPGwgL Ri5PCOFD0/FKakesDZ4O53snhg/JfVZ2iRfaML3QW3k0RTsjiy5kGPT0+4XjCPTxY2wz 7YdgWMBZxocWOHEL7jqWtZXGT5X1ZJibfiROmWTO/zOA4GQbWPmWnEU3XjGQL1U6U2vn r7lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154095; x=1747758895; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xkiFt+XKx4YC9meq4bLaztuX851NYA6IvyxpfbaNDQM=; b=ZOTo0XsmUtGD3gbfSfhFAyB8HQACz9Mt+XH5EqvdvoZh34GxZ+hOXITUZBxwK4PJWX dhwC7cNCwOR6p5O5TMQL7eDcfWwvFLRh+rUwdMPX6xnB8wmH9ywURerz+RUbZlev/JiX BSHt1Z6UCiNng4kRuD+QIFHZEpg5HeD2UsWCVE9kxmJwqMhB/hg/KnBDBbIQQSvBwYUi uISI/HGrdJFLYWQBG99Cbba+q6t72AC+5db6rGcaeCXy9ro7ZESq+Nr84cw8aLIgPsii +gjb7DcVxxjQ9y8W6uEEhVRmKUB3PnfFHr8s8sbkjeYkEFwLXaSO7BEJYWlSkC7D+Exm n7Pw== X-Forwarded-Encrypted: i=1; AJvYcCVfOLGSGX3Evpa4+0q73mTBHbpxFgDk8arfhDZnw3wZKeGwWQFtOshncIgVuaCsnw45ei9YCYdHqw==@kvack.org X-Gm-Message-State: AOJu0YzSQozzNlRuWzeLSqtYE8frN2TUGgoRIOd7FOa/sIiEsOYUab47 vg7Pmi+fGE6ecHDw8IRVVoErmgzhL8/w6+DN5kDuKt/iFZEku1FDZQcwT4t8uH4SLxoA0vLVhg= = X-Google-Smtp-Source: AGHT+IGk8P+g3Nky7G3LvDTMmaXIQqyx5KcRTmLSnZLAUVXgBl74CjtJPqg5mc0nuUkEH/vJ4M6wl6DNcA== X-Received: from wmrn17.prod.google.com ([2002:a05:600c:5011:b0:43d:abd:278f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e48:b0:43d:172:50b1 with SMTP id 5b1f17b1804b1-442d6ddd1e1mr156690615e9.29.1747154095335; Tue, 13 May 2025 09:34:55 -0700 (PDT) Date: Tue, 13 May 2025 17:34:28 +0100 In-Reply-To: <20250513163438.3942405-1-tabba@google.com> Mime-Version: 1.0 References: <20250513163438.3942405-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <20250513163438.3942405-8-tabba@google.com> Subject: [PATCH v9 07/17] KVM: guest_memfd: Allow host to map guest_memfd() pages From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: ABAF740007 X-Rspam-User: X-Stat-Signature: s7ndzyzxip3ie67zfozortptzrxjcdxk X-HE-Tag: 1747154096-943613 X-HE-Meta: U2FsdGVkX1+Fl/aYUOvi+dlbY3AAj2A1kQjwI0sQbwJfFqAAqD6L3OZK1gk+Cr4ghGaidcTU0XY83logKDuluUapi7F23THZHX7azlvxsLtjhtc6Q0BBdExoMMhUc6gdyYNOZg8WfX0s1JTI77g1VEyr9N+2+E5qjdsQq6+dh5GOCIjRWEtXiwiwTLmATDfemauKUoNG3WW5EIi3BFLCyUbtl/qHAs2F/3eSPDLApqOpWZVdnzRb9yzeTK3dsSBLrggejVlfCP09Y+/NFjxTQ47gVus/lcpqJymh6wKKXHyoSrCHCkUttkIloKbuKlaSuI/fLCR/qb93Ryzj0MOeB1onWQY++yJ9m6tZHuRQYWF4ofAcQN9kpbm9ZgzV77QnA+lZqryDCtsT742rY9LNBp+zbmY5YUxAQHO+u9Na+pseYwTItoS5Bvvz1pHWiUiEMAA1M04rfhvhFd+oKn7u0PlyJEprd0aWDq3FgeRodfu0k5Ph1Lf/6KeWbhK4jeb8Rff07xWnUhVZXxdAL3dHNwAOFQBts07EypjcD4Sbqrfj/QAKXXDaCJJzHsQVjuuwdyVYgHn7vfuv4Fe3rIYmqVKUh2nnCYhxVkoZt/x0B0Dbs4nl6tfypA7JQwSlMRpzYhbR8t1lWCTsGpg47OfWzA3t3H+e/3e9vTRFQe70lMgdDz3Y/pUGUEbYjJtca39jGgN233i20TIiP78MmNiRxMI9Mt0JV82+KeEUl5yCv25LYccZt5tzGtzCofDpCwVtXgX9COJNjBs5f+stxVufQfoSvZJ6VTDjjtSF2hv/X35OoXkwNVHljAyNjtgp2gtr/0QNNwMSLAAcGHkPVzMePCPerBKAnY8ElBMZL0UOHCTKwAFSkkxB5zdJY6e3Lvr3PuKFWGHjMKQ16X4qPskI8e8Ty8mZrAVUQtOevvBatU3YlrOS/awzouiohWZf7Fmn6JsmLz05rxMMxLfjJNH K2iUSiuv 8Vt0tU6ntFqq+s8l3YbapPSxcpEM8QuibWLdG2iqHUOdz2mzjJbsDNzK636q0cKULj0XyinpIybs/QFtPebM0MkONfG9qUqim3lLdIxrMwITh/H+Ywtsdb5lp65XSF2Ql2AocjegflXoUajBv5kb/0vzGiaWcUeqaEXiZ7bARJG4KmSeXxEs88pmPssHCA3OE4Uv6vWJQSRVdc+R0/8SNez6fIWgFyHiMNFBdz8hP7RmgcivTGFtNR5lVSjcjI7YdPwAxpvqBJ+P7LSakeJrq2YXljDfgHCxjuNXidpsZkoO6jBk5Jx4hBD1kXUZtRFNLsZ4XLQJCGWCA1y7kJxvR9CaAaCeQdqTied5NX/rINVS+kXpUD9InHM476gglFo8vufMmwignWQPEfNkM6Ttldv8vUpz58o3aRQSuW7GvjV7Cqk3Op6yLrOcG7gb/Dw3j56TxahgUjFGsaa2KfLf3wguDb2H72ji87FcbSTj1yxSh/IP4oSU0fsL4LHbI6hp0Rxhc8S2q3khelekVsMYIqDfcqDlQ8gCMj7aZ8gJG6mF8cgSrQ9hppVVhu3bfsdEhsJF6nXCOTUOjUzlXrzdZHwZYRA48RwlW8sSe0sy6arnqKa9IwdohmNhmdjuesmSpbBUpra4BMm6+UJMMThTiI4ERbg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This patch enables support for shared memory in guest_memfd, including mapping that memory at the host userspace. This support is gated by the configuration option KVM_GMEM_SHARED_MEM, and toggled by the guest_memfd flag GUEST_MEMFD_FLAG_SUPPORT_SHARED, which can be set when creating a guest_memfd instance. Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 10 ++++ include/linux/kvm_host.h | 13 +++++ include/uapi/linux/kvm.h | 1 + virt/kvm/Kconfig | 5 ++ virt/kvm/guest_memfd.c | 88 +++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 709cc2a7ba66..f72722949cae 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2255,8 +2255,18 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM #define kvm_arch_supports_gmem(kvm) ((kvm)->arch.supports_gmem) + +/* + * CoCo VMs with hardware support that use guest_memfd only for backing private + * memory, e.g., TDX, cannot use guest_memfd with userspace mapping enabled. + */ +#define kvm_arch_vm_supports_gmem_shared_mem(kvm) \ + (IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM) && \ + ((kvm)->arch.vm_type == KVM_X86_SW_PROTECTED_VM || \ + (kvm)->arch.vm_type == KVM_X86_DEFAULT_VM)) #else #define kvm_arch_supports_gmem(kvm) false +#define kvm_arch_vm_supports_gmem_shared_mem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ae70e4e19700..2ec89c214978 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -729,6 +729,19 @@ static inline bool kvm_arch_supports_gmem(struct kvm *kvm) } #endif +/* + * Returns true if this VM supports shared mem in guest_memfd. + * + * Arch code must define kvm_arch_vm_supports_gmem_shared_mem if support for + * guest_memfd is enabled. + */ +#if !defined(kvm_arch_vm_supports_gmem_shared_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) +static inline bool kvm_arch_vm_supports_gmem_shared_mem(struct kvm *kvm) +{ + return false; +} +#endif + #ifndef kvm_arch_has_readonly_mem static inline bool kvm_arch_has_readonly_mem(struct kvm *kvm) { diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index b6ae8ad8934b..9857022a0f0c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1566,6 +1566,7 @@ struct kvm_memory_attributes { #define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3) #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd) +#define GUEST_MEMFD_FLAG_SUPPORT_SHARED (1UL << 0) struct kvm_create_guest_memfd { __u64 size; diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 559c93ad90be..f4e469a62a60 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -128,3 +128,8 @@ config HAVE_KVM_ARCH_GMEM_PREPARE config HAVE_KVM_ARCH_GMEM_INVALIDATE bool depends on KVM_GMEM + +config KVM_GMEM_SHARED_MEM + select KVM_GMEM + bool + prompt "Enables in-place shared memory for guest_memfd" diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 6db515833f61..8e6d1866b55e 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -312,7 +312,88 @@ static pgoff_t kvm_gmem_get_index(struct kvm_memory_slot *slot, gfn_t gfn) return gfn - slot->base_gfn + slot->gmem.pgoff; } +#ifdef CONFIG_KVM_GMEM_SHARED_MEM + +static bool kvm_gmem_supports_shared(struct inode *inode) +{ + uint64_t flags = (uint64_t)inode->i_private; + + return flags & GUEST_MEMFD_FLAG_SUPPORT_SHARED; +} + +static vm_fault_t kvm_gmem_fault_shared(struct vm_fault *vmf) +{ + struct inode *inode = file_inode(vmf->vma->vm_file); + struct folio *folio; + vm_fault_t ret = VM_FAULT_LOCKED; + + filemap_invalidate_lock_shared(inode->i_mapping); + + folio = kvm_gmem_get_folio(inode, vmf->pgoff); + if (IS_ERR(folio)) { + int err = PTR_ERR(folio); + + if (err == -EAGAIN) + ret = VM_FAULT_RETRY; + else + ret = vmf_error(err); + + goto out_filemap; + } + + if (folio_test_hwpoison(folio)) { + ret = VM_FAULT_HWPOISON; + goto out_folio; + } + + if (WARN_ON_ONCE(folio_test_large(folio))) { + ret = VM_FAULT_SIGBUS; + goto out_folio; + } + + if (!folio_test_uptodate(folio)) { + clear_highpage(folio_page(folio, 0)); + kvm_gmem_mark_prepared(folio); + } + + vmf->page = folio_file_page(folio, vmf->pgoff); + +out_folio: + if (ret != VM_FAULT_LOCKED) { + folio_unlock(folio); + folio_put(folio); + } + +out_filemap: + filemap_invalidate_unlock_shared(inode->i_mapping); + + return ret; +} + +static const struct vm_operations_struct kvm_gmem_vm_ops = { + .fault = kvm_gmem_fault_shared, +}; + +static int kvm_gmem_mmap(struct file *file, struct vm_area_struct *vma) +{ + if (!kvm_gmem_supports_shared(file_inode(file))) + return -ENODEV; + + if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) != + (VM_SHARED | VM_MAYSHARE)) { + return -EINVAL; + } + + vma->vm_ops = &kvm_gmem_vm_ops; + + return 0; +} +#else +#define kvm_gmem_mmap NULL +#endif /* CONFIG_KVM_GMEM_SHARED_MEM */ + static struct file_operations kvm_gmem_fops = { + .mmap = kvm_gmem_mmap, .open = generic_file_open, .release = kvm_gmem_release, .fallocate = kvm_gmem_fallocate, @@ -463,6 +544,9 @@ int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args) u64 flags = args->flags; u64 valid_flags = 0; + if (kvm_arch_vm_supports_gmem_shared_mem(kvm)) + valid_flags |= GUEST_MEMFD_FLAG_SUPPORT_SHARED; + if (flags & ~valid_flags) return -EINVAL; @@ -501,6 +585,10 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, offset + size > i_size_read(inode)) goto err; + if (kvm_gmem_supports_shared(inode) && + !kvm_arch_vm_supports_gmem_shared_mem(kvm)) + goto err; + filemap_invalidate_lock(inode->i_mapping); start = offset >> PAGE_SHIFT; -- 2.49.0.1045.g170613ef41-goog