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 3D7D1C3ABC3 for ; Tue, 13 May 2025 16:34:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F29F96B00CD; Tue, 13 May 2025 12:34:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB3B56B00CF; Tue, 13 May 2025 12:34:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D04236B00D0; Tue, 13 May 2025 12:34:44 -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 AD00D6B00CD for ; Tue, 13 May 2025 12:34:44 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EFE2CE1DAB for ; Tue, 13 May 2025 16:34:45 +0000 (UTC) X-FDA: 83438433330.14.0AB0996 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf11.hostedemail.com (Postfix) with ESMTP id 18ACA4000A for ; Tue, 13 May 2025 16:34:43 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=joKrBlhJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3onQjaAUKCGES9AA9FNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3onQjaAUKCGES9AA9FNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154084; a=rsa-sha256; cv=none; b=09QQCVvqrGGdUcIduCalJYqzMhPi0tnyVpvwsLh+4PFOsFTkJxkF810Mn+NuoOIvjCA+bN wPKApBkJWdr92Q6ui/hz8y2gX/M4Ieb2X28Zp4o5FMuAAWsR4wsMPiE2Z1MPtO4162BMcv b0JL3HpEcr0lTjMmtlFDhj/z/tXf1Yg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=joKrBlhJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3onQjaAUKCGES9AA9FNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3onQjaAUKCGES9AA9FNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747154084; 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=eXtimLmxHXEkWnO1E5myC/GTQ1EqUuj9fx3a7MjMQd0=; b=EJczaakds12wW3CkPCiVkJcm8HjNgT+wsBqwubj9fhC0nY/MeCjJ/Xs8mnEWt6jmUqimd8 3D2lwK5tYkW1QmqYsthv8r8O+pZ7w22kjrMvdf+D91AV1UzBC5VZL0ylKIbNC2UshRan/D hfh8t+k29vCT/J1VEeY33Tvex9/OhI8= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-442d472cf84so27245365e9.2 for ; Tue, 13 May 2025 09:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154082; x=1747758882; 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=eXtimLmxHXEkWnO1E5myC/GTQ1EqUuj9fx3a7MjMQd0=; b=joKrBlhJWe49bJ+Ep9d8Khuet2r3wXwKfLpjQ1uS5xJa91ghc/1WFAuX280Qbj1W31 46Nktuk7ONjNFQoLmlrgn+rfyrkNl0F9ZQcSohdavFRnSQ0oTVl88s/iAtZpgky1yTOs HKR+4i3Lky12mmJW1zYYSLp1M2h3Ayefy5i6v5M7+Mfetjw3/AF4L3yGA8nmMHbWvdNv +vkHO9rWN5ReWf1b7aqckguj1+7OPvdE87OyddTlUntZChhWdzbjc82hjT0RjrWY6/jS jb5qSejIyM6LbpgXnc2CXhF8dffsOW/EVxswcAdgOF9f6bjEG9E1X6bjt9ynGsK0FpyB fYoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154082; x=1747758882; 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=eXtimLmxHXEkWnO1E5myC/GTQ1EqUuj9fx3a7MjMQd0=; b=bU5FzGoeCEcHXFxe2R0FdhwPd+sUzrt0p6LLf0J7oBvy0LcFKHSwduCa7v636jnpmG hxhvLFbvRcZbSo+3hHfgSZbVzHH3S3gDLdy98eEzbVjPxlnysYHZaPBhTkq9j5P+oFT6 Szwj5lMvp34d5AS0l4Ez8RoCTxRd6RSCFWDOSTyA77Ntv+V7QqH82N1kbOu32kxgk0cd 1J2KsSBs8AcKr0/uBoCexaiUMYaskq7Kvkp6w8kWyubBCO+xp5Fn3NWZsiySQ/Xs4Goa z3jt46Njom03KeXFvHzpm6K/2BJ2beP8UQpudEJD0IxwnboRRiVqX43DrLryfZvt8EL+ mLwA== X-Forwarded-Encrypted: i=1; AJvYcCWBj5vzRVIPPgNlni5cBDUETda6yFDWIHowmhlJEBVo7y8+onjDbkvXDnVaqsXVa8gzSI7Xl9N2Fg==@kvack.org X-Gm-Message-State: AOJu0YyHIrx5rVKT3K1chWM9FurCifzfZspfIdK+cHbtN5N8iGKs3ewL m15ZOoWs6VBCPwfDzJSpRHHHZDeHqbP91u+vts6GwkaXiPpgNhvvAY3J/qz9Z7tgELD94BZ/fQ= = X-Google-Smtp-Source: AGHT+IFIr8fXpA5EElYw0iZ//FnNLg+lhwetRGpkRgB/x6sT+Ovs2tHvK9NIyMLs2laKYevir4FnIB19FQ== X-Received: from wmbet9.prod.google.com ([2002:a05:600c:8189:b0:442:dfbc:dda]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a00a:b0:43d:db5:7af8 with SMTP id 5b1f17b1804b1-442d6dc7cd1mr144026555e9.21.1747154082603; Tue, 13 May 2025 09:34:42 -0700 (PDT) Date: Tue, 13 May 2025 17:34:22 +0100 In-Reply-To: <20250513163438.3942405-1-tabba@google.com> Mime-Version: 1.0 References: <20250513163438.3942405-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <20250513163438.3942405-2-tabba@google.com> Subject: [PATCH v9 01/17] 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 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: rspam07 X-Rspamd-Queue-Id: 18ACA4000A X-Stat-Signature: ycn5o9eyigejbyd1wbd7awaseh8s8hei X-HE-Tag: 1747154083-203654 X-HE-Meta: U2FsdGVkX19GH84x9bS6RZLMOrVwm7eQB5R89DOyg9JegYZX78SOP53CZSlJtjYiMw6e4cNSeYer8NSNAtXvlXOe3vO24xObFHo+No6qCP/Fh9wmE9suKKzNsnOu1nSU8BP5V6IxgR+sNo5yP1Ej/o4LkqqmIkJ0+RC7tod5TJ559sAZmEHRoAReIit19TYwgy7r/EbmSIbfKX4p7xzMycVafIwowY3azKWLr1QnOgyH5Sosa4p8CX/srYjNEuV1vKl76p28XyVC2XYF/uXhXvITEsJR+nnxh9yClkYNHPexB0tUUvWkdL0r+AICOpsOe6YUvmO3AGOaFvx6DoIuEEGs0LIJ5obs/OBU/DNKWZ2HbTR04PvJ6c8BvohoAZ78UfCVjAG+1loMqypyRZvBeoQALETduZx3K6H4RpI/Dx/G2jOpHDHrArLfEULz9SgcCdPZs/AQ5Kt/dW+M+jm3Qx6hUUWRg4HDmW8jlH7nfUvRYbrInniJpTxz6WYgbCjYPYoU2NblfikTKqTQd0ik007peG9X0kOFU1HsjGL04Gg7q9GKxLXGafSGafm/xD1Pofepb1CC0Y/Q8RW+JLb1++6kJw3X1qBr+wGB0t250gNTonz2WKK1N6zKowjtGR3G9h5VSI7e7QEyxOdgsM9mCypRdbvgTmuEimfwGTUpby83vTZZuVydkx5ALs4Dsfzcebastp0YTLY6zXkV4UlQYtOJDBM7RY150P2bPmNsojPuhVSHRwIOuYy8MPEiciZWlnCZ5QRApXHT7+L9CzLWt/dhC61pMdsI3UvR/HRzQIyJJBA8+5RfhGBjKYAHKyasjBoXwQSN7Y+4B/25sc7FDUSI40GaENQobmYfl7Oixbw4IZ3/lqvVSh2qf1SkUd22lx5uf5RU9aI+8HoI0DDD0Atvhs4z9/3tIbkJlgPEKfGiEOpafmPFIQOAQOw7omeBz7Fz3X9LN4JcC2BYSj3 qrlQ9td/ bQSAeTk5MtNL369z149sC567oboz9Sfh5XiGBdLWbXbuiJiQKQBVMhfF9upwO8faR9ZP2e+4OK08k3tH7Svf1M3s2TkgH9lwHpGvzKus2KuK6RfslxQtq1jHDaTYDXg6vHte8ucUA2IjBY4gEFdwor+Oy+EV/R3Hl5XxxlhrZr8ve+A33n/2SySFl0ge5GCa59WVlUdhSaZaK+lbAQSla2YvRa0trvGeL8L5ZpAltAEsh01MgBlcMDCozP12SCFaNtL1Xg+iQ3IaNc9TiSlI4M5o1qFFW6KrFPWSdnOP0vDoVVIf+ziw0krx5x/Qw+UiqMvve+bJ4TOT9/EPKPecp6V9AAHBacrW4UrH/axCryJ+TJOa0XsfFboLL8KAL1ljfCmajOdR9zmtyY8MiixS72Jl9y5IB6C4hjKS8yEjuoZDSA9J/Kva+XmcdkEX+TFQxOno2IgyuFkiXzOAcE5D1StB51MzG/pftOzDeHvTHyQR7SHhUZ4NmfXnQ/qam5D6+RFklfHKS+mW/yhbPujW7M0R9e57p21Un263z5moxTS0yFMFSlOvjhzY3YKQ9avWRJYfxLdlBwQvw94xc1h9JGWeMq51a36NlcB6tA79E8zKsnNklmTleRDtwzjWFFLbll7GFJlzUNdV055KUhKlDT0wya3cNxJEaR0PSDGJP+7ecJqd/Lf64m7l0o5xMfwDL8zDz 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 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 7bc174a1f1cb..52f6f6d08558 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2253,7 +2253,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 291d49b9bf05..d6900995725d 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; @@ -2504,7 +2504,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 @@ -2514,7 +2514,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); @@ -2527,7 +2527,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 e85b33a92624..4996cac41a8f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4842,7 +4842,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 @@ -5276,7 +5276,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.49.0.1045.g170613ef41-goog