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 6C7C0C3ABA9 for ; Wed, 30 Apr 2025 16:57:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59B6B6B00D5; Wed, 30 Apr 2025 12:57:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54CA96B00D6; Wed, 30 Apr 2025 12:57:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A4046B00D7; Wed, 30 Apr 2025 12:57:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 17C8C6B00D5 for ; Wed, 30 Apr 2025 12:57:16 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AA570BED00 for ; Wed, 30 Apr 2025 16:57:16 +0000 (UTC) X-FDA: 83391315672.05.B8E18C3 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf22.hostedemail.com (Postfix) with ESMTP id D37FBC000D for ; Wed, 30 Apr 2025 16:57:14 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LqrBo08T; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3aVYSaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3aVYSaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032234; a=rsa-sha256; cv=none; b=KtpTwfDKc/3MuqYPDxaUPq/xs1HuB2XW01DwmdDpGtKQWgS9cTqHPknGh1iS6OyF0bQh6H 8F4qP01a1xu6Z4qpuRBL1yWSY8nyrDVcokVGrAc4Y95BM3IBR+p3rrNgriNNUMHOwWEUes v2oChRF9zXY1g/t3A5Hw8Cqd8rP+8Io= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LqrBo08T; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3aVYSaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3aVYSaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032234; 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=qguY8wkjSLxGc6Rnm9Mow0KqEpbeWasuLEBUoK8rap4=; b=gcJBzVWS3ADwbkJ9L40HIOeqGY1OQZRvkE/iueGqboSihBtHUwQWqwpb6xBDdsvh+mBIzB aOq5hzYD7lANLmC1hY8WcVoScGcBCoSIer9gfJbRg1ZWzrX3EiOpmMEk0o3N4U9sqKEPxX 2lt2oKxTl2HH8UTpbWxrspelrZxuDxU= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cfda30a3cso66725e9.3 for ; Wed, 30 Apr 2025 09:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032233; x=1746637033; 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=qguY8wkjSLxGc6Rnm9Mow0KqEpbeWasuLEBUoK8rap4=; b=LqrBo08TjqaMbb/GmrwsSJ6FNdAxwCrYFA6lIuD2eLSNDVCad8qZkz/GuxI2ksyCRI 5g+yXa8g6W9NCk4kBDuovfRFugmpRwpkq4zc7b2vjVaD+1bN04zhfMCCVp7BDeLfmRC9 o3xzPmj/KoLyQbb5H4R4JjJXV9bwHmhbc6RQkFkVI9UL4vlK13MYSx4ozvwLkDYy3+zW Bv16Dp/8s4VhQPftHO4vXnSA+xqKDh+s7SWVXobYRlGK+wFWb6ZxSkTK8zFVZXwxVLCN 5n5VQzwvzOh3u+DgGgdRHK8HhTX5+xz5EuQLWIejFydvJS0mSwor9dsPeOtOmL4q6Eu6 mY2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032233; x=1746637033; 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=qguY8wkjSLxGc6Rnm9Mow0KqEpbeWasuLEBUoK8rap4=; b=U5kA/CAHc7XMBNXx2kpkZznxvYMZw182BmUAUnBrOmN6lHRdv5dYWLPglm6y9u5MQq E0bc9IfiLAI9FA3BAog8/JYEt1k0pwdITj3XXRDvyDChohZMfqNwrlGLPgH93RVesV6l UHySJs7NgvrVhjF0Tptcj+kq+djUa2mZXQgIJkEwbcg5mpXaAQ7sFO6qISzSsayAQY4G oWorVPTSmu+e/R2KSY1A+nxKGqA3Ez6ouElQ3CfstJpxFm1m97cvrZ08kwOCH1ckXhlE bOdA/7b8kikseatmygEyXE3bwWAdx42dJbvHpbe47wu77W+Ge748q+YicAd++Niu2iPZ NAkQ== X-Forwarded-Encrypted: i=1; AJvYcCXIRI9DbeGKFKY8ogvLnJopzZtp5LPXFaLtmj0F/VDzsHJl+IP+jdhiQI2wmE5/6zKwAAG7E4hwNw==@kvack.org X-Gm-Message-State: AOJu0YxPzfSLOW6TMxpPO+JqiG25O4TWSiUJKb5dIB5viYOjxtWRLxkl DtXTVv9iuqMcHW67jioOyQVy3HaUa2uMX6GUyga7J6Lme8afPPN23F1HjkWNKeXG+VA/iLXhKw= = X-Google-Smtp-Source: AGHT+IH/bjSAFj0lsB85l/2YbEt4D9+ii8jCl4h9AfCzNBDyCxisD+HmPdIjUIeed8Koj3te+0fhdPZTrA== X-Received: from wmbgw7.prod.google.com ([2002:a05:600c:8507:b0:440:5f8a:667c]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:cce:b0:43d:8ea:8d80 with SMTP id 5b1f17b1804b1-441b2634cd0mr34951035e9.5.1746032233508; Wed, 30 Apr 2025 09:57:13 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:50 +0100 In-Reply-To: <20250430165655.605595-1-tabba@google.com> Mime-Version: 1.0 References: <20250430165655.605595-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430165655.605595-9-tabba@google.com> Subject: [PATCH v8 08/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D37FBC000D X-Stat-Signature: anrp4mez57g6j19yi95gtxwh6os6e8kz X-HE-Tag: 1746032234-26296 X-HE-Meta: U2FsdGVkX18vqFk4PhZ1ZoMmiXtLelOsz3amSTgnesgrT1tjTCvGTmCA/F73MatWQ5R0qirF0dHtZS3ZB5H9Yd6N0Cey2bKqPfGiIIZbGM/j23JsBb54kwdPvzNq/JoORgb4BI+N+tZVdcufKJXxQl5VeARr/afdwgoUghZy1k2t0S7SSioufzEy7ryfQukkllFMI8ZrwYlcOqc0wgiKnx9Ude1xsBEalQUY2Icmc/siSUMElsyjGg04ez5Hquqf6m2SCzgE4t1fuxygF1mOJXjjNELyl07A78fStYNvfyJGA7KrzENdStooPW/H4aEsINc3PtRhNXK6aU6Twhs3P61YZwmxAPOVoCli88oYqZViwZPcXOAoeNR+V3yrLZKGrbjQ3AeeRD45ZUghd4UoiMD81xuUJQ6kgm6FZAQpekLXJ4kSn4fVJ8hrYONp566V06DZBq3mIcTMUoVSUWyPQTh9ku/CKGEmbRXtPawBTn+gWKRlRoS9ZvZw9hyoY5VQB9xacnjfCjrn+gdG4rTe83pl4HQ6YZRtbtnSscupf3EMje9wyA45JFsVGL9eF+F68ueBI52pCZTwbYr0qEp0cup9wDJrco/jkahrxZqiqT3QQvsHKZnesgRPBllfhnym8hFtLZW74r6XHp13EA4wx4xRapT9kOGHNoBueDXmD9WtJdtPXRhA3p9hFbhhaUacFCHxflno5e/iWE4pJyiQS8ETJxTG7n9w0leokHKCa3Hxm76AenNgXNBcZb/LVgT0ZaggIXqNyq3RmaYOx/7VK+f0OPuL1HWflErPpCxYQX/RlObPdNQBNeJW6UtZGLT4MLR81wqvBs5zWvYfnxm5pj0As2WQxxz8YoQf6UuZqVrT5f78hlhMJ5fe37DU9vzPoD3SmN7l/gVGJsKePbbklNTi4rAyxW4gk1J2roPA6/cocblbULvmNx9eUR4WnFmkLtPZJK46tt4EF8Ll753 gVsacQBm Xe8csxELFqFWWxJreO4+Gb/RA1ncXfeZOYoa1NXJFgRSo215E7Qoa4SpLvK6DY/Tg0GW68BqsyWINUB+vDKwihQtIL+VSDrRGS3YyT3LZ6qsEPfEiU5j9HqYQiAxodKVd89l/EQmN4CtLZ5A1RROGe0iXkum8J/spPcB7wm0VN98q/1VErsBr3fOTSMNyT3Jw7fivuWh9/OHY5kcwEpsRELF7lLUO6/Nj3Dx5aHN1++9nghwdxzvQFtAJY0Kp23lbsc4qSrrFymhP1RJ8dT9jQQ12RpHv9Y91S7kh/hOM42bX+ciSjWKI7Ltskl6EL54HaTiSYj5huEDQXF2eWeNWW+PPGeIMY245gW86sLUTojzPPUfo/qRG1p89vZVe0YvT/dB4qrxEsgKF+fQ2XPsAAWTWx4ZNlQGyeFFrF2O0A+Zmg3QUBa7OsD6JeKoD90oATVnYWEcIeVv6zTmnLdYGNmFgqloOndmJozTP3H3td8IjyQCX4mcNVIccSlxaH0/l5lZYcx1OVpGcWJsiVy8RVwyf7uSXtyS/RWjDucjDPinkSlJSpUQ5ac7fcmMn23IZMLUaGEQe0J9hs5qYHnlLF6LY1fHDpxGhxpzkxnolD6ftM2rKViCA7+XW4E8wBaAK256i9/9jbisgHv6soPMJawczhg== 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: Add support for mmap() and fault() for guest_memfd backed memory in the host for VMs that support in-place conversion between shared and private. To that end, this patch adds the ability to check whether the VM type supports in-place conversion, and only allows mapping its memory if that's the case. This patch introduces the configuration option KVM_GMEM_SHARED_MEM, which enables support for in-place shared memory. It also introduces the KVM capability KVM_CAP_GMEM_SHARED_MEM, which indicates that the host can create VMs that support shared memory. Supporting shared memory implies that memory can be mapped when shared with the host. Signed-off-by: Fuad Tabba --- include/linux/kvm_host.h | 15 ++++++- include/uapi/linux/kvm.h | 1 + virt/kvm/Kconfig | 5 +++ virt/kvm/guest_memfd.c | 92 ++++++++++++++++++++++++++++++++++++++++ virt/kvm/kvm_main.c | 4 ++ 5 files changed, 116 insertions(+), 1 deletion(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9419fb99f7c2..f3af6bff3232 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -729,6 +729,17 @@ static inline bool kvm_arch_supports_gmem(struct kvm *kvm) } #endif +/* + * Arch code must define kvm_arch_gmem_supports_shared_mem if support for + * private memory is enabled and it supports in-place shared/private conversion. + */ +#if !defined(kvm_arch_gmem_supports_shared_mem) && !IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM) +static inline bool kvm_arch_gmem_supports_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) { @@ -2516,7 +2527,9 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) static inline bool kvm_mem_from_gmem(struct kvm *kvm, gfn_t gfn) { - /* For now, only private memory gets consumed from guest_memfd. */ + if (kvm_arch_gmem_supports_shared_mem(kvm)) + return true; + return kvm_mem_is_private(kvm, gfn); } diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index b6ae8ad8934b..8bc8046c7f3a 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -930,6 +930,7 @@ struct kvm_enable_cap { #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 #define KVM_CAP_X86_GUEST_MODE 238 #define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239 +#define KVM_CAP_GMEM_SHARED_MEM 240 struct kvm_irq_routing_irqchip { __u32 irqchip; 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..8bc8fc991d58 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -312,7 +312,99 @@ 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 +/* + * Returns true if the folio is shared with the host and the guest. + */ +static bool kvm_gmem_offset_is_shared(struct file *file, pgoff_t index) +{ + struct kvm_gmem *gmem = file->private_data; + + /* For now, VMs that support shared memory share all their memory. */ + return kvm_arch_gmem_supports_shared_mem(gmem->kvm); +} + +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 (!kvm_gmem_offset_is_shared(vmf->vma->vm_file, vmf->pgoff)) { + ret = VM_FAULT_SIGBUS; + 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) +{ + struct kvm_gmem *gmem = file->private_data; + + if (!kvm_arch_gmem_supports_shared_mem(gmem->kvm)) + return -ENODEV; + + if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) != + (VM_SHARED | VM_MAYSHARE)) { + return -EINVAL; + } + + vm_flags_set(vma, VM_DONTDUMP); + 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, diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6289ea1685dd..c75d8e188eb7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4845,6 +4845,10 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #ifdef CONFIG_KVM_GMEM case KVM_CAP_GUEST_MEMFD: return !kvm || kvm_arch_supports_gmem(kvm); +#endif +#ifdef CONFIG_KVM_GMEM_SHARED_MEM + case KVM_CAP_GMEM_SHARED_MEM: + return !kvm || kvm_arch_gmem_supports_shared_mem(kvm); #endif default: break; -- 2.49.0.901.g37484f566f-goog