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 2BD07C83F17 for ; Tue, 15 Jul 2025 09:34:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E68E96B0095; Tue, 15 Jul 2025 05:34:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E42596B0096; Tue, 15 Jul 2025 05:34:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7D026B0098; Tue, 15 Jul 2025 05:34:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C64216B0095 for ; Tue, 15 Jul 2025 05:34:01 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 80D6C10F51C for ; Tue, 15 Jul 2025 09:34:01 +0000 (UTC) X-FDA: 83665987482.10.D34CA93 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf04.hostedemail.com (Postfix) with ESMTP id ADABF40003 for ; Tue, 15 Jul 2025 09:33:59 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AupZRjpf; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3hiB2aAUKCOkeLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3hiB2aAUKCOkeLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752572039; 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=yc2PxbUB6sWoXqmBD+SX5wgz6y1jaRto2Doaa4ZyIEE=; b=3aCwLftaxnLiG702r+M38rCAkown0XztTaSK2GwchCpuLv5f7yFvzroAsmNu3GX9t0JGrP 3yI64u5C/ZNajXe7tBGcgbEdSzK19xablZTV170UryxhTzbbrIiaS6lHXPUtL5POMtBpIA braHn6mB9f5Em94h1XVohhFlAIuKC3U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752572039; a=rsa-sha256; cv=none; b=PK30AaQYbnmLbcdJqUhT74MRFnpYlzurhk1q3lOl2UYGiCpbU9mqdqCpdpO0IPen92IuPs VHxsb3SkBhu6gbAo6ar3kX/T98BDQr+jDoi/L9JK9oshhdtVnlqYZ4xunp3Z1JoG0ag4kj mHvJ4omf/Joq9RqNew/3f9fi0NeVwAI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AupZRjpf; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3hiB2aAUKCOkeLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=3hiB2aAUKCOkeLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-606f507ede7so5684351a12.0 for ; Tue, 15 Jul 2025 02:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752572038; x=1753176838; 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=yc2PxbUB6sWoXqmBD+SX5wgz6y1jaRto2Doaa4ZyIEE=; b=AupZRjpf8PU2vpTumSTO4m9+qbKyonozuVvslrs50rnD+P+XKr7yzz3hyMDuUgAJOe igNNzT0pSqdBOGJV16Z49Q17j3uS1tdxGPxE2WwilCczP7ADJ0jnQwUWxS9lIT1ExYKn T1nCjr9Do2mIxL52MOl8G/EPhvhm4C3MgLWkRAf9iZ8nez4H+nU7jIro+59M5hNMonDI styFEjg4q63580yxDXy5/OogI1haTTuS5t3oIHRJzDf0f9TzRGoB5GhME653fwHc5g2i Q2+AFkEopAYmsYq9C8ZZHcjhs2TK4iyACGYdSNUwtGDQ+UGcIChzGOEMSLcQKkZo5dRH ni8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752572038; x=1753176838; 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=yc2PxbUB6sWoXqmBD+SX5wgz6y1jaRto2Doaa4ZyIEE=; b=sw3gol8BBuV/pULwYlQJiguguFCAfpATmI2ZWzBY32o7wJn3/7OHDYOvWI2fqkSc2/ 0UXCg33iAOP4bsXTWHHHExZ0ytmZh+N6+kZCG7+lAATTyqieEM0DmNyJPVAjK4NCpAv+ XTBgHl2QK7BJqThfz7yr++ITCBrxL6kNpnCG6IaSLs4t2xKyXlismnO/cVmb3YGJGF8+ wC8kMgd3DuiqcHsQ8bW53XIjHEc/RsU9GOPi8EBYcPo/iRJ/MfYJTckNp5OMTzDrecmy YL7mgVYMa8jyRALKaplqI3WPw+Z1OdOMOOD2opwm6GkdBYS03mETul8qLnzU7d4aJxsl L5MA== X-Forwarded-Encrypted: i=1; AJvYcCWYKW6ZMJoIx4WrWVJqLuLKnpS0XI9QpE6qBRTmSg4bRtVpc5lZibviM/EOKfznL50HRCwEPNgyAw==@kvack.org X-Gm-Message-State: AOJu0YzJ9yFj18qidIrMcglESntPSXNM+xYY1iEf8gza6i0uzY32ikBP JHWmjXFzR0nqcUswMuZ1wEBKc9mqPuUms+QzuIwJMgaW/SuAYT0ZzFJpzEqn9i9igSPW1JLYXMe KkQ== X-Google-Smtp-Source: AGHT+IEXYs7T9kwp4zt9Q6duZzuD37c0z/m16xiUI6ublpH8MZEPzSJPqggoJ+YdDeQOgE64Wo1Xc33Ecg== X-Received: from edip15.prod.google.com ([2002:a50:cd8f:0:b0:60c:7ccc:867c]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:4308:b0:606:dee2:42df with SMTP id 4fb4d7f45d1cf-611e8490658mr14145606a12.17.1752572038209; Tue, 15 Jul 2025 02:33:58 -0700 (PDT) Date: Tue, 15 Jul 2025 10:33:32 +0100 In-Reply-To: <20250715093350.2584932-1-tabba@google.com> Mime-Version: 1.0 References: <20250715093350.2584932-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250715093350.2584932-4-tabba@google.com> Subject: [PATCH v14 03/21] KVM: Introduce kvm_arch_supports_gmem() From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, kvmarm@lists.linux.dev 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-Stat-Signature: e61hs38cykxhdpmpamat85qcgncpgmqh X-Rspamd-Queue-Id: ADABF40003 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1752572039-118075 X-HE-Meta: U2FsdGVkX1/C9jsAAHKIOihIPDIS+RfSENa4ZLlG8arKWEXnaQ8dsIgrwNRWPjd4xgiUwT4OtHU3iThNW6x0UL1wwTWEwO14vc9P0u00HTmfArDiEuOhJtgLyjcbEOUgNhKzvvrGNYhBZIJNMnl2qVKMx0idHBx1CPf8lukguKAPfn+YIjQxW26HO97fA+c2Ath9Hp7ltLZBj2cLYKAvBlTvL0UDIwk8Bdti7dBa0aqNn/C18rpSHLl8KzEKb2x0yQ2j74E+cpZXg2Zjk1/dEST+Znz9/Qf9yTLmaDLWW4g0LczC8mA44DdBiFGaA5emMv9oAomy9nssDKv3kgjTlpucoLv3B80H+AKQvSYLymZwj4IXvumdDmXlrODjg89I7UWXeSs0S2R+K5sdeK99uGUz1SyKFbAqmsLpVSKTNAuAeWyPblgvSAtM5I2sx/WsrQU3CzChU0MNdlaKrZ2oICmVAy7hSP0nfSQazqPGanVFdykCkcgH16KiWqo3Emcf5R0w/UZYFohjON2PjUT/X9A1VeCV+J3s5bzZQqpvpjMAEIuWcYV31s2IM90VLXVTGhmom2KRgoQtCtsevZOAeIj+HXL8chCvhhKQAbH086owPQ75bt85U3gAI5G9HiEnSg6cmwzdxOOwrRE5VUs3x0ewFOImSIWRpCJzSCsVKnZN3TyvwoYhWzsOVnWRgE/XDUqOevjl0c+TowvWq4q9KY1YiLwFoJj5DjgOp6gHwQ2V9ELTWOHYpESYqX9P8IOYDMa3jyd/P1kwKVJnuMtiSRKwBkI1mu/4rFx6INCnxXz83syDn3qouSeOKVza/riZdAUlLl/Z3w5CRN3o5lsK5iEj4q8HAdobux4GElUaU5tjsYsSARZgr856U/5JGyo9OPCgWll3YWN9PU4Wca41/y0LtpLNbU3/yyei7YXxw4HuA28JObTzuOzVog+vQW/sJYobT0ocVdGKuiYn8nv UyzZNVcy cuEINOYW7fJ4uwIRYu6vId+vgsiPrJTPlnsma3VG2Ypt7bk9XS67ER+2VWmfXf4Uyp8P2qS+J4GmvBz199tSBNeCBUrtD8ibbLYHDjohj1uZEdnSkmRGfgjWYwPbaoGSQGT2AKPjJR9fjyoniZpf8asV1DLy2pWbzhmArZ60pRTtVXR/5gxhIbeyWG3c69PeJmwrhaggoqsCyON7ArIRxnwCy7xeMZxcZrVSaBQaEMGoaCF9iJwQYIoSORYwcq1DSIlUKSAudeQp1pkoY578rz2pKn/kqRDALU8PFgfXtTQadKFNg1cJvSZf0Lsr3RaWHkNLl4KKfxobA3lawWN553U0ZwiOPioiQhcJuyufGFdfwIuypd/2UyjOiYQYgS3JVK4M6NgJv39Fu/qu/NBXXfpvX9LGFEMjhd9Eu/1eFjXfWp/cpDcntzb6+kkNc9ZWAaeK6/LZ4KZFToeuACkEfIy/PnfqFtaEdmW/mRGVdj8XNZnFze24DLZfecl70sj0/A6dWpz7r2tBJGb4BGSKsWlfF9VT1mAQtmCcxbOxdYr9rawUPIt8Jo0W8K2DvSbGPnRDltB6ha7ocYTDbzNAu4/2C/u7FBHPr+X/Iy9tBcYzcFuS46rqXj8IaJXvUh6V4LZLfTWtBNSplrSHPBVAoJ5cyINlmkkd5dAPzZBh7lrNxEYCR6i7fOAFlfg== 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: Introduce kvm_arch_supports_gmem() to explicitly indicate whether an architecture supports guest_memfd. Previously, kvm_arch_has_private_mem() was used to check for guest_memfd support. However, this conflated guest_memfd with "private" memory, implying that guest_memfd was exclusively for CoCo VMs or other private memory use cases. With the expansion of guest_memfd to support non-private memory, such as shared host mappings, it is necessary to decouple these concepts. The new kvm_arch_supports_gmem() function provides a clear way to check for guest_memfd support. Reviewed-by: Ira Weiny Reviewed-by: Gavin Shan Reviewed-by: Shivank Garg Reviewed-by: Vlastimil Babka Co-developed-by: David Hildenbrand Signed-off-by: David Hildenbrand Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 4 +++- include/linux/kvm_host.h | 11 +++++++++++ virt/kvm/kvm_main.c | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index acb25f935d84..bde811b2d303 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2277,8 +2277,10 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM #define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) +#define kvm_arch_supports_gmem(kvm) kvm_arch_has_private_mem(kvm) #else #define kvm_arch_has_private_mem(kvm) false +#define kvm_arch_supports_gmem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) @@ -2331,7 +2333,7 @@ enum { #define HF_SMM_INSIDE_NMI_MASK (1 << 2) # define KVM_MAX_NR_ADDRESS_SPACES 2 -/* SMM is currently unsupported for guests with private memory. */ +/* SMM is currently unsupported for guests with guest_memfd private memory. */ # define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_has_private_mem(kvm) ? 1 : 2) # define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0) # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 359baaae5e9f..ab1bde048034 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -729,6 +729,17 @@ static inline bool kvm_arch_has_private_mem(struct kvm *kvm) } #endif +/* + * Arch code must define kvm_arch_supports_gmem if support for guest_memfd is + * enabled. + */ +#if !defined(kvm_arch_supports_gmem) && !IS_ENABLED(CONFIG_KVM_GMEM) +static inline bool kvm_arch_supports_gmem(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/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d5f0ec2d321f..162e2a69cc49 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1588,7 +1588,7 @@ static int check_memory_region_flags(struct kvm *kvm, { u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; - if (kvm_arch_has_private_mem(kvm)) + if (kvm_arch_supports_gmem(kvm)) valid_flags |= KVM_MEM_GUEST_MEMFD; /* Dirty logging private memory is not currently supported. */ @@ -4915,7 +4915,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #endif #ifdef CONFIG_KVM_GMEM case KVM_CAP_GUEST_MEMFD: - return !kvm || kvm_arch_has_private_mem(kvm); + return !kvm || kvm_arch_supports_gmem(kvm); #endif default: break; -- 2.50.0.727.gbf7dc18ff4-goog