From patchwork Wed Mar 12 17:58:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14013730 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 0A64EC28B2E for ; Wed, 12 Mar 2025 17:58:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1B20280006; Wed, 12 Mar 2025 13:58:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA361280001; Wed, 12 Mar 2025 13:58:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A9BC280006; Wed, 12 Mar 2025 13:58:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 607CE280001 for ; Wed, 12 Mar 2025 13:58:36 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C3DF1161505 for ; Wed, 12 Mar 2025 17:58:36 +0000 (UTC) X-FDA: 83213659032.08.99074BC Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf28.hostedemail.com (Postfix) with ESMTP id E5F3FC0004 for ; Wed, 12 Mar 2025 17:58:34 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=x72GFWyW; spf=pass (imf28.hostedemail.com: domain of 3ScvRZwUKCGwdKLLKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3ScvRZwUKCGwdKLLKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741802315; 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=ja4c56NjFxjN3VuYRxoRbDc+8encrsyBoZ8FkcBEBAk=; b=AYBewuYYRtEzY4YNGNIw6Oo+VZg+vtz8lS71GWT8o9cQ/93s4atnuiH0Rbzj6wCxFVGoCh uDA7EGmFUFPtR4XnuJRYe6PnYj5OukPoKtL6iX4fPriaF0E8ihqlka4Paka5L17i4ZEG09 QVDPiQkoS3xGtmBfFWmVGWBsgpbwQ+g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741802315; a=rsa-sha256; cv=none; b=Z+J3wEWZTzhYfZQdL/uyKUuijhzla0TiT6N9CbdC5GNlX+8xEMh11yTOq/gtrOKBmY8Mnu eQHOWMQWM9Xts/KrtzaaKzAZQgUHEf0B//E9I8S/5Iv78Y3SzufvezoXvtqNa8OCUdHmch doTrnSI6Km1Sa0Akd1cj6/bXruyHxy8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=x72GFWyW; spf=pass (imf28.hostedemail.com: domain of 3ScvRZwUKCGwdKLLKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3ScvRZwUKCGwdKLLKQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43bd8fd03a2so306695e9.3 for ; Wed, 12 Mar 2025 10:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741802313; x=1742407113; 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=ja4c56NjFxjN3VuYRxoRbDc+8encrsyBoZ8FkcBEBAk=; b=x72GFWyWazgGOeQJ+wKTNGL7sg5aEdgl7p5n2wzMsLJ2pSa2Hvj9nwHbESk+ihN3gI xs19VxqF2A8FsCN16oofD+7ZXQfHzzA8wuX0h71k274fcywKH9hqzx9C4Khg+FLvSvDX rm8bXdod156EgX7jw09P1mdPW9gHc7tjcA433gHMemstw+jYEodH75PUo3BBNFMJjLAi 899GYy8fBo2eN7KLczwe+OPacazYEJugWeSdP5x5XW910UFXdGDGw/NYHs6dCXMhNSK3 RXzCsiHT7NneBruiRtB//7ICjZhNtcmB+0hXSC6eGTI+WkYZ34TuhjlLH268qzlkDjKv NjXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741802313; x=1742407113; 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=ja4c56NjFxjN3VuYRxoRbDc+8encrsyBoZ8FkcBEBAk=; b=UePYsvucqYjrdPyAI2O/7KJq9tMW1HO45Uz+g0BLZpcvgKT9oD1pJyEDq91J2XR/5f 8GBaa4YEYwfWCC91PSPctPULvm0be31wIXavYk2j/eXxcXUIIRLp4zFKZHCmT1wvuRhI vI7ldwm0Jqg/l9kfD74b41EnzEV8zvIEhoK04SZW9zrAQGRDbIuUyr43dYnIVTFOZhFk +NprAKLbv7alPKW1Zkj3bQ9YBeUw5gZr5CtnPfsw5kiQIQRLVgc7pW22JhisShijuTpu wYYhSpRSeTViAlaglrXTmj7l4TAN9HQcIS0OBvlgTf4zihQY+z7EEitpcKilgEa8DTcy DGMw== X-Forwarded-Encrypted: i=1; AJvYcCU6P69hcRiPqYFFhDmQblABKbsuxev7UpitnMRv0rXtTYeCbLHVuXRHUtPI0877YOvoNzRjZosgQA==@kvack.org X-Gm-Message-State: AOJu0YzPLAxIi/ljDvEC/+z4XMfMsBIcPPiMNl28sZZ9jjya7pmjYpob 7Cd8mmrXVH/5negQIbRp2Rknaqbgts6sS8viO59lTX+Dwf+iQVzJAnJoXNJXsGZPfEAZKrow+Q= = X-Google-Smtp-Source: AGHT+IH6LramvrAethqSEJ43co3nUgcdaI6Hl8zlyi/Cxvas2W6mO2vl5zZ/oeJPP/4J6sjTcPIlLBCdsQ== X-Received: from wmbfl17.prod.google.com ([2002:a05:600c:b91:b0:43c:f5f7:f76a]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1ca0:b0:43c:f5e4:895e with SMTP id 5b1f17b1804b1-43cf5e48a1dmr101433505e9.1.1741802313446; Wed, 12 Mar 2025 10:58:33 -0700 (PDT) Date: Wed, 12 Mar 2025 17:58:17 +0000 In-Reply-To: <20250312175824.1809636-1-tabba@google.com> Mime-Version: 1.0 References: <20250312175824.1809636-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250312175824.1809636-5-tabba@google.com> Subject: [PATCH v6 04/10] 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, tabba@google.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: E5F3FC0004 X-Stat-Signature: qstgrpepxjp45p4g6e785a1kmsftu3zn X-HE-Tag: 1741802314-670626 X-HE-Meta: U2FsdGVkX19IM1RV/vFgSPEvwMnPGeJW7PzQDYrUhmdYzCRSkNbeGl8mc1rr6iCN+iFQG+t83WzHBjC35dYyo/SZRiizyrbGakZ7iiuRRc90AbVjHrzJ+AvmzIORaSn0AXdW5p1y68T/4J/vQ1IJooSe0OOeyqcMYGaFKh2y9LI+k+t+AVfuxvcijSCjXP4hz1Va+d8OvFV7WCzgQ83Yr1kMBsPgrzI5g/+xtIqOSX9C2vpqtabw/ULvadgf+ntTuovXbGOOPlkFpIBnUhhCVAmnpgZiFZ9bsYRbaKZBfeYVSLvgMLlPryMcrlHR2hRb/PIqbVIAEvlwgHfis5Lkh1YpzayAu451GDvVZW68UMz8Bgylsw7ESw+6ZiGKFl6HbdbllEN8LnWPihy8Affp/rFf8IOdpnqb1Lno5AHPVwvBs5IRQOxkUo83AXymyR3tV9uFEbx8unlhbE+bifHcSTVnBpGexm2gAlz5m3hL+1DVDGWyzhzdpS0sQGtYFXcd61ID2LR6d/her04Jps25LbcW12vhiD6tEkLAypNDmqiPIbnmftRJxmS02nBanYjRNXSQGQQpCYJ/ghsQ9BAOgRbX2QXEbsVRrtB9NrOdFeEqrgwTduYwxOF5IydthLOTSiKWs8kCMP4dFYCAO4kVuPG0XvpAHpSz+ffZ8la4fv15PUIK1o4XvI6eNVuwmJEq5CWDLkpxAKoSjcqXNl8k3+29J1YOP0mtBozBHF70Bx9clHWV9vVKZyan/GKq604+KHiwOWt8vFFZkjD2167EmLxExoiacd74lNVA1bnBjBMtvAxfk96ycCZRrnyW7r9beNd2N5Yo4+eaZ4UVJrq0iPHZ/pc5XEDKoM0e4aEkLWg1zgQH0jeQShoP7IeWy1V/voXfHV/uvbdnWt/xrHkhle1L7nMu66S691wbOBL8SeKQchNLoGL1YYwQeO2iFGPUrWCQ50Nw7BeGjVPq69i 2TRjZUxt VAKK0pQQBPgkDn0yEY/QT/Yn32cMfEnx19gd/EyXJK+L2hC8oW1+UUkhSG+z605HpHVinMIlOc4NMCEI4mhTJUOcFLsiamZhxn8wJIfzi7pwFD6LiErFqcrgNGeEW+hxbhnoeJiMwdu2/jGutQUIhuajqC8LYH9LkULB6Tx2pBYAOO5X8EPpg1Irvv9iabwKcPHJCDKsp3b3JZMRL1C+i6+LLozfJgzGEyoShegxDzQ4ip8uDIQZKGyvj655TIr7h1ug4xvXYMMMuN3t/c4WOr+9+bZibD48L6NfRemHZMy8my+hw4T5pHZQv8g4tAUyFPhY4ZGCEBlVQLPPz1V2pdrqv7xbp8jBMe2ECVubms1x3ClKEr/4F3lHiSkmo99y9lgb9Hg0BThJFyk4oPN8Jfm2l8ZXU03sQLjh8zGBaNFIIx7cnUJ92CBEKlw5eOh13CEuB777nW5Cl3ymgzVNqFywEsJazZmvAXbBsaglnC4IZH5rNZ4/a/exHeVqMlyFbteefC0RYL8+YUAWwl76i0sZRJMFWU4nrP5yJgw3NjyPioKA5+SKSsrR4D7g9Vp3/riddWUAtYIE26lTBZgIQRdeo4AqWA7G/T7iglat9xGuITwzoIsCs+5lA+RUfKIBNeZ1yAnb4PP0ZEOq2ywHgMVkr1Q== 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. Also add the KVM capability KVM_CAP_GMEM_SHARED_MEM, which indicates that the VM supports shared memory in guest_memfd, or that the host can create VMs that support shared memory. Supporting shared memory implies that memory can be mapped when shared with the host. This is controlled by the KVM_GMEM_SHARED_MEM configuration option. Signed-off-by: Fuad Tabba --- include/linux/kvm_host.h | 11 +++++ include/uapi/linux/kvm.h | 1 + virt/kvm/guest_memfd.c | 102 +++++++++++++++++++++++++++++++++++++++ virt/kvm/kvm_main.c | 4 ++ 4 files changed, 118 insertions(+) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3ad0719bfc4f..601bbcaa5e41 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -728,6 +728,17 @@ static inline bool kvm_arch_has_private_mem(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) { diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 45e6d8fca9b9..117937a895da 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -929,6 +929,7 @@ struct kvm_enable_cap { #define KVM_CAP_PRE_FAULT_MEMORY 236 #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 #define KVM_CAP_X86_GUEST_MODE 238 +#define KVM_CAP_GMEM_SHARED_MEM 239 struct kvm_irq_routing_irqchip { __u32 irqchip; diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 5fc414becae5..eea44e003ed1 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -320,7 +320,109 @@ 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 folio_offset_is_shared(const struct folio *folio, struct file *file, pgoff_t index) +{ + struct kvm_gmem *gmem = file->private_data; + + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + + /* 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(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 (!folio_offset_is_shared(folio, vmf->vma->vm_file, vmf->pgoff)) { + ret = VM_FAULT_SIGBUS; + goto out_folio; + } + + /* + * Shared folios would not be marked as "guestmem" so far, and we only + * expect shared folios at this point. + */ + if (WARN_ON_ONCE(folio_test_guestmem(folio))) { + ret = VM_FAULT_SIGBUS; + goto out_folio; + } + + /* No support for huge pages. */ + 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, +}; + +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; + } + + file_accessed(file); + 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 ba0327e2d0d3..38f0f402ea46 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4830,6 +4830,10 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #ifdef CONFIG_KVM_PRIVATE_MEM case KVM_CAP_GUEST_MEMFD: return !kvm || kvm_arch_has_private_mem(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;