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 4CA38C83F17 for ; Tue, 15 Jul 2025 09:34:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F04FA6B0098; Tue, 15 Jul 2025 05:34:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EDC076B0099; Tue, 15 Jul 2025 05:34:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1A416B009A; Tue, 15 Jul 2025 05:34:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D19796B0098 for ; Tue, 15 Jul 2025 05:34:03 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 89B031A02ED for ; Tue, 15 Jul 2025 09:34:03 +0000 (UTC) X-FDA: 83665987566.20.559A43F Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf06.hostedemail.com (Postfix) with ESMTP id B26DF180003 for ; Tue, 15 Jul 2025 09:34:01 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wxXaabb5; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3iCB2aAUKCOsgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3iCB2aAUKCOsgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752572041; 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=3DYVEI39SWNvG2Wl18mhIKrWLwyIMRXgpmMWGxxyFcM=; b=O3Ajo0otbDmjeEM0Qf/oVMYaw+hyKuFRtvo12lPS5zWYzdC9xkMUMbjlEhZYq025l63zsc 22mpaTlXCfnL2LbLKZi7SC056+RyFUt/eDBY2wF/AM0kVkfgpYQO+/FvhZVW6fwaOce+ku 5ZUiX9Addo+yvIZEvl0bMndJEMzuYXE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752572041; a=rsa-sha256; cv=none; b=GBihM7SOoN1CRZrp1/9K0t4NgpJBE89AZmOSJaZ1wTQ13ZIN7yTkeBE8KRTkdgQ9ByP1EG Rs/ZoVXUAe28TRBss84cytJm2azSoCzZ8rBwitqygwZ54nJLcjTYxJSYkQo21a5pNDdISL vDK1pBWjFxdDQDRv+UnuiVoubVdNU6Q= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wxXaabb5; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of 3iCB2aAUKCOsgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3iCB2aAUKCOsgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-455f79a2a16so29649865e9.2 for ; Tue, 15 Jul 2025 02:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752572040; x=1753176840; 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=3DYVEI39SWNvG2Wl18mhIKrWLwyIMRXgpmMWGxxyFcM=; b=wxXaabb5DxXu3BJYpYuqYqLdqV73wI98K7MrRkLtBJbEVcuWyici5+O/kCDOyfvc67 6+Dko+YJ73K4+XhsgE60KoiyGN+vPpJOBJ/ka/GHGGGBa2I9EKQu9UUln9UIditrtfuG cgc3UqxMMPOgDujk5lBR0fbPLFzEn6V38FqQpTNIxmV+dAbOuNY2wXOtMCDcz3GzVBRb yXWvRh+J66KCzT4IRnhV2IsdqordX4hUP1MRzvy8125v22LEpioXyLv7TzDMBXkUoGA8 Z1HiVj5AVkkE41CgWXgCwxYS1Xlp3sRIZDVWosx6YJCs/9wSr6Zo7UgTN/aMupE2BgIH 0geg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752572040; x=1753176840; 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=3DYVEI39SWNvG2Wl18mhIKrWLwyIMRXgpmMWGxxyFcM=; b=sPZovqMO91rc7KCWlLgMijaQHqtRP8XGPBz8WT14emiEBVc2qR98Fr7MsfuqCC3fTb Hb9hCko7iBOYR4vIRNiyhmOcE47n6fkM+Zl+5llTWun1bdoTh2F1MzfvaJt8M+ztnnjm 1YrGHDx+ZQYyLOjBS1f84vSzRO8kJ5QP65gU0k/BB7QJQMoL+4Hj2nGP+PHFvLJ8EiUd FOcNwkxTZPy103RNLT7qCuVy1p5oQgJp14Vnx/+1V6FQxUmEOO9X0wOhNyfEaDX5dScM 9NZUtdXipF3VChpFay4iYq2YVCiYcpVAgPRWaQlC7jY7pWrPvoAJ8mGtsdHGoIL1eH1h ygKQ== X-Forwarded-Encrypted: i=1; AJvYcCUqOTkvRPkKx+gBHVkK2vvKKxFX2iIrlSHB8QSafsVZBwfYxgSWq3f+j2cj9IAh6dLMF71q/RZ4ng==@kvack.org X-Gm-Message-State: AOJu0YyYnuet25YMHBlDKguFJ6V2WFhm5CCGNDdWMSViFs2aLyeUQ3aX a/ldujMOtw7DRUezeakBjcZin7fIj3sPstVSP2NuQfONprvtC/0f7UtI6VpEQ18U5XpxiZJCBtH cAg== X-Google-Smtp-Source: AGHT+IH9DNCTDPtVSANZIsCSp8MKaKu0nMzeS7WOeY3KHG9FbMBNN5PsCAbOczJ3kY0XI1NQSbVglZ8RBA== X-Received: from wmbfp27.prod.google.com ([2002:a05:600c:699b:b0:456:17a7:3772]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:310a:b0:43d:4686:5cfb with SMTP id 5b1f17b1804b1-4562751c28bmr16103615e9.27.1752572040145; Tue, 15 Jul 2025 02:34:00 -0700 (PDT) Date: Tue, 15 Jul 2025 10:33:33 +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-5-tabba@google.com> Subject: [PATCH v14 04/21] KVM: x86: 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-Rspamd-Queue-Id: B26DF180003 X-Stat-Signature: drsk9s8zzppu8cgcjs5np1w5txmns4ca X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1752572041-209676 X-HE-Meta: U2FsdGVkX1/iC9t9Cf+ze85XnQ93l98+F1EvrZ4zUpiLmwD/zUYqTVdMt/iWoCxSx5kZ5s7vIBRGPhqOAQJ6Q3Y56yBZyD/zrR0rlRB5lNTPDeGBJFw1Sa5tk08d3K9Ba7UlAY1UiaQQvID+eFdqdrjf4SMaTwcaGwo6jh1JZkEBtCGdSj7mAVs6Npy3EOu30ffomqmLkN92iAj28Z5XhI69TGN66IO0rTM963W90p9J3YLIq1OqblSnOfKSjd5OZWxIBM5BJu+H56/7T4TDwbr3iQ09awf7mZEcDhq8qcwuklF+PSrg3Y2BRgzq+0WDadM4RPZwZgtesQM4yqZT3QsMrQipCwQKHtF0geJJ5Gl82I9BVKIq6Oau7OzqtVu0PiQGcd2s6n0d1oL7v//LW7Q7lcfLc5keaQBrJVuXZv2zlZzUfJOr6A8icq7bF8Jk3SXS/cAp58hmXumeJJFnpqikQUd6jlopxE0Jzn7z6vvu62zdQRNOXU7WjjNIOQEEdodX6gF2Fkdsc5k0QHggyZsrEZwdz/iRlqj3+xbentGcG1qEEFItQVWJJtXT60idgYksEBfqh7wEctqZoM56dmNz93TmuOoeTfbGzfuO3Jpc1QoUpKb2yp+IlnVXMpwXzJWxgwHejp6wC4LWvx4N1vGpuUjdp/72+JRiAa8X/17hZ12PtRxNfnF7td63wx4wAbXQLfqvn/XiEmBCiHaXJ3jBhA/iDCUUZYLjF+Kpm9sVA0/pBOvxZcI43Oq9PYX31iMWwGA9Z7FiiuzKNtmcnZxn5IF+Yy3pitr12gu24USKZU1TrP70elJpNR0R95cRvaSZ1NhHoIIeLfa9IVyrPU1jWLTglXAdTV1d3OiAPCjEtulg48xVTDqEI/HwlD3jCs3sxe8jYjjOGJcG4PREuagyHp5LiDDN92NGeZBsZZJ/JuFfn4PIvchjUHc2pD4EUkjFxai/eV6V0cLA9gH dKFmrl74 Y88G4ubrgjgo9biFeM9+x4fiS8OkLv5ERxjhIYxoaWfcM3n3wQJYmR4zrAP/SZhaqYZvh0TsfFL1C+GlUi5VOXd+Ue7lYKMmFm5+Cldvg60iTsL5v0WeuPltQxNZddpmSJKyNWdMrWayOVi0iDpe8QjX5bn3wFnZWc2h3z6aBR2WBMQhtcqgy2G2YUsDwj+C91c7Tzm3/Z/ZTKAxXqOJa7RBAgFmUvXrdOnHvADBvC3cUGWlUt7g1J5jbb/coKU4Q6i6q/GRST5xfbTBhAmeqEIZq2LmpgEGM5bhlQMUBFBbH+3rCJYMiiSNbAlif6hMLaLUMj5gyvc4YhDFvsOYsJz+yJ5riI5E2/n7LTHeNhKJNyw9c8zjpao4aCRFCqzeRaGq7PifLWAykaBDGERwS5mR4eRkBajfLEkM7GSOlms7c34I+9aLiMSG1vJVc6ImComE3kXDDtLtiOJgaKdNCfthjDBy3yvTconTi4zNlQ/LId26GnZ/bZlcb+fQWYXjYIrxdcdFF614B5NbqaK9oIEAvHAD1N2i7Xt2E2lCD4u9mHIYTQrq519hv0GZjqkdGBc69pL0FIEzbpNphEiVHzXjvdl892n+43pX6ni09PbFw2UjxY9YjpJ/iAtFDS19fhqPuK4+1ToBY0JradfyGO05PKOGufod2NplhGHpPKOmWMWtaPqLRU+N8h1vHNip1uPUkgbs4KTHtWIa2LY0GIdXauw== 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 a new boolean member, supports_gmem, to kvm->arch. Previously, the has_private_mem boolean within kvm->arch was implicitly used to indicate whether guest_memfd was supported for a KVM instance. However, with the broader support for guest_memfd, it's not exclusively for private or confidential memory. Therefore, it's necessary to distinguish between a VM's general guest_memfd capabilities and its support for private memory. This new supports_gmem member will now explicitly indicate guest_memfd support for a given VM, allowing has_private_mem to represent only support for private memory. 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 | 3 ++- arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/vmx/tdx.c | 1 + arch/x86/kvm/x86.c | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index bde811b2d303..938b5be03d33 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1348,6 +1348,7 @@ struct kvm_arch { u8 mmu_valid_gen; u8 vm_type; bool has_private_mem; + bool supports_gmem; bool has_protected_state; bool pre_fault_allowed; struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES]; @@ -2277,7 +2278,7 @@ 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) +#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.supports_gmem) #else #define kvm_arch_has_private_mem(kvm) false #define kvm_arch_supports_gmem(kvm) false diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ab9b947dbf4f..d1c484eaa8ad 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5181,6 +5181,7 @@ static int svm_vm_init(struct kvm *kvm) to_kvm_sev_info(kvm)->need_init = true; kvm->arch.has_private_mem = (type == KVM_X86_SNP_VM); + kvm->arch.supports_gmem = (type == KVM_X86_SNP_VM); kvm->arch.pre_fault_allowed = !kvm->arch.has_private_mem; } diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index f31ccdeb905b..a3db6df245ee 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -632,6 +632,7 @@ int tdx_vm_init(struct kvm *kvm) kvm->arch.has_protected_state = true; kvm->arch.has_private_mem = true; + kvm->arch.supports_gmem = true; kvm->arch.disabled_quirks |= KVM_X86_QUIRK_IGNORE_GUEST_PAT; /* diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 357b9e3a6cef..adbdc2cc97d4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12780,8 +12780,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; kvm->arch.vm_type = type; - kvm->arch.has_private_mem = - (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.has_private_mem = (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.supports_gmem = (type == KVM_X86_SW_PROTECTED_VM); /* Decided by the vendor code for other VM types. */ kvm->arch.pre_fault_allowed = type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; -- 2.50.0.727.gbf7dc18ff4-goog