From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF2F228D8C2 for ; Wed, 9 Jul 2025 10:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752058796; cv=none; b=XTXmyGQ7oaKkZ6hsHX2Qr3gqyODOI3aDjWIU8xRE5LNXFXiCMP4x10AnOyKMQBrRXcdcuuz3l6jRc9T1ybKTeYZxfrwPt66KwSKU8b/3Xu9CAVuhOdzQgtlGvq94Ta53Lms3D5MoTV/VYevgPNebozzrjopuC3hP2sk0A7dIeXM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752058796; c=relaxed/simple; bh=H09IkjV4Xil817na22yCswVhU23DwQZ/x+bC3unupSo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Eyfkz9D70Lng5Gv7sxaaKAwqcRnLledgG3bA+j9VEL0wZ4JvRs3egUCxDg1VCNdbTV2QWvcb6c0+CxZ5TnM8Z2bM+nu2l1dQNCrA5ZEatE44rVSLfsGhsOVtv1JxYQpLb705Ui/S8ZeCaUlBq5FXXMhjHE3jqiadim6Tt02xxzQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WlYx/omF; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WlYx/omF" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4530ec2c87cso39094905e9.0 for ; Wed, 09 Jul 2025 03:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752058793; x=1752663593; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PJ/wXOElC+Z8OeCgIzyNM4mWk3Ktz7XTnyHef6ynGNw=; b=WlYx/omFlN1PwOXiTE7YWQaf/a46nukPRqFOvVZOX69rLbZo600V0SBWpt6tzwRdvj a4Y8Gexeqqfh/Ijf6rFJtG1PId+zt34IOVt0Ol8Dz/l2s39WPRditwwAfmE7gs6fV9Di 80JhiGFfjPt/5GX/xwR7iFlkgn2AjByz2HFOArEwZYfTUQtuGGRdHoaoWYt9yF/Cy2yE bsphYqDVBWRQFoUVxy6mrhhfCGQW6QTPcbG7lmvOIPRyF3jidL+6zrYDO/uk0AuTQty4 rWmC9w4TfHm2ZilRGZ1oZr1nz4S06SVrconk4fU36ZaTwFwqpHJQD5VrRzB7JemDlYYk TGvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752058793; x=1752663593; 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=PJ/wXOElC+Z8OeCgIzyNM4mWk3Ktz7XTnyHef6ynGNw=; b=XIKyxVs86h7pjRA64LTPok3nb34yRR1b0pA5hhrftfucK5Rk8gb14Qi6ip2LnTJtzw C7vycfgBcfjSxyrDWWNFdDky6VPCVUoQJ5hvNfkZMiYNk7szZjABqqxmV8YgyDvO85da rfp9XrjIs/AoDpko2SleJcPVB9GL1GuFEifKrH4NXOl+W/FCwuwap2cSJAJ44J2wvWlS yjZSl26aG7TttlrNY07e9MvxwxYsv9YpXzkBIf3bm6RF0nhyLrLVBiDS7D5ABlE6X3Ry fplvJR6uXB9v6q9G0R8ljNekJJCyR+fZGpeVkWs4GoBkd7vcN+ONupzadJJubkxq2Afc HwVQ== X-Forwarded-Encrypted: i=1; AJvYcCVR7P7LZ3F+KqutYyTcPzMQy+EapqVsJTU0uHvmY6YvnPQOCeelu3U1rZDWKM3d5/PG+hqSvJs=@lists.linux.dev X-Gm-Message-State: AOJu0Ywqs9ootIRwxhu27CkQysLwepaPPqupUPtedSBZo+IpCFJ82wKI Q2Wmt8aQgdp6HQpyFdra51Y7mTkrJoXbMrA3EkntzSzwbPU6jsolA0kJfjTkcjyEfJHTsGMqVl8 LRQ== X-Google-Smtp-Source: AGHT+IEzG+1uKM9AO05dF2Ch0TQrrd9Vs97wNui/rXRXxB3s9D/bdjxKFTMJjpP+kA7nJqBXvADB7nrGMw== X-Received: from wmpz17.prod.google.com ([2002:a05:600c:a11:b0:453:f28:e99f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d29:b0:453:5fde:fb5b with SMTP id 5b1f17b1804b1-454d535bbc6mr17668815e9.19.1752058793100; Wed, 09 Jul 2025 03:59:53 -0700 (PDT) Date: Wed, 9 Jul 2025 11:59:28 +0100 In-Reply-To: <20250709105946.4009897-1-tabba@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: 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-3-tabba@google.com> Subject: [PATCH v13 02/20] KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to CONFIG_KVM_GENERIC_GMEM_POPULATE 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" The original name was vague regarding its functionality. This Kconfig option specifically enables and gates the kvm_gmem_populate() function, which is responsible for populating a GPA range with guest data. The new name, KVM_GENERIC_GMEM_POPULATE, describes the purpose of the option: to enable generic guest_memfd population mechanisms. This improves clarity for developers and ensures the name accurately reflects the functionality it controls, especially as guest_memfd support expands beyond purely "private" memory scenarios. 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/kvm/Kconfig | 6 +++--- include/linux/kvm_host.h | 2 +- virt/kvm/Kconfig | 2 +- virt/kvm/guest_memfd.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 2eeffcec5382..df1fdbb4024b 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -46,7 +46,7 @@ config KVM_X86 select HAVE_KVM_PM_NOTIFIER if PM select KVM_GENERIC_HARDWARE_ENABLING select KVM_GENERIC_PRE_FAULT_MEMORY - select KVM_GENERIC_PRIVATE_MEM if KVM_SW_PROTECTED_VM + select KVM_GENERIC_GMEM_POPULATE if KVM_SW_PROTECTED_VM select KVM_WERROR if WERROR config KVM @@ -95,7 +95,7 @@ config KVM_SW_PROTECTED_VM config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL - select KVM_GENERIC_PRIVATE_MEM if INTEL_TDX_HOST + select KVM_GENERIC_GMEM_POPULATE if INTEL_TDX_HOST select KVM_GENERIC_MEMORY_ATTRIBUTES if INTEL_TDX_HOST help Provides support for KVM on processors equipped with Intel's VT @@ -157,7 +157,7 @@ config KVM_AMD_SEV depends on KVM_AMD && X86_64 depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m) select ARCH_HAS_CC_PLATFORM - select KVM_GENERIC_PRIVATE_MEM + select KVM_GENERIC_GMEM_POPULATE select HAVE_KVM_ARCH_GMEM_PREPARE select HAVE_KVM_ARCH_GMEM_INVALIDATE help diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 755b09dcafce..359baaae5e9f 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2556,7 +2556,7 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm, int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order); #endif -#ifdef CONFIG_KVM_GENERIC_PRIVATE_MEM +#ifdef CONFIG_KVM_GENERIC_GMEM_POPULATE /** * kvm_gmem_populate() - Populate/prepare a GPA range with guest data * diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 49df4e32bff7..559c93ad90be 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -116,7 +116,7 @@ config KVM_GMEM select XARRAY_MULTI bool -config KVM_GENERIC_PRIVATE_MEM +config KVM_GENERIC_GMEM_POPULATE select KVM_GENERIC_MEMORY_ATTRIBUTES select KVM_GMEM bool diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index b2aa6bf24d3a..befea51bbc75 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -638,7 +638,7 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, } EXPORT_SYMBOL_GPL(kvm_gmem_get_pfn); -#ifdef CONFIG_KVM_GENERIC_PRIVATE_MEM +#ifdef CONFIG_KVM_GENERIC_GMEM_POPULATE long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long npages, kvm_gmem_populate_cb post_populate, void *opaque) { -- 2.50.0.727.gbf7dc18ff4-goog