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 AD6D3C282CD for ; Mon, 3 Mar 2025 17:10:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24B71280028; Mon, 3 Mar 2025 12:10:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D2B3280016; Mon, 3 Mar 2025 12:10:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02ABC280028; Mon, 3 Mar 2025 12:10:26 -0500 (EST) 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 D5515280016 for ; Mon, 3 Mar 2025 12:10:26 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 26B121C8D57 for ; Mon, 3 Mar 2025 17:10:26 +0000 (UTC) X-FDA: 83180878452.29.1665DED Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf12.hostedemail.com (Postfix) with ESMTP id 8FFD040021 for ; Mon, 3 Mar 2025 17:10:23 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=mvPRiM9w; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3feLFZwUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3feLFZwUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741021824; 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=iEl5LoBVGArZ0Hko7f7NcM1d/VPAiCytVB+FzStXmAM=; b=mU/nAXgbyWEdliCFnlAOiLRwCp/L8E9g2GrPZdOQyJXXVb5wAlF4UYzrnSlnMQzFn1efMf 7PMdjmYYkguDItj0YAraXni84TAXSyr+C13Jz+UGz3dgWTFzk1zYr6UTQ9ONBDEXtQTIfN 7C0WLSz/hjhRW7KVvo+tlmOpIy5JckE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=mvPRiM9w; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3feLFZwUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3feLFZwUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741021824; a=rsa-sha256; cv=none; b=qyZhWSKO1fFaX02pWBqyU+tXFlmo0Eq+RCY9TaX+MfmIbvqYi+r6ozN1dVW1Xyq2d0r/2l dcfC7Q+pf7EuYcsS1h1xUlSr81IaOg9lguw6Lc+fIwCkoSE++kMLvjQUTd2BFXimqwqBff AoRRcDDHhMcRm0UhJJNWzoLdukNJ3gM= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-390e8df7ab6so1579564f8f.3 for ; Mon, 03 Mar 2025 09:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741021822; x=1741626622; 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=iEl5LoBVGArZ0Hko7f7NcM1d/VPAiCytVB+FzStXmAM=; b=mvPRiM9w8I/SkLWpYhvL0teO9ii+2Pnd/74BZ5PfUmtFp9nTq2gUV6TAR9wr9M4JK1 nXxwqOsH66rvQaMeerZyqpLqoG0AH/FVpx56Yk+ZglYF+MmX2//H7eDcD0kEe0d/I07Y XU9KadA0jnJv0xu+Bkc0Foo/OBWxcmU+/az58ECk8oiy0alL7+woTmD0UMXk/08bEJ7T ybatcU1bJRiIlsUnj3wMg2gRyMbWLCLvxjdp++KxnbMGaxMN0amCzaz9AmK4FogVao+F fk45njJKDBg5R82+tOrWXiqJW+0KaBHxEyDt99lGMs30yssCGmGYi9T6VgeYOFu1BA1U 3Fng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741021822; x=1741626622; 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=iEl5LoBVGArZ0Hko7f7NcM1d/VPAiCytVB+FzStXmAM=; b=lhpPMP7HRm/mPLhNThg98KXaz5k4W1qQaZqvmSxqHQE8GxdYy5UVKtKfySfqGX8qzO NrX/30wQJ9D1bFGy7Y/AAs/Gx1jARdJo+heTwt8T6CRfYAU/4O4C1Ywa1LmhKVeBBqDb +ksvZRLjCqbPJNj5yyXEw8sCi6xFJunTLk2B83xVMj6dol/r2cI8cBXe10M1dUkjeGJ5 gvVMv5hCcrmU5A+dxRcnLsyZqPdXzDYdSW4bd95Cv5f77fhyHM9FldzE6sBFVk/EGtPN opkBWmxeRg2NYviESNtUUed83idMDVizBVvJpEg3oY+nRkPVzJDC3cKlcJs2nB877K/S rQDQ== X-Forwarded-Encrypted: i=1; AJvYcCWqtXMEEP78b1Hm9kzP6hHRtittNF1jwf0oH6nCKRAtvFyrY6rQzYOvLtE/XrsWiS3YfrAo0o4b5A==@kvack.org X-Gm-Message-State: AOJu0YwEX/1D4Up7e5aSUGNQu94bsEwawKKbeGhJRpCCH4KqiTdMpixR wwSbHzxgDQgBAmejwTJUXO+MxpJmcBpLH1Ta4XJx1wizwtvahVRp8FaSx5tb3pOObpSOc4LuuA= = X-Google-Smtp-Source: AGHT+IHgoYpjT7qfoJb2A88YneKFoylvHGn17OMTHx97hw2eQNXCP3h043pd8jbo3m8XgXFe11agjUZICw== X-Received: from wmgg5.prod.google.com ([2002:a05:600d:5:b0:43b:c99a:4af8]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1ac9:b0:391:13ef:1b1b with SMTP id ffacd0b85a97d-39113ef1e57mr1340632f8f.30.1741021821960; Mon, 03 Mar 2025 09:10:21 -0800 (PST) Date: Mon, 3 Mar 2025 17:10:07 +0000 In-Reply-To: <20250303171013.3548775-1-tabba@google.com> Mime-Version: 1.0 References: <20250303171013.3548775-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250303171013.3548775-4-tabba@google.com> Subject: [PATCH v5 3/9] 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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8FFD040021 X-Rspam-User: X-Stat-Signature: dtftezi3einuhwrni5kf1fc9rkwxbjrw X-HE-Tag: 1741021823-764847 X-HE-Meta: U2FsdGVkX1866SjE3gE/njRd3uLc9bghSCjucatTQP0jE9/oO0V95cf/tVOj20Oe96Crz4GySWsgH6ITbEPNiJtqN7bkIfBcqbAH1CfnG3giB597rdoSFRLUu3ERoVv0NFj4WidsxrpCzZbRGu14vZpDAlGhkD+A52Ejd2Ls/BNapyu/sJi1EXhD7hEqYyAaZMrhlF4w6/f5o4cvMUiMpj7D/0S1pzGSbvQ7TuA9G38Y5WZqVRb35r/cM3rs9SwGOhI5XPk+sDAGkHjILiI/Jf8BcitgXLE55TTvH8Je03ad/VUu2mkiDRaM846qOZKHy6tu26y5v9lqgSqQOeJR2uSt4nUPMXmUWXmfIKagBT1U/MkXPiMLsrsfytqXjNdOoeYQ6poEgDt7DynFw+8Bbzohh/hAMTd0ZXqtvqITMrxguhCALCV3G0BUDsQhP3O33hACpYaQGPX42dqou2Ta16hoKaTVt3Ys/A4SRq5mFbdM42fn2urQSzNNtltSn/FfsrdptBeo9L/WXUbJ5YUw7AuSMNBfnGUjpU5MRxoKVwdH2WR7t7h/eC36eeBPNA8b9gTvgn31iZuPfZLVsq+65Mba63cejs72M3tye/+cBv06d5h0rrmLbgJbt95EBnLpVDBpeIf4AbHEEPpgCD6fDYcxBunNvAmex8IjrdTumranZMtrZD1Aq0eC/5YZNVSkqATSoxU/HkvvA6y29hsNzNzAd7/KSBjy+Xk+6N2CJnWbytpyza4CzEIU5Nf63k+fVr7ru7RC1CGFMGhWreh/g6Gs45Gckht37VQnBpWlZs0aI6QCEi/FFUSyrgT/4MD5g4OhpoGyf/ThIi95iHzzsV8nOd7DhvtWv0ljw7AjYUeCH0xO7yt2JHHaLJDKJLzZm40rrO1oHyiQsPjTkhMeP3fnIfTQE8HmBclcrA2RbFOg0JWbL0+eOaN7aczbC5X7NQHG+HY2ym7755tyRCz XQx0gvxC +KCJ3P70Rl4xyqPEdtLcts48P1rCjNPsk5d3T8P4OdEyP2ji6zpL+twEhOmRxz30+TIUUGQLGf486rFUj99Wg1AWqHJRcE+VExtMFIiUaMSL6oZl2RZdcedJwNK8dazUQf5Sv8aQNqyusp21ttSoMxBx84GgXQNfEEr4gZsB2dV/08IdNZriw8CK0gyzK3snOIIQNxXqOEqbtpFHhJHlNFnaMunWtvPmtl2rm5p/GVvYnW0HHTwv0Rel6c47BcgxwG8vvG7fNutT3yPPcEWrU+Nj7DwRLLF/1ksEC9Y0mdZEF2n9i+vR3t0lKbPXfjqrvx5wE52ojcFwWyAwi77ZWrjXW8Z40mD4bFsUIKNZQtSgT06WD8I9L17Rgah9TN9mHG/DOR19ni62BcZD3O6QLWr9lZxgpoOKl3/bVxJymGRQsiv9mMNpxx6J1U47/MAKAsTN9/nZ6uczVFTVilOYEK8LL77LP77ZWKXonRK8KyO0W9NjzwfYg/BJcS/PVAV0arDpT/j1CDZnDZ1SLErMmsmP8pO4td8u2iDIor3hN2/FUIbMsW6i8XQMwdKLw/eSWEoL1wch4bWISD2uWJZMIc+OoEJSPwBmAxm2uSqV0vmo7Dnb2V50pHTTutugBiShvW2+jhj429rftmHuSaoSGAjMjQA== 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 | 105 +++++++++++++++++++++++++++++++++++++++ virt/kvm/kvm_main.c | 4 ++ 4 files changed, 121 insertions(+) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7788e3625f6d..2d025b8ee20e 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_PRIVATE_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 b2aa6bf24d3a..4291956b51ae 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -312,7 +312,112 @@ 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_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(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)) { + switch (PTR_ERR(folio)) { + case -EAGAIN: + ret = VM_FAULT_RETRY; + break; + case -ENOMEM: + ret = VM_FAULT_OOM; + break; + default: + ret = VM_FAULT_SIGBUS; + break; + } + goto out_filemap; + } + + if (folio_test_hwpoison(folio)) { + ret = VM_FAULT_HWPOISON; + goto out_folio; + } + + /* Must be called with folio lock held, i.e., after kvm_gmem_get_folio() */ + if (!kvm_gmem_offset_is_shared(vmf->vma->vm_file, vmf->pgoff)) { + ret = VM_FAULT_SIGBUS; + goto out_folio; + } + + /* + * Only private folios are marked as "guestmem" so far, and we never + * expect private 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; -- 2.48.1.711.g2feabab25a-goog