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 831CBC83F0A for ; Wed, 9 Jul 2025 10:59:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4F2F6B00C5; Wed, 9 Jul 2025 06:59:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D42DA6B00C6; Wed, 9 Jul 2025 06:59:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C043F6B00C7; Wed, 9 Jul 2025 06:59:54 -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 A73B16B00C5 for ; Wed, 9 Jul 2025 06:59:54 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 543698016B for ; Wed, 9 Jul 2025 10:59:54 +0000 (UTC) X-FDA: 83644431108.19.8D2A55A Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf27.hostedemail.com (Postfix) with ESMTP id 7638340014 for ; Wed, 9 Jul 2025 10:59:52 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pPqkaIE8; spf=pass (imf27.hostedemail.com: domain of 3p0tuaAUKCEIxeffeksskpi.gsqpmry1-qqozego.svk@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3p0tuaAUKCEIxeffeksskpi.gsqpmry1-qqozego.svk@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=1752058792; 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=ODqNCnDrv2hxPSFvQJ0Qi3d14QqgH9rtduTo0dWEY3M=; b=PrKHLknL4PvMuH34cvl6nTJBnLoFBw16yL5OmRKFNoBPOhuZaiEz3TT31UncHJoD8yT6fZ ok6QwvYEPL3x7Usiw5vErhZbtBEKLx726iqN/dUsInrDrv+v21EsETGIg9H6/vL+I7+jfR 1LVmcTIrybCoBwplDx85CTc/G9jOoys= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pPqkaIE8; spf=pass (imf27.hostedemail.com: domain of 3p0tuaAUKCEIxeffeksskpi.gsqpmry1-qqozego.svk@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3p0tuaAUKCEIxeffeksskpi.gsqpmry1-qqozego.svk@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752058792; a=rsa-sha256; cv=none; b=7HUMBRi87RJBfjXG65g1A56JNWrZTJUf9jsVZVNcgt8/CcO0BiVzrWhrQip8mC3QzPgUfX xTVdHbnQxiafDExuJ8F99kcRYFIzKK1N1IghrLp++9HpJMrtPl64Fkp6btA4gDnzkihoKo qoY80mPXAQjSoD/YUSwrgoZY4FAIHhQ= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-450d244bfabso43097775e9.0 for ; Wed, 09 Jul 2025 03:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752058791; x=1752663591; 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=ODqNCnDrv2hxPSFvQJ0Qi3d14QqgH9rtduTo0dWEY3M=; b=pPqkaIE8B43Wlv3pya4KlNZhIL18VuKp70qVYcYUzb85ylpr05VXYWoFcxz4mp8uTG TqiCs3t6lRpH1x0w1U6Q4QguI8V2QOFmkaAHk8C8lTIAC//6xxwlnSxtCrRx3PQiy8p2 hqw9PAwjmq6PV3IOETYAoLNe+CEtnI3OzGFjMEEF6FlEc7KOvWhcN6qcEb1If64SJWZy yxY4HSo7gucCltELgVh0rLomn+vhG9H5YjxOe8it1KlKBe8wNEzQfsHqUOsVP7OE6q0D ghwbGhjwUHxE40ZrXTtFv2cT6dK0ytWAl1rsbXaT9cpeEz1RPkg7eryzFpiQWm5VL2w5 3oEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752058791; x=1752663591; 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=ODqNCnDrv2hxPSFvQJ0Qi3d14QqgH9rtduTo0dWEY3M=; b=UZcAC5G2Eo14EIGB00axvy7c4eK4W80IM7WCv489ENu2YEDpeaN73PQeiFAtRyY8A7 ctG/mPXV3TXq9Mf5O0speYwbGpuV4g/3uSJLfiaxIuE4CwhhBNlTNjK7k/gALicOEViK O+lqZgHe4xwKYs+S94kCZIvQNOzyb50UXITLpw5Mttc0JCXzYfQxu2vxP4fpkCqCTWPB D+XgKiwtKo6nZ39oJ5KfxnI7SWq4yMhuDlCWQiThIgbgetHiJGvEDVLr3RLwXBZfvrhD znDzMg3kzajM8bYPA/mzWplP8uXraUhEeFSZ0o3ThqsT3pgR2rRXuJgXa1Bmi7JfcpcY bd1A== X-Forwarded-Encrypted: i=1; AJvYcCVUxV8YLyU6S9ECH5my+1m8nyC1hp07UiH6wI2+AGejRK0/XOlFqUFhB/DZpv4Tm5qQBsYp/HnIEg==@kvack.org X-Gm-Message-State: AOJu0YxrusROl+m2OJ1C64Q1F6cFhKj5muNkHu6NJjuqN9q7X4JQayFr DzAh2DWXX6f4oAciCVXtg9OIRhQNzN0Kb02v9q6/jDa4Jl2RV4fjbkgAfRfW5zyhkPJ1qL/RHlR Rqw== X-Google-Smtp-Source: AGHT+IEeKDjutdNgcR4v8/9dsP1g7M1veEQ88rCgvj0YpYpfwjC5+Ke0ARTVhhCO6Vol6hYTw801EW3rdg== X-Received: from wmbfa21.prod.google.com ([2002:a05:600c:5195:b0:450:dcf2:1c36]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3f07:b0:43c:fda5:41e9 with SMTP id 5b1f17b1804b1-454d53ed101mr21724725e9.31.1752058791050; Wed, 09 Jul 2025 03:59:51 -0700 (PDT) Date: Wed, 9 Jul 2025 11:59:27 +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-2-tabba@google.com> Subject: [PATCH v13 01/20] 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-Rspam-User: X-Stat-Signature: gkudwgx4h6qkmecj39pfrm7ewkzgj9h5 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7638340014 X-HE-Tag: 1752058792-396576 X-HE-Meta: U2FsdGVkX1+ENKKocqtxsEP+Std/CfQ+4VCRlNngTC8qiqzYzxUlsvHpAMQK4E2BBoxQ89XIPdcyO3PryfV5KnFFk2BDC7m0kWgMPvCtkgYqPJsF2t5SUKk9MCvRz4QM1HqICm/jT8FX2XHltafMBNLtARwY6CtmmHZxJ45xRGwGe9qAiS7Cj2tLP/MePRAlBxeCRmEoEtACZqQKfd6f6jiTcSaDju+u7Jj7fkD5A9OlV4keNzhBJHYsQnrZgYI54D2axW/ktircPhQ/Kzz+u6Q2AZuxC8MvceuLf36BsfhkIEkdpg9J9mkzw644tiFBkCjy1hxGHCYMwglmShI2S2rCd/0PW0zmMILPKQHWaI6AAjJDXLURRvsh8UbZES65jWpqgAykWqhPXjVrr2RLHCT8IFLUHLfFisBYiDY9gub3whTtZnySRMk91eFG7eqIfjPGwc48CuT0KIRxa01/FZdHvDfsxkZI0LalB52xdthcmyRQU8/ZsH5VPQDMcRYp36T2y/jURQzGsJrDopwh1V20WXcE86yvDXJMT8yqBUTNS5hx/81mgTNimjoYgWroE5V91KkwzkbpehJmOamj3Wdvg8mvwaoROh+Wjs9846k+9eMYqN1TQ6b5ev003FomROzvOShOBpK8p3V6nRnifLmzgnYGfdKHY5+azqoZTSeFw3YYCN+Q0r8pHLqQpIzheS9/XjTvazQumkMNvPrmMpYW5jAuEQ+y74Y6bUASbwLkFItAbxe9L22mhIV560YJ9kfgXvm0lLJX9hJbAy2IzWuWZXD3mU6k4hGJaHGbRDeofsXEcwqQwpZD6WOBiHNXHXuwd+LvAempBNt0YZsxfLqMfJELFTnsRf8B0jjRS2FQanSAwSsD1DWhumgMXg6RMVI1N/7e6kpAJeNDaDKOHZSKkWy9/ASg11U2C6WWgvq22EG/IUj8jI10S5XyUjDUAnq1fGkzUGBnHrLk42p 9lzJc5k8 RHX0QT00GdcTJLZE83w8Q8yptuT/vhnir+L1/Yv6Z0oDJ02XNNldPlsJNl9T5OFbiGarpDaZyaQLdtgRmR/7vE2h8Winp6GgJadng29rNluQkx7U28QOlWqESG2+sn+RfYRT+6Srery3XcXgHqbMfxMTW9uY/CBHTbEbm93CX2ZIPZ7FWXAdjAv9h0RgTwKjSz++dbttXYcStg+ZoJrrAIXIsVqEXopFsq8ITO83MwG9SAhT4t5x1s2iAWXQCOhR8Ugz++6OdqNo60qwKV9ea6h9+hRxGfcgRw9OwVt08q+ZJ5jvudolz5d+mAV+fiTMwNKCAydVDH2+CLMW/kIqqkJI8X9DyCElW0BGgdVCp/jbovlfDSivsvpnrGh9Kz0mbPjglrKTnNR/5uYYJr7QVl3mGhwVDYn6BWzsvfEthfJz54jXWa4BWPfU4uJLzrcDSwth+GBUVhUKa9/in9obZ1z8cyD4hFb7FGTPQ9gVQiSfdRUJrDj103C6y+VnS3cCQzQFb6+GgFuGi/YSOw3S0YdSMhNmym60ZLPCqXP6ts6iv2/lMhV3vlInbmIPkM9Z9s1BCdTafLRmdXec1wyiTOqzLIvDIxubMp8Uo8pPpqw2EPciU4vY8LrLvhD3Zn1dKQo0kKqKQ9RvbUByduB2x/7KEf5xh6Z3QPBLMPVjdiFNnqXyKl8tmwfVVu9zTggl5JILnXDAeGbBN6NQWcGTOIM48/4QmOCke54i1NLVIXpmp2qgGc09pyAKKyQ== 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 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 639d9bcee842..66bdd0759d27 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2269,7 +2269,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 eec82775c5bf..898c3d5a7ba8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4910,7 +4910,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 @@ -5344,7 +5344,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