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 2DAA2C54ED1 for ; Tue, 27 May 2025 18:02:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 618A56B0082; Tue, 27 May 2025 14:02:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C8E06B0089; Tue, 27 May 2025 14:02:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 490C76B008A; Tue, 27 May 2025 14:02:54 -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 233256B0082 for ; Tue, 27 May 2025 14:02:54 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BD0E21D50D4 for ; Tue, 27 May 2025 18:02:53 +0000 (UTC) X-FDA: 83489458626.08.78083AE Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf29.hostedemail.com (Postfix) with ESMTP id DC0FA120014 for ; Tue, 27 May 2025 18:02:51 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MHpl7GDX; spf=pass (imf29.hostedemail.com: domain of 3Sv41aAUKCGcYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3Sv41aAUKCGcYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748368972; 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=5V3B2RYLa1fEECDPnlrHtu9P8hNPSXvchqgDN4GcNys=; b=mHlDo/I3WC5v9qzi3wN6ovJrgcrd7oWoSBjjgVvYhabU3m0+cKsca2nEU9qB9G403e3MTv IQPrIHipODpgmS9m8uxkg/Jdd+QIZMs7+wkRjiN1NAXtVS0C11RWq6Gfay7iU1lTX0s6VH wR4lbG75dUJY3C/Y346K//VBaS4/AvY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MHpl7GDX; spf=pass (imf29.hostedemail.com: domain of 3Sv41aAUKCGcYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3Sv41aAUKCGcYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368972; a=rsa-sha256; cv=none; b=h55CuB9/ObSSlnpyKHkcxxijTINR8ab/NVKvwcUCHEFEob5POPVgh00UE1P207fosjp6n4 pkVnHvj0jDGwr6FmYt91Ytx2uDurP9ZmDWy9Twu41b8K2S8SPoseq62IUAr/1jj8sIDsO/ CbBt29enUSsHDlMJXgoHM0ImqRxyr6w= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-442e0e6eb84so23771875e9.0 for ; Tue, 27 May 2025 11:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368970; x=1748973770; 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=5V3B2RYLa1fEECDPnlrHtu9P8hNPSXvchqgDN4GcNys=; b=MHpl7GDXpkq8hyJq9IFbV7ugAhr+bASfLjgmZNyW+wDk3+clhCBMbjn62Qv3xp6iyQ Exfea0Snjq2IQlv3aZZOnlTGIAfuFwY5UkUHAv/oA88cHfbnrvJPTkPbkajC8uov1oiJ HmvRB4eLN4LYZcdBrxbxkAV2F20lQBUfSV8RyAIRG7oBOaJOEW8mK3rQ0SF2Zzia4gZy dUV5bSL/d7lkUaldIyJtn2gwlSbMu1SasgeuvpApjlBm3lMfJDX6qELdcQZa2T+2HM5d dcNpMzghF+3pUnkh2/Y2Z8YBFh6Zywhvs73yXqdzQg7oyg/rp6tcX8ar256Jb/XNrPta ByIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368970; x=1748973770; 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=5V3B2RYLa1fEECDPnlrHtu9P8hNPSXvchqgDN4GcNys=; b=VyDH8SRIhcDCUoiCCa3GRhnMr8/wTx1Oz9S6Ska+06WtFB3Dgvod0i6qegMsH+cA3L 5pZ+EP3kCWI8KFn5kVg8b5rwydptsd7O/IZUjdTNXFi/CrVE1lxtRIfopFALfxY+1cXO CPLi4UuZsdPNtF8rlt0oleRgGYrzM40tl0pfHD+zFNC+cfj0VO9XvvX2RvpDuy2vkQig 4kaYZsnFCD5k6MuwyyA5hBaEf/QVI6K0f4HCg8z4jujwWG9RRRnHjkuDEe6nreHArTkX KXOGpPoLoM28ey1GQbas+tdubyh6J62eCTD1vsznyYFuxbRJSPPSjP6dafu31L9pCTf9 NxNA== X-Forwarded-Encrypted: i=1; AJvYcCXIlNwpRBsGk+0Ev7SDTE+yo3eTYLgDmpF8tAbsztixD59vzmR31tlger3aN+PZkz08/gOMo+V8Ww==@kvack.org X-Gm-Message-State: AOJu0Yz7k+hqMOL8c3RzY3fQ0g1AwH2zN/7/4P2y+chE7CJsYBvh/nte Acq635x4miLkghQCRYrNTW8LC9RzSrdVTlKf1CIMdsrgwkIhuvZZWYFw0v5Rwx1QCsQBGys50GO KbQ== X-Google-Smtp-Source: AGHT+IFdZHX/lQZqCoT+8qts9/5CdbMfeZRpKrH709gkJkldDvm+LOhfmpHq4s3xD2Py1rZ0kVm6aRg0KQ== X-Received: from wmbem23.prod.google.com ([2002:a05:600c:8217:b0:442:e19a:2ac9]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3d19:b0:43d:fa59:af98 with SMTP id 5b1f17b1804b1-44c937d138dmr123262715e9.33.1748368970523; Tue, 27 May 2025 11:02:50 -0700 (PDT) Date: Tue, 27 May 2025 19:02:31 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-3-tabba@google.com> Subject: [PATCH v10 02/16] 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 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-Rspamd-Queue-Id: DC0FA120014 X-Stat-Signature: 689o3sanws9dhi8ehigp6jdqwxwed7qf X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1748368971-729964 X-HE-Meta: U2FsdGVkX1+J152guGwBCHmSDcAvxYNfQ2ivMz9Cc2cNTIuN7RmtJEFA7WKQlfvBQdZpJvvBPeMx9fYoBDhQ1EblqcRCxJSI82OSXLUG+PzQZC43Cn3HzTrDO6UJPtjaGr3yiFQEuV3590hs2d95aN49jkGp/8FCXV0hR4Y9/S3Q0TSrNHlWb4cJ5xYASvChGyuCqm536eL574pmlCp5r+UhEDKUJPVb8VNI87Aot1rN/SbjkF/rmoMB/HagTYDBW2ziYpvgs7Op96818zNjBwVIS5ujwflK2DRepU3Lr3N795bxcpHl7+JVFk1pIhci03z1T6LTG9Xj2MqE8PEI/0H6D1Hh3UPEIz5HPCV3rulJDkRuIsHplDQb0T4BpAqi4Os2LY/cGEMLhefgOv1ivUtY/RakHkE2/K1e0yJOelmnGs22cAxJst4qm3Mkb/secB78y4UHthikq6PYj7rnz07gi9DF2EdmD9mx2IVUntrE3RXxl9Pd0AYrwMMLhJicQpLRKsN7D/0ctIQmE8r38tzjW9VtYHbWEhu8/ovLK8SBfoC36kkkVX+cL7cxTi4ReTA2ebwr3YFt2SpkVPay5HF9e28bVg5sK8sdYk9lxHxBRedk9DhOM6iQejwxNQgcL9H92+tNG6YrpHMMnXTdFVJBOI6UsGeVNOywkryVgu20Pf9a0arZxXethrsDA4zr1wludXKOtn2ZFm+u9MwgXW11THuz0uDcqKaEO30BVEoBaMYPjlTGoXCo2/UkTBIc76LHgeY0PhxL5UPaEP+X3XApRPBYVSVl1ur8ihBoF6Hs9CuhXn6XdUSimqdg6QsV0X9EZWyxJpVRzXe7YlfefU88+NXXYsrHr0T89hmmsJ88a880t/Fqz3qOltLszMAy0jSKKcdYwpHiFe1YMU7ZB1aJnQkh9KH1sTRr+8K3gfoPAyyU+rFOpORVY/nBdUnGojIUeyOzm15wafCz6u6 GORJ6wDN OmgsVb0LhXqVIumnAr60xoALA4P8ghAIo4lsymrWTlfxPhabfRFMToi8X73su5ydJI4ucknnF5+wAqvmjW8k/UkZJNZbMXemQ175rmB+A5ZkdesCqNZzuVfe5Kf/sPnBNrEhx1BeDPRJf1nnung15sNABOFmmrefHWLPVOWF0d6ZNtaV2kp0yOilGyM1JuLCH1DB7Gj6nJy26PqS3g4kPvFkXn3w155Wfm2LJ1yUy1S8GWbH6lhz6DTHEo3C3YiKVXK++1BJFYbdZ4IS71SpLe3KQ3Ypl4q4BWNBoGRe+WnOlRAfzNNyWYSi5nNU2RkLBZMbG/GqjzN8e9RskZJouEtWNV5e6E+OIdCyADarx3tnrI719BGdC4YPScKPO+9NFxrfyB5pDYKfhAB0BDJqAwPNvXvhDHIHheMm8QUglsu8o4skVQuEr0iE+2ovNItkTfFtegABZWm04XehQm5hheqKulbvPDaHT0U5xsP+8ewEeJNO6752nKOjU3bAOG2YDPfoTV7Mx10PXEi53Bq1qF8MtwxN+BQ7qYrnQ1RgyHOP863shBSGY/r52AsF3fGB2Tc6wOYoAVRU8NAe/JZakS9/BV25m9Y3tp+UBdUzQC4+nfZR+71xi6KAdXFGW2PbManp7Q4236R6kI45Ci0QA5gCOHPTa6AbXRd5EBCuDcxVR2p+t3G2E8FmdQVuN+nUbbt2O 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: Gavin Shan Reviewed-by: Ira Weiny 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 fe8ea8c097de..b37258253543 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 @@ -145,7 +145,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 d6900995725d..7ca23837fa52 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2533,7 +2533,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.49.0.1164.gab81da1b16-goog