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 2959AC369D9 for ; Wed, 30 Apr 2025 16:57:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CCEC6B00CB; Wed, 30 Apr 2025 12:57:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07C216B00CC; Wed, 30 Apr 2025 12:57:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E37546B00CD; Wed, 30 Apr 2025 12:57:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BDCCA6B00CB for ; Wed, 30 Apr 2025 12:57:03 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3C5FCC0599 for ; Wed, 30 Apr 2025 16:57:04 +0000 (UTC) X-FDA: 83391315168.13.6447F5A Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf12.hostedemail.com (Postfix) with ESMTP id 5CB7740010 for ; Wed, 30 Apr 2025 16:57:02 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rgcT8jN6; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3XVYSaAUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3XVYSaAUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032222; a=rsa-sha256; cv=none; b=Y5a/CS4XxYsktc75tSau99Y6k3/58M5Q/1wGZuUJfvmOwRzi2O4+MrmgA0Dgf4vlECrtLy 0yvBqOntxatA0LUcFPRghE/IslbJR/rpKAZNLK9ziUwXxN2EIHhUwD5gY3W9f+a8ptfwCE RM12W4QvcZPDBFdVDn37F4hYGqBD9dM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rgcT8jN6; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3XVYSaAUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3XVYSaAUKCJoN4554AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032222; 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=EQOJicvOuD+4kvnHRJ2oY7nG9Llh+8wXb6K0ps724F0=; b=66naLak82a7o1hdSZtgrZG7+Kk33ifQCkOtnSHnbxI8Bh34TS1bXzwjcIg5wV19P39p/ia xSOXqaw6X9yRYROs61pnXVz8X7Zo24QpGPREsyJ63l5equWK80p3QYl4wpqjL/I8I40boM g52kBh9kSIeKdJNJCvU4Hbo1m41jRQ4= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43d209dc2d3so40865e9.3 for ; Wed, 30 Apr 2025 09:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032221; x=1746637021; 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=EQOJicvOuD+4kvnHRJ2oY7nG9Llh+8wXb6K0ps724F0=; b=rgcT8jN6hOpV8+UvNDq7f/Vtj1f74rLpTvY8bPBfR15Iv2YHNwHw0RWi94L+3jOW9I u8Huww7Uqy1kNGTmOujo1bP4hfs6MvODNw5V8VkP89MKU9a0RnhPY7ePL91fGpVKXk8I 9DC4r2cEa0+0stBdsGA8tOBR15sPhoB08Z3STceB35DO5qIIdlyTKV/r2npDuzG0rxIB ddpYMjMDXcAIQN4rY/Br90iuql70hlapcNpV8K8v0FP3wXA5i5YIUMg1x4/4Eejwe8XL /9f3RbzLyNM7DS5ga72V0VoZQzqWJFh1zuZm77OhvTteAm1GpbbDX8ooRqLNs61ibtiw BDFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032221; x=1746637021; 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=EQOJicvOuD+4kvnHRJ2oY7nG9Llh+8wXb6K0ps724F0=; b=Yi3+bE8tMijbV14Iwro855kZV/zNKh6JEH40kPK4MULxvkbIY0E/62V9Pc0f9Hfa+4 pnnBouedAqnOvg9GN3oxt8VpOJk2Rp9yyqEzE7dCeVMZHasWhgM5lgSlKz5LJVdgUrID iVGB4AL2mLKkQHFXn+qmIVLF4Yp93J5b6mmsPb9eh2hlsQa6Gj8CJ+2VUF14WfjLVj+t uQtjSIXppxplfqADuVcXxJwuOdAzgWdggYgCDHkgdEHyW9qA6ao9nvT5YfOd4wrkw/PL ch0atR0Z/6RmzfF9t84yIpVFi/MWF0f/IjH26z1cj6lO54iKKLpRg75BbRKnLPBviZxX I6bw== X-Forwarded-Encrypted: i=1; AJvYcCWDnwJyM4MNmemHrbEVnZ+xBc96yU0QX1eUA5znefJ7rnRkOb2MXdBtZEQK6v/gX+CsqYzN2IrXnQ==@kvack.org X-Gm-Message-State: AOJu0YzYv+5cgo+C5GtsJHl+vHO3WSnNV+V4MmRlUk8P2H6Px9MGNoI/ UyA9hvcGOTuuYV546JutAaPpdEwxIUnaLOFdCKe2EDXuIwTdKogw6tP9xkGuPhCTtzCT5CDX4Q= = X-Google-Smtp-Source: AGHT+IGwBVPOVGlrkY7iCJBXS/44guw/7Wk+oN3WlGjxVV4BaIM1xjA2zctAzqqrPbQWNZTXxR10YdF66Q== X-Received: from wmbbh20.prod.google.com ([2002:a05:600c:3d14:b0:43c:eb09:3790]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f91:b0:43d:ac5:11ed with SMTP id 5b1f17b1804b1-441b1f5b8f7mr33803595e9.24.1746032221004; Wed, 30 Apr 2025 09:57:01 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:44 +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-3-tabba@google.com> Subject: [PATCH v8 02/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: 5CB7740010 X-Rspamd-Server: rspam04 X-Stat-Signature: af4opgonjcnk64kdwndrdtdyhkkgw75q X-HE-Tag: 1746032222-821714 X-HE-Meta: U2FsdGVkX1/NfCpZuQ/fVRroX6+7uvdG3iPLUJBkFEyjeTTP31faQsuzKHD5BaAkBJ+8LETTVYdAiH2j2ACmv45pxs06I6vPAvZW+JVYorwiAuONB+K9WOwiRIYkhInWApwclMIGRrRb3nMlKyHZ2KggfHzh2vPRYneywtsfI0JfYVkF2vn5ue/rEQZ3Bn0+RyiW+CWXxb1am9UjvAeEzDv3S2IQ46tor0k1ZFHbIpSHuAw47BT37yUNjOJhLbhvbaOob0lR6TwaPRdmsZTjQUsHZTznPRBhR/Ql4FcGyQODG3oqYDiL+uTmkBmLZcj3RQ6Jx2488zMivFzLxM8ZbH+99R/cu3GDQS415tiqf5TkS+nS4KGpSsdqS4R1ZAHbNZk5raLUXuG8tdd9UtGydCReMlAxMN9X77NnQgAsKxBETtdS+79kjq/ISpBzQgRDeYHxHXIunzfMkXdMafxDgP92ZX9HJ8kM/s+ugm+FqXS/M2OBNiwCxwqOCqQmA7Ezt+lqSjHMeBIXCiZe3jOoNvFcZ0qkPni6ywyOsHyMKuBw4AGfH9Uybtd3SU3ByyWKga0fc1jz9iY9yJ2bxjfhlLdYxDomCUfIDMS8cEVKngyx/1m+pz0eDziRN1l2JjwsQKlgrT8gHB+F64fTe+gESpQInCRCToL2GWD4/+mNYoRTXoIY/gK5p64l7pHh47K4gpnMHoUae6aK6X34wO2s/IYttAoz3jsGGKQEwlskAMHyqQn1T5QGiATMrTF3+aSmTl3XrToe/vQJ1PbnEYTWXvan9xc77LdsAMm9yUSa6DJqGYc7AAPpjm9Q9k+iSGMvkd+4m2BJIZGTc9UJs1tDkHluaT2YO5tibx62zKnAV0gdKhf/HqV7wBAXuXCTXYQG9CIrLoYkgDRw/3gwOsTGnQvNbPCK/cTfKoTLsqTEo9+zkVdkMqqduUoVEGZUlvdvevTdZqp5JNsTVraZBK6 Aba/tjOv hFfKj770i35sqLSjNbzKB6l5ylI3XOdxbL0852ya+E2STH2Q5N9rSAwV+/BSX93xdTp/oE69zy3Twr3KK0e1XIANo95lJ70MW7ovGrLaBUDuifGpye4/Ajkwvm6bfQ5DYj9AYikqwCyKAK2iOM/X3WUWxf6uEvq2EjWBG0DwcEJGadPIFZXRkDTLu+ujMFWtY6qh1WRER2A8uaJrPaklQ0Qk+P6BQvJYNRZ5JR7OiGkV5R58npPOVyJAV/WciZ0K1r2zEmdx61rF1vUvy7cVOhxgGtR8uK8nzo5Td7IrHn3suy41UMtR01YG14msetuYsQ/Xw0GnZS2UEP/dPnlaws5aXeHPeYinAL2/Td6ii9AAThDpseAE0/Y9m6trdheg7XFxmBAqDGVWE5U/dONTTKxO2M68kEhhMZdyu8GFcDlbGp6VkR9jODj5a0HId608YoA/R/2xazd0Zj9XpzuR8vYcS9upLigC2JCr/Dggmis4MrIDW+5/lDir0M2b4z5E7H2Qf3/ZWxWqxJckcldYAzI7MYC0OhzwvcNCLlZ+Smy7pm4zS1+MZ8M4pZwEzLTPp3ycSccYIQtZeHxuip0PhMIuCrGWrhQ81GhwuJkLjcgYGOBOIVgNGyn2j2/hmhNuKNlCDuo38Ey48tpZ4fkAYfZ6aUMoSff1Ms6EkJzxExtcl4Yo= 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.901.g37484f566f-goog