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 146BCC677C4 for ; Wed, 11 Jun 2025 13:33:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E16E96B0096; Wed, 11 Jun 2025 09:33:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA05B6B0098; Wed, 11 Jun 2025 09:33:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8EF96B0099; Wed, 11 Jun 2025 09:33:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A8ECE6B0096 for ; Wed, 11 Jun 2025 09:33:39 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 50CD9120C73 for ; Wed, 11 Jun 2025 13:33:39 +0000 (UTC) X-FDA: 83543212158.06.6A6BB81 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf18.hostedemail.com (Postfix) with ESMTP id 791FD1C0010 for ; Wed, 11 Jun 2025 13:33:37 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uNfV6b4F; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3sIVJaAUKCCsaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3sIVJaAUKCCsaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749648817; 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=Sby3t6E3SqseU66+AjZSRAM5YQx/H+Ih8yt31sFaamo=; b=2OctLYTWxpzRgR9XqCcdbruTcKB7WKA6Q9X5kpLDGUDy1ID9WHQlvV9aZe03lT9E7ZZGoc x562CqS9fpE7/RMJlLP2HHce64/ETNLxHGtMCSf4sxs/7riXUB5RYP27UBXBHrFUinGYqA 06Aum1UpmoulJaATiGYs/p14GPnKj0c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648817; a=rsa-sha256; cv=none; b=Sf6dIYIZXWZS0h7zjQm8BFU9AhaTDhVxSi5YSlz/KRPoa1ci7YdIjb66knS/sAvwCEsVyp 4bPzS1H8a6gAjAVsSsjbFS6DXJZIJSEoSLlGTP+fSqa5hXtcqh5VChonEa+sg8/Jukgb6A hnWw74kY958FqN/4sj/tiQ4lkR9gdxg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uNfV6b4F; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3sIVJaAUKCCsaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3sIVJaAUKCCsaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-450eaae2934so59534695e9.2 for ; Wed, 11 Jun 2025 06:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648816; x=1750253616; 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=Sby3t6E3SqseU66+AjZSRAM5YQx/H+Ih8yt31sFaamo=; b=uNfV6b4Fypo26uvV0tGI+A6QHj7N4Z2Ts0DeT9a59Jc/IKa4eO2HI/orNRjYe1j1IF JTfcdVLgMYDetxTbRMQMmKb8HLnNWyENuail8NoOKUrng7mbckIVT0keCOyyywSZV+up ezwA/Yg/l6zGDilooz616Kc+jWi9gMjv4UYrYxgZLKOWcctCyBKWhtH3PnHuvgbcRf/G WBOgAwhJt+8z2KCpFqxb2WJf0wS1GNUz1e+EQkY5aZ9622CIRwjwBiJOl3EpDcCcSO3w jpmU0sPj3t8Q21Rk7ZshQmQvClY/UJuRSZrR2mY/r6pu6Du0m+d1rXmKZHNSvZ0QI2SX ge7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648816; x=1750253616; 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=Sby3t6E3SqseU66+AjZSRAM5YQx/H+Ih8yt31sFaamo=; b=VaGwZ3PY+NN6l/tok31KgaJ76M+EufS9dBAsT8vU7cQBHgsN+EVxYJQN5QJltGvjpB sMyW0tDIUOP4+zl5yNNMNEYHWXPtP0o+bcwSEGN9WHei/IRZQmtfWmdPS/gFJ9Yk5HVc NRkBqKQMTmpLfeg/sF6ZTg7wkzbwgoeXlaSTRSp8C8yErnPx5ByMIKqOLCvXmQNLN7Vb RW5khH3CwORTFswhIte5GXCbCDs3wpFtiHjnQ4ECD63Q3/hU970xdBeLXzeihjfb6sQ/ SB/o6RYk3YJEf7xtAB+obi7/7f6W4jKZE8PJ7Yax2IiTIWnbXoKpWD5z9KrNg6DAYvaz j4SQ== X-Forwarded-Encrypted: i=1; AJvYcCU+ZGK9hZHhcY0ogRJQZ4xrYs785CPMT53NKcjSEIhvzhCDT9S5oZnVK6TtkwSfOUgFW5tnlohSrg==@kvack.org X-Gm-Message-State: AOJu0YyFcgQYF8iTkbuHPoBbBHy1iSJQWgeXgU2/B5m44e5tUGz1LGuI U9gC8NUILDpqsBGGceA85s38u8bVGHjGb83ee8fjmABCWtXMSU1uyd2weyw2mFvnNJNq+I/MuWV 2OQ== X-Google-Smtp-Source: AGHT+IFaCPRTnRe5F4zwoOmailDRB5UmsMCtLol47gADiAuvV7sR757p1uzXQjjWMoxDfkgDrC1b9HUN7Q== X-Received: from wmbbi10.prod.google.com ([2002:a05:600c:3d8a:b0:442:f8e9:a2ac]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8012:b0:43d:3df:42d8 with SMTP id 5b1f17b1804b1-453296f41f6mr8408995e9.6.1749648816092; Wed, 11 Jun 2025 06:33:36 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:14 +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-3-tabba@google.com> Subject: [PATCH v12 02/18] 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" X-Stat-Signature: 7sjbwo1dx91krnynkk3q4ugw77qzd8fx X-Rspamd-Queue-Id: 791FD1C0010 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1749648817-924925 X-HE-Meta: U2FsdGVkX1/1JNcoe/+ySU8cqOA17/8L1YbEnc4puFX4+mKibHiRSTn7Yvgzv9eY7N5f4jqpPQtbPFjVo1aYNbXVILSlKRsF9vtfhNjB+4kak2QvnPfCTgrVvjF3OX1juBAMWdx997RKWzmvJl+gjSCmhoEH1PVFtqxo2RrfvrgKn2WJw1q/W+kto140ULK8MnR4j28B6BngOE9P6HglhZo9GXTV7u1h6eAyZXN6tx6kpAI/GmuBP+leBw6cSb/aFcfXjq7TpgRCsPY/U2Jdt2LOw5aShEGXjjBWFgMIiR+zOWqjtJb/PESiMjk9bOOIBVigLip1WPm5S+58IKOXTWNmv1lUTW08syj1vxv3HBoxRPC5ggROIWHB/pzvPXdtaORqDWQ9U3rqT9RAkqEJCy8NnGGv5tdBRNhC48XD2UYkEJkfI5AujYDXgh3RZb1Gkgb5Lm0+wSeYuv8hReVZpBLyckWITsxOdOvcCpor01powTIWpMsxzqdsEX4DT1remC6Glh/1VJCCdIadlGj4PIljrJWfaD8z2fVZMWE22CqUCh0zQvH7/vNqZUHpFu5fmNHJH7YV5wV9q+f6rJ/hmgGe4QcFiQ4OIyoY6RuJgjhAGa++07/K1z5iB54mYCuVLxsmE5MZLo0lkvrD/mGwtuXOT3ENOG06PlWImtgsuaN5z3kknKYoVtK8cUHC6haDk/jblyP6Rd47A6lfTfIkQyfVSNwF7VNmXJvosg1iIzY4UJBmt+DvIbV+OSTt9pZbsNRiD38oJm3WQculILNiQN7Az3IqS2bMl8tSDBEzELbiE0YEZ41BamZ94dmBREIJOIelFR/fHedhCMEspTZUae2DNqVke10i61jp6tP2Sj/v8Va6ywFpM4OuxctJ1EfHJPEUqcWrTHHkGnMACnkaamIdgBnhfQSYrY7U8BcaRHyJY2IgxwMehqTmjSNgvnDS0P8eyVKxHG0V/k94vkJ FZbVDKOU oLfVfDMjwueYv6lDOON//ooM7m1JTe8WoGXzsHtIw2UkR1GXumNRIr4wTW6Xjr95O4m+TlBsd1cUCkDE7I4fDATq+PjyFrdcKNER0M4Qga8TEwD8gyRXZusdxC9VEHrWIwcwfIai69OuXg637zWNCLOYWhelF8PTdKdMgLWVsYL9gYV1apATtq5fCMzN8RStsFN3fo1x4sJCHAAmccgESR6K5hEXUzNz8IYoYNvFx6qdy27qpincm2BPPHBeO2Xx4LhrShdnaPS2y+6s/v7Llu6YwENDvMhHi1W+EtbNMC31vllp3w63VOl5LU/GHP7ETW27I6iJyvhTU0OHL3vqYBozABkw+TvA3JZrQVy/s8nyH8/YcgyO2lq/02BxfBg1ct3uJi9LkCOV6S3b2mypaD8CMrfU8PS6cKPUWnbnEelQJRGKsov5EplLY6dj2Iw+MonZMPnn4eiAtvSMS/fI/nHjO6tY3eEKsDHVgwRfkmvf9kYAjZO6zl9bG4HxJQuZgq6vim94Ti5ACrafrEPuefLhkJ084lhQkw/SDACdq7vsq0Xx9O2QN27OwMwp45RKdYLRLf7MbMPwoXjjInNp1bJbqAA7DOLPxj05/jPYRJiJG8BmlTBmvP+0Q1emweJH7ZhdR5xBCAVfGa9gz+sAx4jh9KlOZD5vvkysQAOYdVozML/Hypi1rVr1RvK93azvEHXqK20XVwczSYkbCJog4L6jWkQ== 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_GENERIC_PRIVATE_MEM enables populating a GPA range with guest data. Rename it to KVM_GENERIC_GMEM_POPULATE 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/kvm/Kconfig | 4 ++-- include/linux/kvm_host.h | 2 +- virt/kvm/Kconfig | 2 +- virt/kvm/guest_memfd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 2eeffcec5382..9151cd82adab 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 @@ -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 b2c415e81e2e..7700efc06e35 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.rc0.642.g800a2b2222-goog