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 A1916C3ABD8 for ; Tue, 13 May 2025 16:34:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4AD56B00D0; Tue, 13 May 2025 12:34:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD0806B00D1; Tue, 13 May 2025 12:34:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D4CF6B00D7; Tue, 13 May 2025 12:34:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7444B6B00D0 for ; Tue, 13 May 2025 12:34:46 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C3D94120D48 for ; Tue, 13 May 2025 16:34:47 +0000 (UTC) X-FDA: 83438433414.30.027D019 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf13.hostedemail.com (Postfix) with ESMTP id 295FD20013 for ; Tue, 13 May 2025 16:34:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=RWxqXwSE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3pHQjaAUKCGMUBCCBHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3pHQjaAUKCGMUBCCBHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154086; a=rsa-sha256; cv=none; b=TVlniuz2Bos9r5D+gmLoYhfoeeVJrIBFRoDT/VO6SqtT6W4UUfdVj77VymjupxcLsCymXX ZbGZqxBxsmo/d5thScwlN3Ov2Xfx5YTRi1ZjGKvBqdwSQt1gwvz0wI+bhINPGl+WyOnkew 1T8AlQFpuxJxNzONSEjgTCfej4i2QA0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=RWxqXwSE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3pHQjaAUKCGMUBCCBHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3pHQjaAUKCGMUBCCBHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747154086; 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=TW58tdeuujPQSfLrI4Dejm7n8vR9oSFyuhN6cUvPKqQ=; b=nDF+bDbuOYivN79hN1AMemrVA5DUMDYtcWil33DmS4nZEITEe+5TQHNA0fTVzN89buCkCC 4nSTSk/W9XTOWMDewT2hBj6G0gCxJxJVCTrVYdqoDUe6+Xilai1OW3KFr8pQFYrhEEO+km +/cASSV88ibhLwmmD3pol+077M6y5ww= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cfda30a3cso30010685e9.3 for ; Tue, 13 May 2025 09:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154085; x=1747758885; 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=TW58tdeuujPQSfLrI4Dejm7n8vR9oSFyuhN6cUvPKqQ=; b=RWxqXwSEy9XPX2Lf9yrCNjIfCbxh4iT/VdmyejXANolIfYOadxH8GO3LpdAy2G+1A/ mR7I0LqaIG1ORM6HaM4finOp91wth+Y9AJd5d77hqN9EmQ/Lf0Ac8wg94Hc+VLyDMkfv l27i6hFaUQ6Yi4EIz2FG0WY+arEsueO/QzxpgumF64XzJEJg43w9YNx5G15NjMPCMqyF Y/lPxaqkmTfEmgkwlhXQgyVNDZzsNXUYPUYKNShJGqvmEQeX7C1nHNCPSUrwRflUzPgQ eQYAWPI8983Quau5DTWsBnmMpMx2IArpayj1wMEx7yk1R2XUR/8n1pH10M/2srul17SY Z4CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154085; x=1747758885; 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=TW58tdeuujPQSfLrI4Dejm7n8vR9oSFyuhN6cUvPKqQ=; b=QU7pI6VIOPHzRv8UrtI1/ceeprTyxoxqjUKvRaaN7nPnfcCBrytTYRQ6LmnX5DM093 79w3hzMeTGXCsXWTT/DRKcUQJ/h0Pl0OoQlHPP0X47ZyyO5ZTxWRExTS7LHVkDHktqBI ijZSPDZvkrS9w2oQLOMH0yqn7rew4EfM/Ht8Y/TndPqvW8+WDFanlJjLO2B4oMjW4/bn wH45mZtURf45kIgbm1IBJUIxtUTcQhIhiZvDQEXhVHifJMJ33r2NMGTRvgUeHwXa2smA uiMZBSu2Y/V3QSK+b1qOOTTz5H0Ms3Pd86L2Za4fTKDiaX+5ZRh1bQxCaLqJ6ImaaEd7 3hQw== X-Forwarded-Encrypted: i=1; AJvYcCXSnpiF3buQvTg4ELHWGaDxN1o0Vyo/oWrkLfKDwWgbmjGiNgNyN3g9YqTqF7H2Ot56m3xflw/UfA==@kvack.org X-Gm-Message-State: AOJu0Yz5KGBG7JhP+En3lyKibbKJcMYUAHUSgx1ULiD5pVMenP0j5zFf gIVLdLOAJKoAKTuYKrBaBEFb+gRFDam3L9TwwfWasAKAdj50aZw9v2TPH89fMO58rJIWoTR6AQ= = X-Google-Smtp-Source: AGHT+IFj9pRKN/DH8YfxglgQfsZpXnJ3j3ZI0jXCzgoNzxGRBHeHeZF3xHQiYbURdskXxs29GTD5d6vGGA== X-Received: from wmrm4.prod.google.com ([2002:a05:600c:37c4:b0:43d:1dd4:37f2]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e46:b0:441:b3f0:e5f6 with SMTP id 5b1f17b1804b1-442d6dd2276mr134025105e9.25.1747154084667; Tue, 13 May 2025 09:34:44 -0700 (PDT) Date: Tue, 13 May 2025 17:34:23 +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-3-tabba@google.com> Subject: [PATCH v9 02/17] 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-Server: rspam12 X-Rspamd-Queue-Id: 295FD20013 X-Rspam-User: X-Stat-Signature: sop6iaz7paub7jrmc6bqztfqsf8539r6 X-HE-Tag: 1747154085-720069 X-HE-Meta: U2FsdGVkX19rKy/tkVSIiq9SQlk8eMIe08gNnAqR7OTTFNjZUc70YTLvTUPpQpi2IP8pNVxbahdKxRhAkWLXu66qYgCceOoqhYeoMysGb/kI2aegvlDU3Nb5xfB1NEWFKBGBGtGpW3usL77bvALNH0UlIHmA4gi2id0BzK1hCbyowBH+aBxmhN62N5azP5uxhfwWN8MaJI8SpEmhapP4W1cjbYw/dePIA5EFK5UI7cJSlh5EFXzHe363ee0kcR0N5O1OELG+6o7mW9YNHewZ/JlC7FhSWYeJNYsDLd/DARomH6sGzb8eHnRFtfdIO5FqOeaE7I7X1BKup7ADqoYYTBguu8OsFyaJLGYm5zAQ0kW1Pm0IovcwBUPY+2U5C6+ucI3HW9pym/1yT7c+CrnOx1t+jXC1Ix+k9Dp0tcEuvQhYpuA5e2deThBfUYkYSEcBTtQ4ZTA863EpVf6fPsVJdEIXsBXTu+p4aGZPrYYVm77UH89Fw+rYtDe3iaMliF9cQWINwnHBhxWUgGKDvC/mvZNDGsdYi056v/00EUPURrVsmf4pmz2/PgV6DOjfe9JhFhczsIpTKiUslgYEo7Q+Ary3N2lT7S5yEndZdN6PH5cNFTnqm2grQcOuGUH5Nbwx5pMePHVxZQCT/G+xQAge51XumzDBtdz2kWIHDQcdtKqLfFOfaUIN1SS0WSBpmhcsUWrYCuC5ClwRLkj4FgdFE7QFxiZyMCFUfz9yrG+C6YUcQmw14yMdRDfxUcXDOhA0/QpjKoml0+APmMn8NYt3HVx9lhUGOeH7DFGyPNlzkjMwCiytPEGROqDzyr91CoMFbY1e4IuiWJ7yHT4Ml/QJWrWKJxsMF1v6ne5jtct1LhkHHjClmrksJIXmllwQ0mZ/3TUKzbptAptsWQ7SizZeBxM7TfzTdXwHQHgpg5Wx/IPt+CSF4Gi/bH4CHHZCDIEztWMOaZRDNO1mZnjqbgs FHaE6ATh fqD290z1rnm1KMHOiPjgikap105roWKaTAfHJsbHVm5un8xIrRH0ieygyEfQLcpI5msncRl+Pi5oM+8u9ysm7TOwngUZUTJy+30WER903bh4gtehoYxANlV0Rn2wUOwYXQ8N1o9GGlu7IjIKKlW04+90QQNlUhxrZLwedpl2FlZbUqo3DS3gR1YBSqyZpsWLV6HN/PaMJ7ek0Afc3HcXOKQ7uZP5o/tvH8kzymu3xG3+XlnGfGbryDRJHN+qEPyxM1lE5+Ua5hyFSp+V+OvhUnf5EvBRkI5TA4MvxJ79SR9Hw/bFG9s4hFuJjOg3QOnBuTnDFgMBO/tdv/6fk9leFIfnVGfowzNlYqsnuuJJhBixwTO8= 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. 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.1045.g170613ef41-goog