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 5DEC4C83F09 for ; Wed, 9 Jul 2025 11:00:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1571A6B00CD; Wed, 9 Jul 2025 07:00:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 108346B00CF; Wed, 9 Jul 2025 07:00:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEC976B00D0; Wed, 9 Jul 2025 07:00:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D33246B00CD for ; Wed, 9 Jul 2025 07:00:00 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A19FF55F5A for ; Wed, 9 Jul 2025 11:00:00 +0000 (UTC) X-FDA: 83644431360.28.62AA663 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf07.hostedemail.com (Postfix) with ESMTP id C98C240014 for ; Wed, 9 Jul 2025 10:59:58 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fffVK1HD; spf=pass (imf07.hostedemail.com: domain of 3rUtuaAUKCEg3kllkqyyqvo.mywvsx47-wwu5kmu.y1q@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3rUtuaAUKCEg3kllkqyyqvo.mywvsx47-wwu5kmu.y1q@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752058798; 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=1nerSRvSEN++VGwTZVRhn1CYNqQb3amsSUbSxJbQxyg=; b=0Pf382NgqbToA84e36uBvzxEOgjcVasNVIuDTeixBImhLbc89VHFHEEygtL4azVtzKEQC+ agpfboeUE08K0VCbh1WreugbrUNJCW1jcKRPhwuZcMkKEjGIutu4pf6oG8KCqNITk4EyNZ /crZ3e7V25WGVxzdVAKoC3Qj9/dEkls= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752058798; a=rsa-sha256; cv=none; b=nM6fZHaSenu0elm2ziWjrq42A+rejvidPMiaJUfPEHj01g3v7AtTgryWgk8BNh3XHVOcd6 ktT26RFuZYLTV0yeVQGzF+3cFTL+AOiLOkdq26/NjuHf0NkEbmCvRg4IFtQHfvpxfJFNan AqqCkYbYL+GX9MQi284viiIIUS1/dqM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fffVK1HD; spf=pass (imf07.hostedemail.com: domain of 3rUtuaAUKCEg3kllkqyyqvo.mywvsx47-wwu5kmu.y1q@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3rUtuaAUKCEg3kllkqyyqvo.mywvsx47-wwu5kmu.y1q@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-45311704cdbso38052335e9.1 for ; Wed, 09 Jul 2025 03:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752058797; x=1752663597; 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=1nerSRvSEN++VGwTZVRhn1CYNqQb3amsSUbSxJbQxyg=; b=fffVK1HDHuKFXwhptHaECWQ3PM3WGGKqc+T7g1ai31H1SdGtESAni78MXl6EUCSlJT U/SkQigfg5kTjtFSAUm3cKGHbB590a7whcncQIBazquzZQO0kLJ0umBAXE8xt8qplge8 z0vfHvi8ucSDDJhsTvOAizg5lfcnLgTfaJnrQ4LHWrL/Co2SZCIn44Y+5EP9a4YC1kc6 2E8714h0HK58HmLFP09KCpnKcKZdfZqBByJkxOrMJyb9zBqS7oxxMlTkA1jPsZzgkeGY 4VCAkUEu83VWRhrBzQjH1zpIxxpsuzh051fFCWPIlG42sQ2MHcPvtH5ESz5smbzhW9sb DGCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752058797; x=1752663597; 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=1nerSRvSEN++VGwTZVRhn1CYNqQb3amsSUbSxJbQxyg=; b=Gtp1qoJT8MEl1IZaeI3bvrllFg7NJ9MJrIKKqeRbATyPwVzC73nnfJYW9VUvktyoBf KzSlbPd83yYSskYLAPhHm5tRCOkQd6YABLpGwZ/9p3IM64zMPkZycKTApCfNZhBVwCSg 02W8H8qWMqqyRNxXH8hlJdkKHKM5nRvAExMVunyzJqhw5tY34ZYtSngVcPxGzJIQVVTD KBo64I6DyT2tQu7d0qTuxBLznuP2FRCvVKYTGZIOWzkuuXCt20OdD/kX4veTpDEaf681 Tcfoaw4u/tPu/s13+ZZMjN3xy03UP9WaMR18l5iHaKW7iIw/sSaoWORUkL+AD/hA0WES 5/Jw== X-Forwarded-Encrypted: i=1; AJvYcCVEmXbA6ByJT/BH4WM+N6o/53lR7CWcbo+wUuyWMilT6EIhObGGQouH++OpLQ12uwK3ADDGgMW67w==@kvack.org X-Gm-Message-State: AOJu0YxFAGVTa9KryNHXQtvtiS1H5lZu/iSpTYGzWDJEFHjgFnS2hBTH TBHjN96S95ufavr3fakdk927X28DCzYgbkGU1gJ4T9MuCDR/MTsmIP/xOsC3LhJHjnUDxlAoXNw SIg== X-Google-Smtp-Source: AGHT+IF+FiHZUhkzl6RREu2Ok80YnFe3XuoEKaVzjMwloMyacVfiOCCgEgREFNwx/tC/M70jnYp+B4NiNg== X-Received: from wmbhe3.prod.google.com ([2002:a05:600c:5403:b0:450:da87:cebb]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d03:b0:453:59c2:e4f8 with SMTP id 5b1f17b1804b1-454d532c1c3mr17202785e9.1.1752058797364; Wed, 09 Jul 2025 03:59:57 -0700 (PDT) Date: Wed, 9 Jul 2025 11:59:30 +0100 In-Reply-To: <20250709105946.4009897-1-tabba@google.com> Mime-Version: 1.0 References: <20250709105946.4009897-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250709105946.4009897-5-tabba@google.com> Subject: [PATCH v13 04/20] 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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C98C240014 X-Stat-Signature: 4gis4jiwpmqqxs4if7txbj39nx8n6scz X-HE-Tag: 1752058798-9056 X-HE-Meta: U2FsdGVkX1+oyuBlzavBfXSA/mW17R9tLUZbSC2rvjOsJwI2V6cG31I/CF/7WNRe1Zt8AF5Ed3lFwqAhHDs04SJOWALEuJSYBLmczJxlL/EDeWjy0a0clxN4i/bcYX7lj6FbxzjpGXj3e+QZEQjyzwZXSqatRVKwTIDqlKeMDpN6HovRl7UNmVGJ54hzbgMPb3zp1RebU6bEFHzxD6LQWOgnZwXGt9cxe3jeOXl+064Kx4H2hsCToksiK9bmXE88jFPp+Of201surGDqXehxfNYD7YCUUig3svWxV9uvVUCOrDmxkoLbLEDGDaMI0A2uCJ9fFRtAT6h6Lm9S4InIr5F/prn3NVbIYFYy73p2vhxHIDNBrH0WjLcOCR3ywGpMC68SkhFKMqJp5SEXq8CxTe7WbQF0YCCeWDSVesPUietA55MXfZPss/jV8Za5a7K0QdV21S7q1FVv7TxYeRD6Al1dgaZuXCDPYRpBxS1S1nZDz73xtdbH3sZRxCiemfKlmFwawrVkjlDFp/O10lzsF62UzArOWK75w1gW1vcTrKJaPg+kUq3FTP2BsweOFWERbNCMT66EBXoXTcNeLuK1z+gPl8DPUZQIhdmNkX2cLUegHHHq1DzBJlIYYrqixXHFKudYyCvS1eNvz/ZGp7CgUGTpxAO2kz4XvMSla75F+GVa9VmGDw6oi8kDdcimLDSXGgk0qXvjPCMgCG4RZnH64Pk3UsT1HTEBCo5r6e4vaVsz0VfzHCFWMPzRhFu0zL09fnJ+DtatIJ7E4XjXCzobrawlEkyEu+bwvihGKkde0fRhaVJoIYhlIzVaSrEjGnnyRi+BsdNZhNxaxc2K0eCBZn53ApG+Ej0X5OVZPEDiLhxp26bNouv3mADtVnN+zibnPAWqfnND5groZyeAn7Un/LSAimf3Nj1/M7QcIPlJH2AQON+dL3Uvtp5LDxCzU0vE40W49pPkqSusksDdG70 oRnUzc99 aobhCpHRuTa+ReqrW2PtnkxBb20BkgESy71vVZS0WKzAgM9mQySQd81nh+a+L+CadR9fgDJutbkb/SB7XUWqjs3FjdyJ4tyM5wIXT0d83PO7Z4BAkvEIAlas8rec7vuUr86X4aDqDH13h145i7UZO7ZwYbqhrcImsZFPUGE9ngB8kTzbMgs0FRuYEp6IbPGyNyukR9+Z/dah0z0C3uDtzGpy3d8CwjYKH+a0SZ85KWjXHCNCVyfOz7ah+zyu3/Fwk2G/TnipIQpRsYGOFttsPIdylvgKlsvdUBW3rq9yurzUtW3l19pLJvrFF9C3hKlQmRKbSN4nXW3zJkQEmNnEx4g9AszfELVbx9TUwgcR1RYf5JHIXFhyTgo1wfWDmA8X9oFd9mDCxCLqzeV8UQgLqGkGTFKq5wCpJf5a/6rj1/GfKkhQin10EGyyJpRdzwtdx45fT9anwV4UBa9N96TxgHartRv4DdBiBMQa9PlAEpnVe1qqGa2WwygntjcaJAuxu6Z5asrZnAj2teMNXz/ciPNs7AV0hN6aY3dZ+edHsELmua2248FQeWWWus9DdHolO3nmnXJcpIiah8tKGFq9QmIZm1erCeHjraYxU4s1cRtslt7y59sbkYhDLlC9YWZTIq2YUkg8Whu22CqEglcNvxw1w6A0cR9tgc7hAJzc1LFsLF9y9DKwy20z4L+3uGQHlnMO+bISX5BAWhgJTqIGvh04B0g== 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 09f4f6240d9d..ebddedf0a1f2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1342,6 +1342,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]; @@ -2271,7 +2272,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 1ad20c273f3b..c227516e6a02 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -625,6 +625,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 a9d992d5652f..b34236029383 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12778,8 +12778,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