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 C0140C83F09 for ; Wed, 9 Jul 2025 11:00:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3533D6B00CC; Wed, 9 Jul 2025 06:59:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DD586B00CD; Wed, 9 Jul 2025 06:59:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1561A6B00CE; Wed, 9 Jul 2025 06:59:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EFCFC6B00CC for ; Wed, 9 Jul 2025 06:59:58 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BF77956063 for ; Wed, 9 Jul 2025 10:59:58 +0000 (UTC) X-FDA: 83644431276.07.DBDE8F0 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf27.hostedemail.com (Postfix) with ESMTP id 0D3234000B for ; Wed, 9 Jul 2025 10:59:56 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uM4QwSFs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 3q0tuaAUKCEY1ijjiowwotm.kwutqv25-uus3iks.wzo@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3q0tuaAUKCEY1ijjiowwotm.kwutqv25-uus3iks.wzo@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752058797; a=rsa-sha256; cv=none; b=L3+JZE6HMoy8Via2soHUyZ9X3oSmgnhQPpqZy7xouaAKnFNlbh9hLHFW4Nv3dxRatsNAon vuA+7oR5FqLfr68uKau2Kx2Ue+RgR6NSmtMnPKLMUOYBOZDtTGOUu7tpM4fZrYtwVeh1W9 nwpAV2urndcyOopdqub5FcX9oZQSHG8= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uM4QwSFs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 3q0tuaAUKCEY1ijjiowwotm.kwutqv25-uus3iks.wzo@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3q0tuaAUKCEY1ijjiowwotm.kwutqv25-uus3iks.wzo@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752058797; 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=/2/5k9iCVK4sluqJkzej8GF1zXf8/iatR3hB1LHDLTc=; b=EMHaz71n7x0hAXyYW2bNv99w36cF+XcHmeTlzZ6vNR5QHkJcgYiyT9oKJE8jw7Kd6bVZXY UfsI7VAdcQzWWC9LFKl0Vj/Z9M2zOXQVKAzshNiBzt8m3OrRMeXHyGhb4NkRGEjUfVnqad 6DpuWGQhtzapt6ntQlg61gQjnUXW7Wc= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a6d1394b07so3452200f8f.3 for ; Wed, 09 Jul 2025 03:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752058795; x=1752663595; 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=/2/5k9iCVK4sluqJkzej8GF1zXf8/iatR3hB1LHDLTc=; b=uM4QwSFs58z7yWtIEnuxRv28oHEqM/ie8RhKH8m8ARxBr7V+fmfBaFvxBhtMHjjNfc IdVchFtE6tAOqOo4lNNOjluwA8aAcehZlzHc2wIZ74IadnOrZKISNuzDDfPDVWQZqXyC NFOOeRk9qgPFb4FcYnRSP18QBQAVIJrOOgXZaVHriVq1zhWeNUvIu/Sfjq8/I6OuGgTy Fq2BVuv/VQzXrtv0zOt73u4STWLqDhNTaeroGdw7dIqeJpTUolBuqKiB2h3v/UdnPVdF y6wcE1m8OLtyiaj4OGRkZavm66E6eD5sLE+6clnPCEb4nOFXFWhIQo9vHriWZAD21NjX FUWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752058795; x=1752663595; 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=/2/5k9iCVK4sluqJkzej8GF1zXf8/iatR3hB1LHDLTc=; b=Gk9AKgiXV2ek8HMNp4PLrppetdPXH+1nnKvPdiF+QZ5W1f5wmmZY8kp8y1TP8ufc0+ tJksuHpjyCHx7V3A7irZXwaXAH+u9+lNA1LGY1d8Efge93eR32vxaD06BWh08U79Wtgm /MpzrCDkPGr2a6pJDQA6Lzw94XLrUlcw44OehjCZ/XEHuGZW34QGl5BavcExhxq+W2SD ii0SpSfEvvnsjbvf5SzacJodMPPC5bnbt40GwCoHfUQr+OuXMB94Nrq4lsibD5H5MoTI abd7BN6zcdFljrRJ9fQ3Yoq6JCHJgyzgei98xbqSerrN4Li58oyljgp+D+peOT3ZLa7i 5o8Q== X-Forwarded-Encrypted: i=1; AJvYcCXEcizSC1ZEcLZIyt5vGu3BC58mTNi0q9vAUFWijJzVarI4gFiwmX6711UtsMWgzc8p0YX0fqBYvw==@kvack.org X-Gm-Message-State: AOJu0YwWkvCeF8NJDcCMp7swdXAsmCNWW1owz6MWaYPiEgKOdtHhyUnB iAIppbo4HmeWAg28rRuQpLCF7WEby7bdj0iQYXdVW3vqPVInxSV9OiZh0OSDxgph7b9SEO1Bf/T V4A== X-Google-Smtp-Source: AGHT+IH+GCPnEbUmc5xCDJrxqxEMrnsLUxOEixnkyz4j0lbk37O9I/877tBzCTgA4X6krbxurCDFJURhUQ== X-Received: from wmbhj26.prod.google.com ([2002:a05:600c:529a:b0:451:d76f:e1d7]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:588e:0:b0:3b3:a0f6:e8d0 with SMTP id ffacd0b85a97d-3b5e453ec38mr1599355f8f.54.1752058795174; Wed, 09 Jul 2025 03:59:55 -0700 (PDT) Date: Wed, 9 Jul 2025 11:59:29 +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-4-tabba@google.com> Subject: [PATCH v13 03/20] 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-Rspamd-Server: rspam11 X-Rspam-User: X-Stat-Signature: nmyyopdzjzf73onkckwcas8juhhh97ia X-Rspamd-Queue-Id: 0D3234000B X-HE-Tag: 1752058796-582523 X-HE-Meta: U2FsdGVkX19ULfYtvqaOiSUabT2IbdtoY/k57pEz6KZONYBiLaJC1IdqDKBfz+Uq7nTX0ikpWKYxUokkTlQwvgUv1f5Ua9qWfcLwdTMqVt/ZdpviZAl7k/VR6uRS+bEcNcUmxXqK5MbZHEOsskCL+DEDjsKzvLKQWnl2AmNeGsJRbdehcgBD7oF4zbFlywdHxCJfmqXRKJO7u0awROfLHlTS2lsxZb0rgIzcSgb2CAEflHoB4hxfcjFYHB40shK6ggYGOwX+yMMoR54ro424Hwq81HPRMZz5unpHhiY6oZRasaObZIcogU2bdTj5PfQ1YS1X+++fFSwrSYqUeO5wIkjYJO3UXXDFvShb4M662jEDTvQUa7JftQl8t4mElBumUQCrgSGGZGTm3tLcuF5wlsIhF2LqcA5P1d36a/ukISxPweEkflQB9M+EpGLVXBqUrk/ho5A2DQvwqaHclLaSKOtoqhgaq1qVN4qLkp9TtiNgp7po8ATcb3Eyo/a6L/qtICbi4BcR5p/cdB5BGgyjf8jDJM91MzYoZATK2KvAoHFTGu5uKpIMAnBaKBD/D0viSozoV8hCMXQ8gRuWcRaHnvK4dR/REciTnlaWH0IskGRVDrZeXYhHDJtzPKTbDfPVN2BWySYZpPEPfLysIqk1u3P/hh0StjonBOJ9kj3QWSZk26lY9g5/eguVX4/PrJDmhDCl6wN6O74bRfgL3staozkkZCuVgS10WYxSVojH/unE3+J7oY657etOHrq6XGXdqQZFNlJNrA2n6Vy5B9uEwSOeBR2MwE2Zj0xDbOHqVLOtiA/ln5dCN2aGkHssq7znBfWPCb7QxUeIl6p8N+VGvc+Q57+axYOOeRE3kEoS42Gq/nWa8z8y7lvYGq7Lj/WcPDMaToer1JNjQ/3ELCj2SPtbAmIUFEkFwGeENl8Mm1upBY71Rw1zXae7dcpwFkS0gtUTIu4Zgd/aVYoUbOf UO16hrn4 p53rUWxUYSSsmDMCwhDv0y1pyK4KjFalgynXiiccQbEFM4pOq66Jf/HsRu9f0Io7fwryZaR8TaTU775s9ySYOig1JikRrb6oiO3z5vSemQNPH5W6LW7/MEK94uGHHCLhUlR33OGrnEjgwnEIdb4ywoOc4CuYsgwkIt7iuNdCeOPmrp/KPE3XtPvBgSa6vLoxK2UvrDRp0JuWXAyIWH2u8jIpvYeMg16T81Nxb7btxDnnlUpbwRfYkWzKtvvcV7kI/SJaalrsq5rfz/Tdm1IsAvjllvEUZc7YxIKbhpom4SVjR/JE4Mjb8IAPOVLUwTnBSnzVaRFqtzbD28cDvhDbBQ7V7+ao3NS9YfQOFiQL7VAbZI4Q= 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 66bdd0759d27..09f4f6240d9d 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2271,8 +2271,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) @@ -2325,7 +2327,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 898c3d5a7ba8..afbc025ce4d3 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. */ @@ -4912,7 +4912,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