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 AC447C3ABAC for ; Wed, 30 Apr 2025 16:57:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 401486B00B3; Wed, 30 Apr 2025 12:57:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 360426B00C9; Wed, 30 Apr 2025 12:57:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B40C6B00CB; Wed, 30 Apr 2025 12:57:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E3C7A6B00B3 for ; Wed, 30 Apr 2025 12:57:01 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 549EBBECFF for ; Wed, 30 Apr 2025 16:57:02 +0000 (UTC) X-FDA: 83391315084.19.F757E49 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf23.hostedemail.com (Postfix) with ESMTP id 7DE95140012 for ; Wed, 30 Apr 2025 16:57:00 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=aCwO8Fgb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of 3W1YSaAUKCJgL23328GG8D6.4GEDAFMP-EECN24C.GJ8@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3W1YSaAUKCJgL23328GG8D6.4GEDAFMP-EECN24C.GJ8@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032220; a=rsa-sha256; cv=none; b=VVUep6ls+1EWZg+fldEUJTyZZRMwZZ4J8/k8iRm5X9BaG+zRnCj4LGl+M3ax2yTB9Jc18k kQYD1yFALrDUhLWtr46JP62QkH9c+EAROxj0lgoiJ6ETb9dcIsAVu4sEOhYtLEXiOXFFry Q5jvdwp+NjtBhfMh/p1Q9oBTimQhr3k= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=aCwO8Fgb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of 3W1YSaAUKCJgL23328GG8D6.4GEDAFMP-EECN24C.GJ8@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3W1YSaAUKCJgL23328GG8D6.4GEDAFMP-EECN24C.GJ8@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032220; 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=yin9qGD9i6bYJZBuPpRaU3TWAZSEhluGZrBoQBBflwo=; b=fbIwMz+fuiQn2he0MkkxYuoTxxsoC8Y4mmN93/6ZVS+VuBzxXJzvOhRrG72xJrt02dBO2Z dY7kvX1k3x0tGU1/QWFqh3c8x/WaJtWqA4r/K1unoeHyzTGU6vQOPS+rzXIUWSv1qBJB7/ I0PqTVOK0zWQMTu39wGr2CgJLFTFHvE= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43ce8f82e66so60115e9.3 for ; Wed, 30 Apr 2025 09:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032219; x=1746637019; 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=yin9qGD9i6bYJZBuPpRaU3TWAZSEhluGZrBoQBBflwo=; b=aCwO8FgbUT/WMc5kguTM5oj1+Ou/S08f4mcmjjdpAZUkijCsNEVYxr54TLa83QoWD3 HGV5j6n5U39wBeICnYb0isVHhmAn1nfTK6ZVRy7tawvWcB8IDAPsMSv0H42HbWaRGh+s nxqbVjLHp5E7XujhTOdz/XszhTM5XrpReHiySPLStNYfDhPn0Z4IFM0ERqeXiDn1iC0Z zICqQyKvlzeUGli2sXufBdl20Vkr2UGpyB+U+gLM56CCNrwCFnMcO4mRuoRujlSXAEKj xcUAQY9jTbN424fQffQMrihoZVP7TPebrBgjf3L5Xh2IJEFvmUGtorIqsifo9zcrEKaF 7Muw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032219; x=1746637019; 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=yin9qGD9i6bYJZBuPpRaU3TWAZSEhluGZrBoQBBflwo=; b=dOqmVwzD2IbFEudqKo8Xtmpdm38K0eWkf4DEg2qLg3tVpj4MxAOzRtq7Q5EWWi+mJG duXWJ24yqEh7JMsR8fKl4gBy5U3oVFKG6ejTijQaivRLqly2HnAPTxj9RtZpO7tdmHAg qDqqKlBDOtIdsKYvzcxglAdK5gyyG57H48mjNsdF5+xJOoFQ/qrQuyHfrJf2+Mqoxo7Z 9TSBYO5acTFN/4zJy+T6KvENSBm3fpozChRPMsxfYhl8VnzJ8kSCHfUlTJNTzvlqsrS5 gqKO6Dr9fjzTapBTxcpZlGMTJMLhUTOF4OFCHLzhO4nCpPNjKBTWGUjF9hgD9va4ofez h4yg== X-Forwarded-Encrypted: i=1; AJvYcCVy9ezRaonMT87GNU4WM0CYptdwDT+KomfXiH9a4Qu0aUoFj6sANBhu4XwlkdJjK0oUg1ZI2z+ynA==@kvack.org X-Gm-Message-State: AOJu0YylLqTuWe8VU7N/P5nPBZISU0vooMnlGZm9ilWh+1sRdYEtAG4k 5oYWtbeiWBHndGWMW0BqJ8lkqdAKLCk9jhieMQ9xtPKhMkOpsXwOCLB7BV/ScixTtsVd0vYz7Q= = X-Google-Smtp-Source: AGHT+IHNTXwBimJm7w0AvwxO9LHDuRmUVyq5N7prGpQ33JGOil9AldAs09e2ILpTnulXgaJQe+NnqGUKlQ== X-Received: from wmbfp26.prod.google.com ([2002:a05:600c:699a:b0:43d:1c63:a630]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d91:b0:43c:f44c:72b7 with SMTP id 5b1f17b1804b1-441b1f35e37mr42132445e9.14.1746032219027; Wed, 30 Apr 2025 09:56:59 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:43 +0100 In-Reply-To: <20250430165655.605595-1-tabba@google.com> Mime-Version: 1.0 References: <20250430165655.605595-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430165655.605595-2-tabba@google.com> Subject: [PATCH v8 01/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 7DE95140012 X-Stat-Signature: nw3wcucz8x1c3hchzrtr7g83p1gdpsyx X-Rspam-User: X-HE-Tag: 1746032220-66012 X-HE-Meta: U2FsdGVkX1/yOtRnLUW2FwIv6QFWirUK1Vbk8E1jPfXNxwUC3qQonnmi8fISYAVDXyWlOUz6xFYvdlrujeP5mfX8GBtDo7pTmfjnt5xEokEo+1KcOrHCTMYqoYJMh/Yz3LLLykxyLJfjAHqq6o8+AzRbgMpVf8RoC8A+yz5f5LG7AFRsOKmadSgTYgyl/+SSwl4sRmYkKMD6APmijk9wbdINNMFewjHW/SfUvtIjpInr8f2tddWqxjuK0IzVD2Frz/ltJ0qCFEN3WeSoopOCm5BEs7uyH9aGbF6SsOcu9I0dKH/J39A5gS2s+95w5Y1s+J1hRl58EcACpKROfnbodpcJsw9FYUggnVGQ096pZbQS5QHRk6ZOtmI5HjgNoV0NpWpcCKHzsRtrl345e1ZoPG0c+mzw/cgF4hT/9x8cmJRbPH11UekTu8SxUBgQ0sr55oDKRz4apYcNMPSgpHs41AyDNKQhtO6UAqeqAtjer6FmPm02jnW/fCiMbjJ+qiD84xnehhKdy6+BRm7BuVRVbId22lqkec4h9ZW5sux2MeGgKjuQPyvHragr/l6D+kYwvLntBoDd5rA0Tm3+HOy7ZXCWKwe2QxUymG1Y5TDCaHQP+jrl1AwsdgqXQjIBd0weRHN0/qB0v4VnGT3aD7uYMS8COSO9yFZ7P0onv7NzbwsbTTmJwK0b43HxZ8QqRlZ7M4Vrib+lE+LoqK1PPF6YY908hHdYECfdBVpKVvsW5L1/HG8gKOvscAC0SO4Jk1eRI+NAkMxAbPx7n2/6WOPbQXh4TD+sCbHtTMt6esYtnTJdH5QNlQPxxXV3tRVtMhd/KvqJ49ZFvSdBDfRmyjGm+Z/d04ohXkfo4Az67gH9RCYr64X1xaV4oAs8BFxRf0QvxWMMxBbuJ6oyevfbmCum0e448r1eqG5TqG+IRrdOB0jWT3Eg5WMaLrbu0NcGpFpkyt3OssvUQLf7KCHvmNH rtjZ73jD pTfslZaWqUDPED4xpWKtfGRysQdSrdYvxGbT7obuxzp2icHccKX8w8YLDX8SnGn8vDYC6kzu0Gw7CqSJszrdWmiGGG8VtDhpMhospnIUUS2/mIQkjjBc87gcFbOyHzsQ/e8pOiYQmcDM3b+6v2SPBmEcQD/d/1KZsYjjQxtfUimbXsJbl5Td44hT9ouPiqHSxQCuNuX2NbWRl8Kete0ht/7L/BikNuE/GNKB1zFwZoVItTUT/pi9xX6bU39yHsNjzdqL2iPcpIO3Vn60Qg9lXbujuecFG/kRs52AT4/enOSsE6Pz7cuq5D7JQgbqiUtImCWyXS+z4Vz5gRtS805y0Y3+h7R6n+4FvsURjL41jpIlHcFdwdtig6aiKVDHMnXsklZR+2bgf3coKtebj+9xJgtUl7nioO/GG/YVeU4A+VXQI4xQcIA7UvTnrwHj2xZWTZuffxIQnSCtvdg8jtnesxjxDyKREgpNugRyPafc/n4iZXAdziLWwfCitWf9lUQZAvPiHoA4RlfHy5wULFqorxC+R7lSpEDfSZau5qieSfBOOyN0S7GPsTHTFuuWM/TVbXudOZcTLBRdpCbs/wnIco/xLxhmVQ8+8VRt9iBmHsHiFGtTo1KJBwcT4wA7uS/hTLTOEQ2Sa/vZ2DBMcii1/m4LRcHRFvYyEbCOAIsrucA9qHBo= 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. 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.901.g37484f566f-goog