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 60805C677C4 for ; Wed, 11 Jun 2025 13:33:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F28806B0093; Wed, 11 Jun 2025 09:33:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F001A6B0095; Wed, 11 Jun 2025 09:33:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC7516B0096; Wed, 11 Jun 2025 09:33:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B4F6F6B0093 for ; Wed, 11 Jun 2025 09:33:37 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 70D54160C67 for ; Wed, 11 Jun 2025 13:33:37 +0000 (UTC) X-FDA: 83543212074.26.A6D6D89 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf13.hostedemail.com (Postfix) with ESMTP id 84CAF2000B for ; Wed, 11 Jun 2025 13:33:35 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ld8qcJTY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3roVJaAUKCCkYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3roVJaAUKCCkYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749648815; 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=dN/ZTW8zQ6WEIg8FuDRWkpybqbqyGdEpV1Nelc6XjxA=; b=UOHCLv/lKBnlZk9fd+tiiY6dsW0qUj2HV8Q7Nv7AlHmy3QUnt6qyTYCJe92hFtxmHO4op8 7yNVXAnv+Cu16TS98d7y8s36j1ZnZF4cEgZgepUDqP0s8W+Rfoo2PTmM3QC7TfD6YRyxSj RxIRnQN/MUNa4q8MylH2X275BSIMjy8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648815; a=rsa-sha256; cv=none; b=ugcxtPggsBPXjMUMwR4v+zqdEc6a0efpACK9Hw4mbTRsB7Kcj7khHjWbZVmu85rWev6prq 3KX63ocUdeDUwgY5kKklQ+Mx68uYTKjtEmFcDevd8ZjEPIrNpLdVHUFGMWANpzIKJ0OeKa HBZKCxulsnhf7pbWegGNcaRUU1g6mBQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ld8qcJTY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3roVJaAUKCCkYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3roVJaAUKCCkYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-45311704cdbso18686145e9.1 for ; Wed, 11 Jun 2025 06:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648814; x=1750253614; 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=dN/ZTW8zQ6WEIg8FuDRWkpybqbqyGdEpV1Nelc6XjxA=; b=Ld8qcJTY+q49xS2y2/OiKbIVUr/hRdKts82qIr9ThLhPeFxwa/I6mMqQGdTnZw7fVe egdiW9/u3Fnmzn5dPeoq6UMtZqgMD8TrI1jzA6c8tFrXmYEASdHmULZ/39DX3/4XkwAd +L/75rBGSVFLn9p/CleLq2AT+OTqDHPGGiHE9R/FWttKqXq3l3qfTD8lFiaMC10ASFsg 6f1ona3z+PQJMeRlt4vg4/K2kkUM7JBvU3YFcPUXUZlj6KzBxRlMLL06Wvx1BeueGF6X h6uYNybjtPT61nTy0oLQRDnEkPB7kt7x/jhuJTpS0h/p09hlIPk0uuMnoS5p1gHyZgxL e9Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648814; x=1750253614; 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=dN/ZTW8zQ6WEIg8FuDRWkpybqbqyGdEpV1Nelc6XjxA=; b=oZecGziPjSGj2pUfQzjQia4XXOmw46mpOk7fBipn7w33pCm3FKpRsPQdh9cK3H3qBI 0jdY5qOoonMxgCWdQgj8uqg6zJ4U9iElgLWMLZMZtEyJ4J/00YaAxBQJ2lJY6tI1RC/u Kw3Qv7WJ2xox5Nuyji3r+6Ji8xe8OoAxKbZZj/g0c24CRQMbdAvF1VYxP/GXlZlCdjhn he3kSHwWRrPFk+030s05oSZIQEayJ0Th7PPFmrIhWeEL02Zkt1W1lSgX7FkiMiC9a50o JGgq5iCoc3O0imgel8EHEcOQo4KhxugMWb+0S270B+TassFOaDwpefbBt3p2CFNloNvh T2Sg== X-Forwarded-Encrypted: i=1; AJvYcCV5KDdrqno8vdfKtQ/Zr1OVIu5y8CkHVu+SWT9Dlb5iy6HVlIEHfkbd/r8mbN7sn3cau/JW4sOrhQ==@kvack.org X-Gm-Message-State: AOJu0YwBWMIKcrqELdlNODDIS58lE3C0h/EbIUXZ/DQGe4rBaDdOdBop 8+Aor+GGchQIxKW5/yYFlSJgJhO2kexZ64Y/20mvTfvViHKnm78XKbHrDje0cmTpZ2cqvzJCpOG aIw== X-Google-Smtp-Source: AGHT+IGDXfpB5L0RZ8GdWrFFfO+xZ34siILO2G+Z0wpDdAMRzjCNw5UQX+rphQyMbRMo6OnMcfx1kMsFmw== X-Received: from wmbdt8.prod.google.com ([2002:a05:600c:6308:b0:453:1dd2:c0c6]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4284:b0:3a4:d5e8:e352 with SMTP id ffacd0b85a97d-3a5586db90cmr2674044f8f.7.1749648814225; Wed, 11 Jun 2025 06:33:34 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:13 +0100 In-Reply-To: <20250611133330.1514028-1-tabba@google.com> Mime-Version: 1.0 References: <20250611133330.1514028-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611133330.1514028-2-tabba@google.com> Subject: [PATCH v12 01/18] 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: zaj9abjdp13hf4wp9giyye6m1zu3hwyw X-Rspamd-Queue-Id: 84CAF2000B X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1749648815-767350 X-HE-Meta: U2FsdGVkX19tcuNzfbBrurLGzHFFy8PaSCdV+YGptCwf/vrPDkU7IOETjvR0O1Ur1a2e63U7uosb5xKAKYeHHA4EFCYjkGRZe8ssKi7v+jeCdN74mK+T7LkHOU0B6/KpH9oYal/c7y2X53U5R6wWk99w8gO75nLjDIYt/lUu4AuH8KkDOHYTZki1ZPVejfZgMsNoGs2GXvORSDgT2knl6sHEPOgseuzp8KrU6duHK7a2b+pUrMh+MsREx5IWhnISa+Mj6Zl/c4SDlejouFFWE2PD2Ty6lifW4+ccLavVJYAOymlusvafaIOWmFDLfEDfMGmLlEVhOmRkcdkjdZm6o1R/MZBqVbQwnKl6eubeKiDXNysqvoZZLQDpqvwIelbgX+w2nEdA0ERQmLOfwUqwF1tPfCaS67y7XVjQwPcRGccd8NB6+WA0M4aaTfx2VNT2f8G2iK8VKsgby4Be/3KdIsDUiqQZajbh7/5spjJ56F+jQHq+xtfikUwnauiRrxGHaPlFeIxQ+//IJEwYZ1d4YEuQhwlDpsw+eBP1LXp3Pl/8nrsUukb9BP4HRUGTGW3uJr8oiTUe5gtHp5wvRUQ1B/qpMfjELVf29AX9dKoQTO+DtdZ6CioC9mFk1BaR36qlOJ9vU7xeiW6RAK3MHuz/hGBvMJcI0W+RnXexunt2RtfxBRmuyGy2dof/PcMx+Es7GYonF4t3F4ZRrTeHwFnf5QLKSoR0YR4km5eNIeQKWw7mxuRJp7cN1yOWbFjFnDWZE27jAIFBgYVwjWOuTTW1doEdd82xmppRpv9THrz5hheOh5r/TqbFcP/clqsCR+JKgVb8umm/T9E4bv+ghcZbvBn3SLwQKguX3w3GeXgWQE12wmOCkG3+2H0Z2oH5+UcNN0mpd+6tQwmA3urnBq+P3HU+tD+I5vb2IUtx+s8tfoXJvb2CMagV0mR4ID0IdZCKmigzviGxk5zZIFi1Ejn FQAD2bux McvR9e/1uEDbipV/EUw7K7j7tIgRk8qGEGKCqc4A/7bb4AOI6hAxB0MJvvkyYoOjAwV3oFyCt8dtZjwVDsZyNSsitJaCOLe+0t3gsDMaBxfP0/qUMNwhBtbYhS7TIHkyImxU2YL1bd9Ss8dRJ9CRjfiA/uRmpRnPLygdhF36Lx9bgQ+qXx+3jMvEvuw25XBFFg8hEuozgDMn3L8bKwNycuHhTjeRUxMVQpL5XqOOPJOvxz24NxrohZbWjwO91w0t653wYbCIrf5RoIhWzSBuW2iJF0mgpQWkVR2trIioqy/XPTWzCWV7oQw+bT3EwCXIUsyP4zKNBBDxAWQyi+GPoFchgTWG2eDR14n/tgkzqmQf2G703VmZCgAG75NGFurFQ44pV+yzOBiVuwK73KOK56hnx7lmA1WQ6+U1uNReQPglBRbQOehj1gYQCgbAuJdVUt6XiQkmc9sTx34pRF4xwjCV4ZPV8V6XNdNKXoWJv8S3XhjQDV2R7QlLFl8Nn1mRkbaWGcE+klzwgwL2zKCUMsFYDHbXn6qyMs04kCNSzifjBnS87IIHAQhHMeGpEo75bZdmySiqCKtvbJ4fHP6i6AVh5D18HCS1i8gjSPnklvys/UoVK6+ghHiCB0Ja1P/bunmidJv8WjbedmFgzYY6lFh89oWxeLMnYx9yoYiq+e3jyaLe4HIKERqMRl+PX245wL/0dIS5Pz89dLm8jGqA2/5LDqw== 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: The option KVM_PRIVATE_MEM enables guest_memfd in general. Subsequent patches add shared memory support to guest_memfd. Therefore, rename it to KVM_GMEM to make its purpose clearer. 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 | 10 +++++----- virt/kvm/Kconfig | 8 ++++---- virt/kvm/Makefile.kvm | 2 +- virt/kvm/kvm_main.c | 4 ++-- virt/kvm/kvm_mm.h | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index b4a391929cdb..6e0bbf4c2202 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..b2c415e81e2e 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 @@ -722,7 +722,7 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) * Arch code must define kvm_arch_has_private_mem if support for private memory * 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.rc0.642.g800a2b2222-goog