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 AEB63C54ED1 for ; Tue, 27 May 2025 18:03:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7CEA6B009E; Tue, 27 May 2025 14:03:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2E6A6B009F; Tue, 27 May 2025 14:03:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF5146B00A0; Tue, 27 May 2025 14:03:08 -0400 (EDT) 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 ABB1B6B009E for ; Tue, 27 May 2025 14:03:08 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 56763C137B for ; Tue, 27 May 2025 18:03:08 +0000 (UTC) X-FDA: 83489459256.30.F1E7533 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf04.hostedemail.com (Postfix) with ESMTP id 67F524000A for ; Tue, 27 May 2025 18:03:06 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=u0mf6t3N; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3WP41aAUKCHUmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3WP41aAUKCHUmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748368986; 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=vX7z/HyuGmtzDlVVFq4xd5F5VW4gqdbtxi0TML5OdT8=; b=oZeIX3ZPcHPk/b6EJWTx8DZ33XrZDCoNFY2yMd+nSiJ4b4dveD68Y7EPblmkhabOLrgRR8 FZMMcCp63m5rNceXe9wzoQjC53x4AKKKgKo80N8KAUbph4w2xrm7ebCG+55EmmIuj/O/yB JPcHpBUhy/ALUeCAs73QK6dR060aPgw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=u0mf6t3N; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3WP41aAUKCHUmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3WP41aAUKCHUmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368986; a=rsa-sha256; cv=none; b=RhvpxruJY4QMsr5pA5RB9uu7GsyUHANLYBaYL/N8FodVVI7XakuYcr2t+F0wpTvN/nuD0p VSgJU2VZilYO5K8XygJokPVGo98zYQBGF3dwFFvn/8cnVtJ2s8IkKh1yFTxBxX3OdlyHsh j5+WPaJk5wqgGtvPs9Qs3rbor+gH5Vg= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d0830c3f7so29159815e9.2 for ; Tue, 27 May 2025 11:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368985; x=1748973785; 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=vX7z/HyuGmtzDlVVFq4xd5F5VW4gqdbtxi0TML5OdT8=; b=u0mf6t3NMUseGDiE44E2W4YIfE8Qx1X1m+S/SlPYPqNQ+yK7ofPUx9Z8rE+zDuVL2r 01wQGai7uyAkorPaN1uH419IkE7TnFUCO1yWAssHJbMG7Fv1Ywwa7zhr1o62wrXU+0EC mn/4Hox0iyX4P7zvRoLZijv9FvZMbNQL6vlf/DhwC3a99eHz0RhLoOvmGY/EfRWf1xjJ 5XIo05hLhUUWD62YgDeveg8HMl1HbH8Yuz/TSGxvFzWWwOKNS4g09suZQ2nW52qgpgMe o+m2/2zLyu18igdSHzGZrLmfJEicA4kMY7xk3VXIUM69UfBQka3cHHWIP4BwjCJF7yBg OwUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368985; x=1748973785; 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=vX7z/HyuGmtzDlVVFq4xd5F5VW4gqdbtxi0TML5OdT8=; b=BChX6eAfa+3Epe60fK0RiTHcnq1oJ24wvPqRNYP1HA3Fqb5qm4hqEHCbty/uIFAf03 8rotxGC558XjPbIBh4t5sgKOWv6aWgft+azcltO0+qImdFWqDtlzZuUIFdHTwjsnHzfU 02mo0EuO+2MPtrGnkIdu6B8IZeuM7LGdC7iZfp3gzpw87wwhZ4aKetqAwKoLH4G30LXd WnbaxY8GMaFhEuioLuQwnlivIK9a8EEi9AgOZ4zZAnLmmQS57CB2lzgrME97K+3ECLAh j+2l+7rN99unFGDS45g7aLpLD8eqxKDoe0Txc8wjgsEkezn3MSFlnR63PdmOXN530CLk qFyQ== X-Forwarded-Encrypted: i=1; AJvYcCUjbINc1tCDg8eTXlMbdTPCX1zXPLbTEnLKGk56oma+8009KLZiBUKgmNEb5zEOq79ogdBngV1DxA==@kvack.org X-Gm-Message-State: AOJu0YxeYNjtiuJeJdQ3NNWbj6A0r2a308VrcxBO19oULv3mCrN/8f2o QgYq00TYmy+SWAHRnvVeHHbGA20J40gW//yOsMBdvyhEd1qUME5RzQEXKaWV+kUZmvxVWrgn479 l/w== X-Google-Smtp-Source: AGHT+IHm2QpLuppopnrLbiEdYMpqiHL9Z+DX8uPYQe0kFHM4Ap6KdDfZYYe7oYWFnkWPUHOflJMK8/QPyw== X-Received: from wmbbi21.prod.google.com ([2002:a05:600c:3d95:b0:43c:ebbe:4bce]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f43:b0:442:e0e0:250 with SMTP id 5b1f17b1804b1-44c933ed7efmr124297415e9.29.1748368984939; Tue, 27 May 2025 11:03:04 -0700 (PDT) Date: Tue, 27 May 2025 19:02:38 +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-10-tabba@google.com> Subject: [PATCH v10 09/16] KVM: guest_memfd: Track shared memory support in memslot 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: 67F524000A X-Stat-Signature: effsqt3nipuirpuhkuzdwfo87t7xxi3g X-Rspam-User: X-HE-Tag: 1748368986-139253 X-HE-Meta: U2FsdGVkX1+CziXMKTraAXNvdlINou5DXgFfcPqrk+GgFYMLXiKOs4y43mOYi3P7FPuAUIt6gW8qnVCqysyQRMukUvEwQHAEz4obROS37gNFomoT3VDI9LZgCqwuCHhG3/p2CfFO2fJ0JM3k4aNSgofzAiJNxbMu++Mal+yEgEm2BnSMmHN2qctirsxbPvkRpDcNlOWQ+mBcmjfpUn+PXf1GG2FoxJAU+l54hhtgWOUg8QNtOCfJHE2Xv+e18y0kJbcv5x0BV941NCHteMpYPEQ6aEtHzN35/UPd6NPvI40URrG6MJ5y+SULnE5dNE+XysJ+MSNyv8affXXWHerszUu94TYGTBRj1etLMwyJp7q1WbarO1nUfSijRaRIYJbDUhTy/vyKN38jYBkPwHa0KBTSxsfwR6j0wW0G9tZmi5lQA6kJ2LDLF6L+8iP4oWpbdrLII2oEX2UzxRlpHAHUDgoeRetxwRKF/KHwMpgThBNHKfK7z8eBlS1koiij8oUORKxuyFCuqwLoM2JW7lcGJR3yTsjKtOjtcE29hptlcRgvSWYwZW8yHJqwzQreULeqnV2RJShaHgYbbVJGwlVelZnHgN09IOHEDHsoI4rx5dNzAoG6qDvH4IIO3pXOgClVoNTltunJ2/9MQNv3VUC38OGmTLMrIKnBbfvjq3B+FS00DXHewkrLbAnEiosFomPhNepZYzLSklqf/9Oorpq3R041v8x/oDrX0DFLpD9bAbDa/Wzl5IjmONQ/T/NVY1lj3F6PqXjb1EpkBKvWyd/LqdkwWBbUgQHu+uULRbUoUFGIyYQrRGqbOkRiT9z/RdbAS7+qYyEtj4FB0hH/mzQy4qT5KcUPSE6DdPFmYmHMKspsmGPUapNMzYQdq819SnCz/NcDkqpl1NIXAhviNeCtC8wj+uhf3Qhf+Oi2MuI/PlgZeRTI78jzTuP0jOUJ/lOp5T8b/zTmhNIpSDkFA55 TLUrhVI5 mjVEb1NTvkCXc3f6kM0KDI3ZrJ+JRQjNYD2aL/p/IXd7jC0ImUZKCGTXHXM2xf23fC9FQzvEy2veYu/cbGxjSmmMYAyS1JnV8TuDcgkB4VytW0N8vTmbE5Scj7NLjPFOOlIRtkVqVrv2yPXvnk/4xKpXgAtgyyTf6632UM3aMsO6ZSh0itxZGuv3sTv72eh0N3kHcazCTtLyKZoGAOHuSDmCEyL0MCaxFhaL6jqgaIOkoyyFB8b21NOjen1DEqCRXQCCK1pMpmRfpiEXrlgS6ycWnV716GdBr0VTIPJveNYIMvNm0Pnxs+v8ApTTe9yv1pi8t1geV5eJfhTHAe/4Ywz1SyXiWMVUy4QIyQNak0ubm3yKCow01wB+EKW7RJk8WerGQ9tWELn/6O8SRCOutirMQCo39J5Wxhiw6rSdhrRgQBw4aizrHINRqjC8Cf+tKFBs+J5H5x6S/GujIkN+H3gqlT6PXuh+Q/yCl9EdxhTvoa8Z2YHbXDkB/rxWDVVEuQ6ekiz0LJFlOWOgMFKdBjN/S4yiyT78JIq97uRvK2YjZTCfD3LHLHPbOLEMMSIwwf0Y3/i0uT3SPicerqe1K8GoWc5MS3Ty2cSFOCjIubfFQWqrFQ146PdQZSv0LoiXoAf20xAwb3a9fBFEgVDyYcpf9vg/Vn6bMx9mT6CeRzpYTVAE= 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: Track whether a guest_memfd-backed memslot supports shared memory within the memslot itself, using the flags field. The top half of memslot flags is reserved for internal use in KVM. Add a flag there to track shared memory support. This saves the caller from having to check the guest_memfd-backed file for this support, a potentially more expensive operation due to the need to get/put the file. Suggested-by: David Hildenbrand Signed-off-by: Fuad Tabba --- include/linux/kvm_host.h | 11 ++++++++++- virt/kvm/guest_memfd.c | 8 ++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ba83547e62b0..edb3795a64b9 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -54,7 +54,8 @@ * used in kvm, other bits are visible for userspace which are defined in * include/uapi/linux/kvm.h. */ -#define KVM_MEMSLOT_INVALID (1UL << 16) +#define KVM_MEMSLOT_INVALID (1UL << 16) +#define KVM_MEMSLOT_SUPPORTS_SHARED (1UL << 17) /* * Bit 63 of the memslot generation number is an "update in-progress flag", @@ -2502,6 +2503,14 @@ static inline void kvm_prepare_memory_fault_exit(struct kvm_vcpu *vcpu, vcpu->run->memory_fault.flags |= KVM_MEMORY_EXIT_FLAG_PRIVATE; } +static inline bool kvm_gmem_memslot_supports_shared(const struct kvm_memory_slot *slot) +{ + if (!IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM)) + return false; + + return slot->flags & KVM_MEMSLOT_SUPPORTS_SHARED; +} + #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES static inline unsigned long kvm_get_memory_attributes(struct kvm *kvm, gfn_t gfn) { diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 5d34712f64fc..9ded8d5139ee 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -555,6 +555,7 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, loff_t size = slot->npages << PAGE_SHIFT; unsigned long start, end; struct kvm_gmem *gmem; + bool supports_shared; struct inode *inode; struct file *file; int r = -EINVAL; @@ -578,8 +579,9 @@ 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)) + supports_shared = kvm_gmem_supports_shared(inode); + + if (supports_shared && !kvm_arch_supports_gmem_shared_mem(kvm)) goto err; filemap_invalidate_lock(inode->i_mapping); @@ -600,6 +602,8 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, */ WRITE_ONCE(slot->gmem.file, file); slot->gmem.pgoff = start; + if (supports_shared) + slot->flags |= KVM_MEMSLOT_SUPPORTS_SHARED; xa_store_range(&gmem->bindings, start, end - 1, slot, GFP_KERNEL); filemap_invalidate_unlock(inode->i_mapping); -- 2.49.0.1164.gab81da1b16-goog