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 10B1EC83F38 for ; Thu, 17 Jul 2025 16:27:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB9546B009B; Thu, 17 Jul 2025 12:27:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E41FE6B009D; Thu, 17 Jul 2025 12:27:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0A886B00A0; Thu, 17 Jul 2025 12:27:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AFA1B6B009B for ; Thu, 17 Jul 2025 12:27:36 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 781AB56525 for ; Thu, 17 Jul 2025 16:27:36 +0000 (UTC) X-FDA: 83674287312.26.5036F47 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf30.hostedemail.com (Postfix) with ESMTP id A137180008 for ; Thu, 17 Jul 2025 16:27:34 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Wa8/9Aqk"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3dSR5aAUKCOwhOPPOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3dSR5aAUKCOwhOPPOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752769654; a=rsa-sha256; cv=none; b=aIYdj0JEI+SK57mM0QZDAfGTsgdwzbbToFvM2hfaZSkLtSd7zOxe/QlWMmvF7brW8xtn2k 2dKaDFKShK/lchodHvr+nizdh82gHO5FByOYRC9/m6nc2Po/qMfsxy90MDPavQKF6MbQRG LEH0Nkgm9XeZ4UK0k2CcN5QsCy1EoVI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Wa8/9Aqk"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3dSR5aAUKCOwhOPPOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3dSR5aAUKCOwhOPPOUccUZS.QcaZWbil-aaYjOQY.cfU@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752769654; 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=OwBI4cEB+TRNR4XksyGHvq+g7peJQ0a/0MVEGgbMNxM=; b=O860AGEZJN/VP03M5bShnxVhq/nFOW1oQtmjTPbGxb6qlDAgTQ+Gujskz8uEp4xXqrkZEc eC+l6JdkRQuSBs57DsTWtIEP+TL4SkAMzfky2cHVDEL4Qzhfrhnv+rFMbb3AF2lba8Ec3b KIAb7NZfoIswT0L1JyzTTrhiWCpTpEU= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a503f28b09so695636f8f.0 for ; Thu, 17 Jul 2025 09:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752769653; x=1753374453; 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=OwBI4cEB+TRNR4XksyGHvq+g7peJQ0a/0MVEGgbMNxM=; b=Wa8/9Aqk+QuhALsidgIQh/Q7Qn0dnP0wIkyzC86yCch6sKfqQmtyx/o6w7MKqsvoGB JsqrLlJ3aAEKMV+KIYhvtr3FNYbItZoUD8kbO1smwcyS/K+vejopKyfJcwZGXlVU2WQi MkdRZ85X0ubZWRSNM286I7dwGheLSkFQgz2muO5dZOsRHlMuXyMW5WJ25+gJYJVg2dgI 52zpqSCULi7qb5kUpJahs/EVfv1DarmFD7FrdmmG/iGZfPeKbp4Wxxi0Rj1nWzy5m+1C wNn25K48PlcpYOYed6lZzC7FyOxZjC4cBmhmMzLiuFKiqpKmIsjzfIoWNVuXn8tGs70p 2quQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752769653; x=1753374453; 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=OwBI4cEB+TRNR4XksyGHvq+g7peJQ0a/0MVEGgbMNxM=; b=vZ48GvphGruLaPrbEQ1EBR9ByiOHY0oadVnPl0kPcTR9tq5N9Yrsk866tugU2GchjJ uVHMh2evPnyEIuN6k3l8LZMiW5qVZt/9djQQub6aynRNW3ZUSzlwNZTbUOVtReLQ2WC0 dDiLgVvH2bzL1W9CsG42hAA5WXkcQezyBUI+s8mxHuTCkG23lsOCSIMYaPRbyIQDKDlM nHjUY9uhU8pK4ag47qA65+OKmDrF5zrS8kIayyiF7clzH+yRyl9MwQE2HcXqiaHWhRHH IfXs3hNlKRer0n47wwIsuqCI1tLXaLtEpBty66bpY9NgEA0GgK/nRIpBkXaN8ZrLZLXE Krcg== X-Forwarded-Encrypted: i=1; AJvYcCVqjiHTzAbEG9PtFk/cOJwigcY2n+jvlKr40dP6IfgFNF57z9nduXaZyWxTtLy4TvIjQrrDHqLiZg==@kvack.org X-Gm-Message-State: AOJu0Yy0rNPsi8c3hvZuypw8D6dvMLWjXHigzwNbTVLO3gkb1l7vq0Oq nRy3KUz8yyTTrYdW7eDjoOQpiXMBsR1ySIs66IcsFrmFteSYYNKVDC4ox0wXU0jlEs3Hnq+dnP7 Akw== X-Google-Smtp-Source: AGHT+IEM4lHoz3t1+4ua91KO9viNneVfr63lY3gUPJtmPMensYH57iB8X1KIWdMTkwUUIEzssOT6NQr3rQ== X-Received: from wmbbi23.prod.google.com ([2002:a05:600c:3d97:b0:456:257a:e323]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2588:b0:3a5:1388:9a55 with SMTP id ffacd0b85a97d-3b619b9ef7emr405747f8f.5.1752769653254; Thu, 17 Jul 2025 09:27:33 -0700 (PDT) Date: Thu, 17 Jul 2025 17:27:11 +0100 In-Reply-To: <20250717162731.446579-1-tabba@google.com> Mime-Version: 1.0 References: <20250717162731.446579-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250717162731.446579-2-tabba@google.com> Subject: [PATCH v15 01/21] KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_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: smfu8q7p3y4fd85jjaopeq3mmkhikwtt X-Rspam-User: X-Rspamd-Queue-Id: A137180008 X-Rspamd-Server: rspam02 X-HE-Tag: 1752769654-157754 X-HE-Meta: U2FsdGVkX1/v/uE6kCbaptjn1YyCtAQsmDwwxZe2dWyYPAkrn/Dan7kNc4ILVp5xZPTElYwTUF5KOcbqM2kVD4NfvUTyNpr/LmHin69HOWZJbl7pDiVXngGFLwo3ThTcb78wD4MrwVbq7xGnWVWLjG+kKkmftudfzsX+AfEtKGAWgo2wJyJD0ZoRpyL7nPN5l9f3oW+KwaawtEWYL/E4GObmhbdboM77LIDsEwQ86haqnhtM8Y8kY/1TJ3RwLhn4v5R21e7dCZemSBQ5Vrzu+GDoQWK+yajBjhT8PCi1W/qas8KXZf7FazJF6X2vbZaiiwBNLxhAUeJW6N8VQZngaUTK4b7xauL7AB4G85jq+8h6BACXQnEfNsiU1aAUloo/77TT39uww76i7R9FrZuDdXsow/whyNphsbokdX6EBrtxkQRiZDIkAmGiCEnpidOc0Ssqruq4cQ2+jj8jUv07JTcnaUH96k3YwDMQH9kNYCt6W8bN1mIvWQHKj8odheoDgvoOMvyzYtLsUdJ5ZR39o375MGfUM5xHY8A4k0Zg3H/+NUB7IDpG3T28lRIPf8QR9bwOsEb20nRmolThDLr1hSXIhysOjEuc5h3RiRfH/ycidg1xc7Tu8D9142o7kiVaRsNI2Pqg0/I+Z8O+X8QBhhFJw3FuSG5HcpHHe+Z6fQ+E2kODmvQ6mJW2j6kRprYej/l+acrJQnfc+Vux1bRKLq1EH82ndWxrIF2fmB7e+v/hbPdo4oul+NNVxYjfolPh1oITukut/LR3sRSI9Q6mk/92L/agzCJHjxmmyNnDTnSxuYQH8yJ1D0t0bMR3tYNEdLlJ8MAs1TSXUacmSshu9vtiBrKT1TGUT1MxhhogrAmASeFAHHvx/nE93q8NAyI0pkGvxLKPAOnV8cV2rSkOHjjMsSOSdwKcDcJc3ZJz3CZ4Y8yY5sNzbOUIJuPLTVzP+NGmYmi09t5uAir1XnL OkwRpTg2 DnAhVFIrGbAdsITTAd40/BBkPHKcoC37NQ3SdL7Gi09rZrByh7qIXY2JHnxkoELjmVqwfjyRpzsQD7xw/7y2h0vIbZoE9bfNke6yavc+ew3l2+7RmBkLyBCsl+pGor2mb3Z6LlSNMiDfy+To61VT4SpFusM5vKAtCLr9SMNSEKyCHpkhnl01gwhMp1A3VTEkg8+mI8hAjoRP3GUiJLGlifT4dL0DVsmXTMKNmJE5vH2uDa+o5QuvTY+1KCoiMXEs2xzPRCt17+wLaX7QseVUJ/XLIEIjozSEF1q3CuACqpxJLYyczcyLkYbdv8RlpGMa4j5mhNGzPJVpod+qaZ9vBZSZ5mD7we7n/QXAo8uo179q0wTuEXMSL8WO7rv/fYTrTbHbb96H6wHcFP97T4LPrR/7dkXa8SRKduFkoqyAmBbmifVpywUJgTNJ90ddgxqZvWZqttJ20Oe65fnSvX1L1VCQdaZy+uzb6aA+Vvsqg2LsXCLXG6Z0P3G4QOlmI1n2OCnjeVDXk2vGXt/FlcPV8JNCzs3zIA1rMcEGXEN94SvUMS51fFE4PgarBdTke4RJfbZ11G0sizw7YQu9GwVtgdpuu9nwiG9z+1FXzajDvTn4VCoe2GdkGwsLo81YZO6VrO+hTfkKgpEWKbLI4ZWHJC9AoXKltkPiOA5A8G/Z7ShNEZqZxQUB2p4t023uxUf73O6jxyYBr07Bw3oBxU6DeEL04fZMsp7dmp4KPsvMFKqUXUXo2tKK5ugcQMg== 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: Rename the Kconfig option CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM. The original name implied that the feature only supported "private" memory. However, CONFIG_KVM_PRIVATE_MEM enables guest_memfd in general, which is not exclusively for private memory. Subsequent patches in this series will add guest_memfd support for non-CoCo VMs, whose memory is not private. Renaming the Kconfig option to CONFIG_KVM_GMEM more accurately reflects its broader scope as the main Kconfig option for all guest_memfd-backed memory. This provides clearer semantics for the option and avoids confusion as new features are introduced. Reviewed-by: Ira Weiny Reviewed-by: Gavin Shan Reviewed-by: Shivank Garg Reviewed-by: Vlastimil Babka Reviewed-by: Xiaoyao Li Co-developed-by: David Hildenbrand Signed-off-by: David Hildenbrand Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 2 +- include/linux/kvm_host.h | 14 +++++++------- virt/kvm/Kconfig | 8 ++++---- virt/kvm/Makefile.kvm | 2 +- virt/kvm/kvm_main.c | 4 ++-- virt/kvm/kvm_mm.h | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index f7af967aa16f..acb25f935d84 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2275,7 +2275,7 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, int tdp_max_root_level, int tdp_huge_page_level); -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM #define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) #else #define kvm_arch_has_private_mem(kvm) false diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3bde4fb5c6aa..755b09dcafce 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -601,7 +601,7 @@ struct kvm_memory_slot { short id; u16 as_id; -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM struct { /* * Writes protected by kvm->slots_lock. Acquiring a @@ -719,10 +719,10 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) #endif /* - * Arch code must define kvm_arch_has_private_mem if support for private memory - * is enabled. + * Arch code must define kvm_arch_has_private_mem if support for guest_memfd is + * enabled. */ -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) +#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) static inline bool kvm_arch_has_private_mem(struct kvm *kvm) { return false; @@ -2527,7 +2527,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) { - return IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) && + return IS_ENABLED(CONFIG_KVM_GMEM) && kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE; } #else @@ -2537,7 +2537,7 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) } #endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */ -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, int *max_order); @@ -2550,7 +2550,7 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm, KVM_BUG_ON(1, kvm); return -EIO; } -#endif /* CONFIG_KVM_PRIVATE_MEM */ +#endif /* CONFIG_KVM_GMEM */ #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order); diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 727b542074e7..49df4e32bff7 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -112,19 +112,19 @@ config KVM_GENERIC_MEMORY_ATTRIBUTES depends on KVM_GENERIC_MMU_NOTIFIER bool -config KVM_PRIVATE_MEM +config KVM_GMEM select XARRAY_MULTI bool config KVM_GENERIC_PRIVATE_MEM select KVM_GENERIC_MEMORY_ATTRIBUTES - select KVM_PRIVATE_MEM + select KVM_GMEM bool config HAVE_KVM_ARCH_GMEM_PREPARE bool - depends on KVM_PRIVATE_MEM + depends on KVM_GMEM config HAVE_KVM_ARCH_GMEM_INVALIDATE bool - depends on KVM_PRIVATE_MEM + depends on KVM_GMEM diff --git a/virt/kvm/Makefile.kvm b/virt/kvm/Makefile.kvm index 724c89af78af..8d00918d4c8b 100644 --- a/virt/kvm/Makefile.kvm +++ b/virt/kvm/Makefile.kvm @@ -12,4 +12,4 @@ kvm-$(CONFIG_KVM_ASYNC_PF) += $(KVM)/async_pf.o kvm-$(CONFIG_HAVE_KVM_IRQ_ROUTING) += $(KVM)/irqchip.o kvm-$(CONFIG_HAVE_KVM_DIRTY_RING) += $(KVM)/dirty_ring.o kvm-$(CONFIG_HAVE_KVM_PFNCACHE) += $(KVM)/pfncache.o -kvm-$(CONFIG_KVM_PRIVATE_MEM) += $(KVM)/guest_memfd.o +kvm-$(CONFIG_KVM_GMEM) += $(KVM)/guest_memfd.o diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 222f0e894a0c..d5f0ec2d321f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4913,7 +4913,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) case KVM_CAP_MEMORY_ATTRIBUTES: return kvm_supported_mem_attributes(kvm); #endif -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM case KVM_CAP_GUEST_MEMFD: return !kvm || kvm_arch_has_private_mem(kvm); #endif @@ -5347,7 +5347,7 @@ static long kvm_vm_ioctl(struct file *filp, case KVM_GET_STATS_FD: r = kvm_vm_ioctl_get_stats_fd(kvm); break; -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM case KVM_CREATE_GUEST_MEMFD: { struct kvm_create_guest_memfd guest_memfd; diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index acef3f5c582a..ec311c0d6718 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -67,7 +67,7 @@ static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, } #endif /* HAVE_KVM_PFNCACHE */ -#ifdef CONFIG_KVM_PRIVATE_MEM +#ifdef CONFIG_KVM_GMEM void kvm_gmem_init(struct module *module); int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, @@ -91,6 +91,6 @@ static inline void kvm_gmem_unbind(struct kvm_memory_slot *slot) { WARN_ON_ONCE(1); } -#endif /* CONFIG_KVM_PRIVATE_MEM */ +#endif /* CONFIG_KVM_GMEM */ #endif /* __KVM_MM_H__ */ -- 2.50.0.727.gbf7dc18ff4-goog