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 7609BC54F30 for ; Tue, 27 May 2025 18:03:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1F656B009C; Tue, 27 May 2025 14:03:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C58FE6B009D; Tue, 27 May 2025 14:03:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B731F6B009E; Tue, 27 May 2025 14:03:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8E9C16B009C for ; Tue, 27 May 2025 14:03:06 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 41D8114135E for ; Tue, 27 May 2025 18:03:06 +0000 (UTC) X-FDA: 83489459172.28.8953CB6 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf30.hostedemail.com (Postfix) with ESMTP id 665508000B for ; Tue, 27 May 2025 18:03:04 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1K10i6Eo; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3Vv41aAUKCHMkRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3Vv41aAUKCHMkRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748368984; 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=PPh1VzeopsPxIravFkgzZ3tQjZGs9ZRvTiaLFQYSp/g=; b=P7P/fjgSH0jrxWKt5E5CjxmBDJt/pRzgH6AUTWtZz2VNAOtGD2PVvKk+yuuk2RQBY5LcGz jsEPrRw7KcbwyVBtTvqDgAmYSYFHxmC7viQxky13DE/f1XqQBr49LMtADok4y7szkbPzS8 n7dCZcSC76jn6226SEOipeLO49KiOKM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1K10i6Eo; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3Vv41aAUKCHMkRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3Vv41aAUKCHMkRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368984; a=rsa-sha256; cv=none; b=gCeYYeJaukeObba3Ntq1JQ7acoCOec5LKBOzKESY5lQ3ROgsoI0uANcjmoBFs6Xfa8RPum QRW/dH6ZxqT8MHVZlIEe/yc3OET/PUAIwWAT+xM1k/UQKNkymzDTo6TnlHFSHTTHbtm7wE SDbOeFGbp0j9gsqCGMfpiIguL0CfoOM= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cf44b66f7so22019235e9.1 for ; Tue, 27 May 2025 11:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368983; x=1748973783; 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=PPh1VzeopsPxIravFkgzZ3tQjZGs9ZRvTiaLFQYSp/g=; b=1K10i6EoQjPFqjIuEcSicMzncWUbqSfvrbLxe+P14dr5pFS7cYA3MhmBKr7fvD/teW W5P8nCtDWrTjXgDxdoRnxzdKc7vHha+bMR7esZ2SokMs8EPIoTdsKcQ3kFVsSqFtsMSp wG23f+vfwnjzwmO/b7xPG+acn43akKRlB4/BwaPEuQHnCIrXDGjmAM2AQzT6odLaK/i/ CnlMz4MdXNMeOzAkEW3sOAIExLjrjP3zGbU8/dLogyvmfwHAnOED8knPiuHC8i7b3NrY Vk9FMrmQwr8O6q4IuJ55QBb/0R2o/0pcUmZ+rvfYSdjLJneBMOnvZVjYSWXPqED22a8n gRUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368983; x=1748973783; 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=PPh1VzeopsPxIravFkgzZ3tQjZGs9ZRvTiaLFQYSp/g=; b=GGsST4FrFUZIIXcrRaTWLV1ZFMJa18kUsOpPeyi5u+Z1vmJnMQfJpKlXEHXavL2Hhg UmnryBvsEitQfzPB13CPfWqXQn684ezpMcjt3Jj1fJlWih4SawIYrJnkdtlYHqU1l8gh 1D3nV6tqhCY1HRkkWjyY+cPtibBChKxcTVjuzrwEczlxIVX3JYoWjTFfsxDcKDQeyI+G JQkpLHHmmu8UQU9IVFmRynN4LSdjmCDXGhhzp04CCuo6H/a/xz4i61OwjK3rUYcyGNwv vWdvDr9gWw9Q8HG19tNtpYnMFKNIfrfh+xf6upj3mjwwYnjCcehsqMD48jZpG0U4sA/9 Vcwg== X-Forwarded-Encrypted: i=1; AJvYcCV2uq9RJ1D5lsZwxXdfJnsOr2bnFW58PX4VJi0Q6G6xacYieMRPiMS/JXmiLYYdMU8LdUN+oP8Anw==@kvack.org X-Gm-Message-State: AOJu0Yy4/EYFpCC+pfhdj5Oz2smJ2ZkzTMv54EV4S7ejw5uV/hSnCnMT rhDLbvv8DhkpH3D8tbeA9v5fbzLx5nBy+ISUnIC+1ciV369xTXp2Ung7gmvZC/ISayUWtgCE0hO riQ== X-Google-Smtp-Source: AGHT+IHXUipBmfllLGBhkMKX/WEGBqCWDLNnstlCK7t0hAPbynlDj9rt+Y4SnPQgslY+gJ81nwpjkYmqpA== X-Received: from wmbjg9.prod.google.com ([2002:a05:600c:a009:b0:43d:b30:d2df]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:820a:b0:43d:526:e0ce with SMTP id 5b1f17b1804b1-44d76021feemr101789735e9.21.1748368982815; Tue, 27 May 2025 11:03:02 -0700 (PDT) Date: Tue, 27 May 2025 19:02:37 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-9-tabba@google.com> Subject: [PATCH v10 08/16] 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: rspam05 X-Rspamd-Queue-Id: 665508000B X-Stat-Signature: ws9kb4o1e76xs9y7rywpanthh1u5yojp X-Rspam-User: X-HE-Tag: 1748368984-800314 X-HE-Meta: U2FsdGVkX1+EfxQEuMc11r80tFX5aYXxb98tODe5kMRwpaRDiuuS5g5a+ElnW0VqDRmFz7I/TI8f7g57ThCfzzNm4OTfwFUPNfzmmdAiJPu3aCa5VDQ2KCxYWJu4INnFz+e9RsPKSWZKXvWxp8s7OzLEqifWPYk8bJwWwK5SpAC8TyvUrMCoS8IpMzC8Md4c1xM5XYmL93rgLaqCiXbt5F2xINlCJTelVB1KKF+ZuSwRM+zpFh+fkHl6RTAk8Q8/ObCEKswtmIlb/TXgI/VHqQqpfmeVQeTRbGpWwHrf2FlbvBw2s7smKqmohVvxL3EMKL2m9KkUlPlRTsJDpjGvVslWYHLr14jIwWEhTemxAPRQVh6CLWTw3gq8IEg/tgUv6KkRNKhS51kaT2OoOw4myoFrTKElOv9QiGpezaK1lqsE/6ea3iDGphK5TlVmO/yTgHVc48NPEFQkdcvl2sBVlLhl8oFP6Kb9UUEI10d945/UfzfehHE9UJI/uvapycSI2rmmP9n5lXPD/v2Kup1kEs61F2QUrnhVcN/HZNFnLA/sxU0ySDRih4fVT9BeSYj0PIMOx3ynWRxkGVPuGabq3aRy+uXDe/Xt2TNnk0ABosx/TvQD3HK7+UmLI8JpuTVVcgmhN8pfl5nnDZWuWLKFxuRoE251Jo+32gorE+r7baj8yYpVfTDONVXjAVCCtIzEIxEOLBrXdIMokQ0Dc7PgOLfayCswl8yl8TwrXJqz74RNcOgMa3hu9aUrz3VN3W5fXd5HhATxttLTQ1oa5tNddQi4MSDv/CipOCE7y31qCxX9rf0ChhapGYvr+tDW9v5X5YacjjjZOkfayQvdpNVGAPu11p0+EYA6t7EGPkuyZjDXhaWG98WI5y6/vid9faXLrJbLX8+qjHvf16ODXYGEBJejH0w5mk43pH4b7e0BNpWVdlqyK8b9M8wtzMCe6Tw8fnWO+aYyj4+k0asD8hU ZfJXzvDi Z1RkPrxo95SMKvKFwhkMGDM0TlRVDaUlErnYTrahFUpMYQKbEEL3G6uQUGFvNqUC7OsdPNdGMtowMohdAmSm9zl9jpfntkw9ESZHEtiJtuBClwcTj6RM+ibXTutYm5/f4LXhDpviduKPWXW8fvXplols3fTIe8Ys3usaSs17//78rzqMLciK1dEwL+8hiU4g4KqhdbC6qhK7CJAYNMVML6HDvZrqiWUnaQPkozpS35V3/dq9YcSMruWFUapwtBC47SwWibax134zRaMmQwZKXo23qMQJGqpwwgF0GEJcsB/3N+1HfyNxFGPoKOJ+AgbLCQIy85e62rwesIeizj1FjrxCDcn3tJmSDMYqKbESXja+UqVimffGCabcgke0vCMvInthcVx8oHrw0tzeq8bD3hg8TUAc2ouh3+D7RJi86sofAs93cuAYEB3BtR0dheUfXpmNDH+H0VSFptS+jNCiqg0N4p9yA37GSUJvENJxpGp9HsSC2ZYh0mp/GcKIr4PYKD4lO8KMQsV7OKVkwMDN9Qe1D7vUWZGKC09U3AVnKMrSK6QBJ0kDUQljfC9YZMkE2pJb6DG7Ve0RhJT2MK/p3wJHQUi1WJ8T93BRYjcKOFghdeSGsGk/nc1V2j8S3TGlFQUMN9hGsS8a+HZgiPJQvqjAzNA== 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 ++++ arch/x86/kvm/x86.c | 3 +- include/linux/kvm_host.h | 13 ++++++ include/uapi/linux/kvm.h | 1 + virt/kvm/Kconfig | 5 ++ virt/kvm/guest_memfd.c | 81 +++++++++++++++++++++++++++++++++ 6 files changed, 112 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 709cc2a7ba66..ce9ad4cd93c5 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_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_supports_gmem_shared_mem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 035ced06b2dd..2a02f2457c42 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12718,7 +12718,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; kvm->arch.vm_type = type; - kvm->arch.supports_gmem = (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.supports_gmem = + type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; /* Decided by the vendor code for other VM types. */ kvm->arch.pre_fault_allowed = type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 80371475818f..ba83547e62b0 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_supports_gmem_shared_mem if support for + * guest_memfd is enabled. + */ +#if !defined(kvm_arch_supports_gmem_shared_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) +static inline bool kvm_arch_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..c2714c9d1a0e 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 (1ULL << 0) struct kvm_create_guest_memfd { __u64 size; diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 559c93ad90be..df225298ab10 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 "Enable support for non-private (shared) memory in guest_memfd" diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 6db515833f61..5d34712f64fc 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -312,7 +312,81 @@ static pgoff_t kvm_gmem_get_index(struct kvm_memory_slot *slot, gfn_t gfn) return gfn - slot->base_gfn + slot->gmem.pgoff; } +static bool kvm_gmem_supports_shared(struct inode *inode) +{ + u64 flags; + + if (!IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM)) + return false; + + flags = (u64)inode->i_private; + + return flags & GUEST_MEMFD_FLAG_SUPPORT_SHARED; +} + + +#ifdef CONFIG_KVM_GMEM_SHARED_MEM +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; + + folio = kvm_gmem_get_folio(inode, vmf->pgoff); + if (IS_ERR(folio)) { + int err = PTR_ERR(folio); + + if (err == -EAGAIN) + return VM_FAULT_RETRY; + + return vmf_error(err); + } + + 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); + } + + 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 +537,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_supports_gmem_shared_mem(kvm)) + valid_flags |= GUEST_MEMFD_FLAG_SUPPORT_SHARED; + if (flags & ~valid_flags) return -EINVAL; @@ -501,6 +578,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_supports_gmem_shared_mem(kvm)) + goto err; + filemap_invalidate_lock(inode->i_mapping); start = offset >> PAGE_SHIFT; -- 2.49.0.1164.gab81da1b16-goog