From patchwork Tue Mar 18 16:18: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: 14021238 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 3A635C28B28 for ; Tue, 18 Mar 2025 16:18:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ACA1280007; Tue, 18 Mar 2025 12:18:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4531A280001; Tue, 18 Mar 2025 12:18:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A5BC280007; Tue, 18 Mar 2025 12:18:33 -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 01BB6280001 for ; Tue, 18 Mar 2025 12:18:32 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3542BC13FE for ; Tue, 18 Mar 2025 16:18:34 +0000 (UTC) X-FDA: 83235179748.23.C977A8A Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf14.hostedemail.com (Postfix) with ESMTP id 54E10100005 for ; Tue, 18 Mar 2025 16:18:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hpe8ghjv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf14.hostedemail.com: domain of 315zZZwUKCLwvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=315zZZwUKCLwvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742314712; a=rsa-sha256; cv=none; b=XHHVtgaidB2o1rxAqpr9wDrGdLuwa9K6MktoinexPjC6yFSTtuTt38dJMbinPknRpLY//r eLBYSgdjFc2Ut4dwZCxp8aCpvNJd+hg6brBVPZxLuWhg1yOBtDv6E7+I9WokdCFhiXD+D5 g9wm5bodKd2Kvt+g9paDtarsBnze9R0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hpe8ghjv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf14.hostedemail.com: domain of 315zZZwUKCLwvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=315zZZwUKCLwvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742314712; 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=YYOa1UU9h8jSjVAqsxgFkmmHWtUaYIzvfBIu4SI+BUA=; b=I37E2b802Ue52tbqt7DYygSQdL8Q7A1mPrf2MkjpM1zyVFhMBzbFHTojQHqUEA0OebiS4B oGZXJt9oNdBVR7Smxk2jn2fwyfJPvuZ/3kTdxXdBTpYDog3iNGmiSXXEp2h+2TTmJCifN0 WHHHKDbUdoch121nFJzBN9XYr0ooTMM= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43cf446681cso20270045e9.1 for ; Tue, 18 Mar 2025 09:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742314711; x=1742919511; 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=YYOa1UU9h8jSjVAqsxgFkmmHWtUaYIzvfBIu4SI+BUA=; b=hpe8ghjv0YSouzW8c8Tq4iiT0vyALcX2KfRt4cLtII4Kn18jWg2BGyrxvHNrc4vsax KoKlvqBaqUe5m8W4K4SKb0VP/9Q0qeHdIvV+u2ek41WLrqrjPMzLvAFMpS1Ef1OwXJIg zccZsInUf2NkMUjrvyP07+zzHA0YhnO3wgsNHWMUKgdUlOF4XLIPoPSFTp5GSG74CDVe A4Of3zu+HvId5cX9yoqOz9jkGqqQ2Tj+jYF6xQJriZvPbBM/Ruwjlv3LP4dYKvUz8eM+ deAiK71ttShwUjYRR/wMwfDbzo56FXdGHnpHHeAc6Dhu+TkxFnPy7iw34NRSeb8RZpJp PVTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742314711; x=1742919511; 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=YYOa1UU9h8jSjVAqsxgFkmmHWtUaYIzvfBIu4SI+BUA=; b=Wnlt0SOlv1B36ihKkw2ZcNw04Kx/jnXn4HwIWffyodOzeClQnmwXkgMegWTCTOd9lV y+ME0xTx4OHfEsHyA5TIvR+/gmgeFpfTJ90vDllnFFYoaYupSZzheRC1FTAR5TayJ8by I1knn/9GEoFkb+zH0xJAugXENf0HLGXP703rHCCGrd6BO30DGL7foNparwN2EmbnHECd c8t5Ml1EVGc+lKV0WqEbjHL0ApcJJvPkP8jywboYYVHREDCmHM6SXRQMDePdPYS47CXg qk7QKbs2eIvu+cEOhY2kNUY0ulyKwV4q0TfxTkxnIea4mV6bz48eMcdJtYlnhs8JbQok Kw2w== X-Forwarded-Encrypted: i=1; AJvYcCVgdbuSQUWvVEy8IZ1MF1U+TQ2SQ9JVSjFLKx1HYPrMFBcVlgXr6mLcqyHfO19eAaz8nh48ditRuw==@kvack.org X-Gm-Message-State: AOJu0Ywfj9nL+uWHPDRGbiZ5QoBwqft3UTl6X9UNxpgs1xv3VSiSqUXh NFgwX1b+nSD7SKz5FlPHDOvXD3TdxabAk83wgzeOTDeHHHAbPsWMl5HUH6YmC/61fp7EpYigwQ= = X-Google-Smtp-Source: AGHT+IFh22cazuiaWoz765xAULeQoPlqrTQHDrVGOZCNL+4GObvqtUFGjre6fKpJHGgToLQW9OVbs++0/Q== X-Received: from wmbz3.prod.google.com ([2002:a05:600c:c083:b0:43d:2038:224c]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:21d1:b0:43d:8ea:8d7a with SMTP id 5b1f17b1804b1-43d3e14ff6fmr19346915e9.28.1742314711005; Tue, 18 Mar 2025 09:18:31 -0700 (PDT) Date: Tue, 18 Mar 2025 16:18:17 +0000 In-Reply-To: <20250318161823.4005529-1-tabba@google.com> Mime-Version: 1.0 References: <20250318161823.4005529-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318161823.4005529-4-tabba@google.com> Subject: [PATCH v7 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 X-Rspam-User: X-Rspamd-Queue-Id: 54E10100005 X-Stat-Signature: 96gswyjdppcei7cpy9nphyjuuukofkeo X-Rspamd-Server: rspam06 X-HE-Tag: 1742314712-145855 X-HE-Meta: U2FsdGVkX1/27vWA8wzLQ6W1a+4hd9puNIIpAJYBST9LL9uc64bmKvKUq175jbbRBMPENNtXw5GwKTQ/8XG9zNWCFapyq/9E7aHU24+RLQKwCeUS59VSIEXY9iJhFs1ZyMwH7RDtlPAr5AUOdyy5fXotoOT2jlJl4M6wLwiXfWY3t44u68Mjj8cI4SlbBKpY1UV/OCCO7xt/EezOFo5taraoiuDlv/0h2+mh4oOyZM/SER9fYsIoW6eaZW33Kd2QvYGGNCZ2jpldyU2a0B7lAOPTMrz3YZcD31qxe4eyNtLO1Bq8FS7gWF0vM2oruqExjLlW320oH9cXSADuJoP32z6uTdOD7kQ3wbTapLn4qMWsoBy3hQevSdbU1UQc6OzLRHEy5MxyFaSjoaJIog3RfT7Bso82skJvXINRbnggOs2gA+FFcwDmSbMaAkb/9l0UnJyxjltgBOm+NjPsaG+d3FSYU8MzjKr1ZhuUJwjfwi3IxDqDY4dCYxiFmULBkfN1SFpYkeE367DYXw+k0Ak0VDoauRKVg7JgENWNdXvi8oMh/i8HvtcakrTxIplt7z1bBsVbb7nNFHptBk7+23YQcoggGRnrzn+0tOnZell7tAyTTAzUQQFgNqayd69x8CnRqRxg2a339TyX/E+ZMfVeetMwDiN/PweXCu3xLu3K+1SWMQ5MYXc71xt93WKutIVBkihyH3+lSH78MPG3GrV78q54owhS+VGTtMXd5cuAOzpW3gIMqdTTOYjLGymjSKB5KseQes/RNAPVoe14GNTRfl3QCt0ZGsPb1lDhpTpu1WkXcSCIf689ayKmdkY3iO+pHBew8U7hBybDcTFyoYLq9rjikORrvU8i1q3YzFYXpjxZdLzZ/XN58UXwLyQOwcBiQT5nnqAZT/X+YL4E/bSNPphxr5Fzdqd/p3FdhTfHvR1l03z8zj14FS0xIKIYNny+jS37SF0hZLoqMmhUgZC VN9ayY03 VOPKKJ4B8Z1OiFwblqk1QMTA0C2ub6OXDHgjiEfnR/RHr2M6RWaDDibBty9PntW4m3TTd05ZWKouICgS07zpz5f1Idd5/nLmuAmyx6mg2+S7QIwLDi8VBtKah7vLbRAl+xZlVQWaXGCXN8XnR0QT57NIJvWqVTYbFmpguGsGMxzYvoUSEvfL5cE9/52Kt/mmp0dP31HqaHQhM/SMTtQ3F6Ml/W+O+tnqTdV5Xuvy2yAqg1ZHViYFCfgMFEXmdbx5C0rbhXIgaFvmFfNFqBU8O3PDJbck/trex30EgnFh45wQR8qTlG/jP1oTEZl+pOR4uyakVZo9eOugnEQ4e0oJcm7q0Ti1l297jY7X+bczXtjA50hWyWKcDZALodcU2b/CvWYkpcTWakmckoH/XFxN5HRaQr5GvHdAqcvLvg0T9Fr3YGBMQMUVGkLVWULJ6hDFP8V4uEU+nPNGu94hT9mKlv4SCEgsWVPtt4oozFb4pET607DIv7vv2JyP94aAhhfPGtMHoaP5v0w5xHkMTrq70uSDIuwbQSJiY2DhwsgF23DNo/6289FlGQc1o0pV1kOk412d6NUtQq7MZjklkt9imTF4goSN/5gl4pir9w0J+APnOJjrtKW+cfGtbGaIyZO1X4R1AEPOLMPvBRVerfOrcJVxQMg== 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 | 101 +++++++++++++++++++++++++++++++++++++++ virt/kvm/kvm_main.c | 4 ++ 4 files changed, 117 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..fbf89e643add 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -320,7 +320,108 @@ 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)) { + 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; + } + + /* + * 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;