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 510EAC678DC for ; Wed, 11 Jun 2025 13:33:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AA5C6B0098; Wed, 11 Jun 2025 09:33:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 983696B0099; Wed, 11 Jun 2025 09:33:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8493F6B009A; Wed, 11 Jun 2025 09:33:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 658596B0098 for ; Wed, 11 Jun 2025 09:33:41 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2ACE31A0D7E for ; Wed, 11 Jun 2025 13:33:41 +0000 (UTC) X-FDA: 83543212242.30.09BEE72 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf29.hostedemail.com (Postfix) with ESMTP id 5B933120011 for ; Wed, 11 Jun 2025 13:33:39 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LbUVOJEn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3soVJaAUKCC0cJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3soVJaAUKCC0cJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648819; a=rsa-sha256; cv=none; b=Nkq2qiIVZuiF/9cEsdFR2fqksrHqjfVGminGZuNLkPoAtoq2w4ZWZ9f34qSeKduY1yn4pj /wAVzN1rMKGAgfnIkSwzg11j6BXgV8rFY/w6I/CRESNjRfN0SMdruicpGoOoYR2193aQQB WiYQECypnCRBE10Nqc3dmhAUbHGT2Bg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LbUVOJEn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3soVJaAUKCC0cJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3soVJaAUKCC0cJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749648819; 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=fHcIggQKHNaNFRvYnQpfDqUVZ6zXXYhJE0EKjE2JRfM=; b=Evl9ep5f/N4hSUpHtRecdnHZ4zChSyuCQ3BU44mIMsAI02+n0jWxmQxHiZ0Q8kmgvkLsrK Xlkkg9UpSAMxufQIwXYB29KY00Fpjfe9jkNRzW/me4Jhk5FJQEKgEtfa+TloqjSTKIqcca qw4wIzFq62tow9VYJnsiDHnay5m/i4g= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-450d9f96f61so44893005e9.1 for ; Wed, 11 Jun 2025 06:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648818; x=1750253618; 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=fHcIggQKHNaNFRvYnQpfDqUVZ6zXXYhJE0EKjE2JRfM=; b=LbUVOJEnf01g2pMuc7hlWJkOF5t3fAVkcO9pGcjE7QqoZS0yE0uUBPHQ8qdhIrbPjg b0Q9QnEHecGL496S9qoKq3zWUexLZx0KFeM+cVp5d/KE3Z+stnrkiJlRR3vyVUGta8eb n3NRFqAgu3dPbmTUz+VgSJjtuQVIo1jdEo7SwBXL8PiLSUUs3WgdGSof0rDtgdn9B5fS J5X/Ig25wCkdIx1aojxU5hxI4+hLBRAFDgSHJcRSfxBxV3efpqAjsyOGgc883zlQ3hc6 MkVc+FsPC8Fn6XpGeOVrzGcECpDcRnr0SVqjVwxHWPTfYYjjfTeZA2Rzkc6Gn5ypaSQG MsWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648818; x=1750253618; 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=fHcIggQKHNaNFRvYnQpfDqUVZ6zXXYhJE0EKjE2JRfM=; b=rZlthwpo8YedHQp3v+F9HSGRYsO20zss8+an9Ljxx8/AKYW/uS1PUVoeEvx+M0yQQx d2tuquL8obalQWXWKIWbpZea2MUVPDDFGDtrI4Mm6Al0ZCUtxvfESFqs3cC/5myQFpNQ hZnVcHY3CUUSeDexeDULQrEshwNr5oIizReuKV4Sri0wblXy0VzMuiS6o7ojMYyI05HM /8U9fknUNf5/aqj4tjLc8Slk+YGkX8hCfbf4MmSvG6LJ+aMJvcBnKZuWbpIhwbRAqLhe 7DPJ3FWnXlkscSKoDt1BppkoS9DSxwS45e5qjcIFCcQl0QjrhtP7zf3xXkHSQG6pJV0i HA5Q== X-Forwarded-Encrypted: i=1; AJvYcCWbYxm73dvPklgfrRfXU2nIo4JiHc8M8Yx7Qju95L6jrZRrMoGriLJ6XOoF5KLVkaaIHQLuvFLC1w==@kvack.org X-Gm-Message-State: AOJu0YxaqK/K45iK934hcPz3KCBwHiT6RHHcCfeOfkfJeGXYZgeA1XjW C6Eqfy4+/yZbDyokuqMmZdssVyYWqS1aloLSH/T20VJquQwqcfWlBfln4mt6svk6yVz7fa0NGgM c/Q== X-Google-Smtp-Source: AGHT+IEwaeObMhoAiffFZ/OlywAGjOG/+SlRjtCaGK4Sd746Ko0J37CRQTmNG+E33wWinMPOCq5CLsDQ2Q== X-Received: from wmsr16.prod.google.com ([2002:a05:600c:8b10:b0:451:deba:e06f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c4b8:b0:450:b240:aaab with SMTP id 5b1f17b1804b1-4532487b00cmr28102425e9.8.1749648818124; Wed, 11 Jun 2025 06:33:38 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:15 +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-4-tabba@google.com> Subject: [PATCH v12 03/18] KVM: Rename kvm_arch_has_private_mem() to kvm_arch_supports_gmem() 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-Rspamd-Server: rspam01 X-Stat-Signature: fupkn9xw3gw55oqfgm5tuxxrkiznwwsp X-Rspamd-Queue-Id: 5B933120011 X-Rspam-User: X-HE-Tag: 1749648819-822861 X-HE-Meta: U2FsdGVkX18xHvOlFAgpu7wkv+rRpiduwsz1eUeehny9hIM8OPVT/XaFIUn5ckhxP+weWx4I3Hl5RmlgeN4axlDa48VMlk++NI75KaMU3dAzhMOgyk2KnqSzKtRBbHnpZfV/2/MpDBraBPos3/UnM5w7B5N1FZzNr8cPZ+wIcR9E3JHkC3jh7t0kPE1MibYAMXc2E/r1QNvcwbAVjjBXMu20QIU1VXxlMuRZl4ql+IN0f1u9Snc1yvekEzngszKgaCVf8XD0GyljVF4A0Ek9+A7j3ImmAOYgONLBdat56DwAV645mqr/GgcbTJojC4Ms+d4FTXruVVz9PGoO/OC1ti+XjW2V0MWmRbH9TihgoDuj/iVji9wVy4fHJATPGPqOkT9sk4lHuv+zoB/o7hOt9nVwopuREv3cw1YoYN/SKn0qg6iGcAOswDMqRvkTndtEIwCMgh2V/Xsgl08923ci3mxAZgmwSdi6pMTZ9V3KQ5XCjS6rSYSVJIPq21xos8QhHtadwLkVKQywb4pO1nMV3CXYUEapQgs9h+TCs5RQ1skFaE+5mZRv+8JVZU1C18clSQN8Ro4aW3WGL5skYANy2xnHpXLKF1CprAmNnPd3fMeYphep6Of8z5WB6Vtq8mjv/WC7YMsqFHhfyu6VnogKri47fxcYlY3E3oEWPH68CXcP9+IwtE3zOT41qCE8x9f/IQMqAmmEa+hrv+fI+Ui9bXtTkGLncIKUyIju1yGHjIRIDizv94IbUwfFRb2rfpYFch6eE4pn4668b7mo8xsBK8QFqVj7mBTE9MMVtPM1aoi3ySGqr9Mc+04030PAd/xwjxVqvNmh7W5q2fdZPoWPRufdv7QutmclR13E6VSe/8onO1sXHEt5QkvHSdLm96D8iMhGfg6S4u+ivQYjuofKiIA95LJkwAHoB9JX80cbdEb7zLAgpPWz2Wtangm9aY4hicpLj71CTN5E85f698o dExCqGzB kc2QPdwFwqNuATcbi4Zjv6gpKNdftsSb5adAQ8GLiZA4lZm66pQzHh1Uz9OATV3FmqwVZY/24bSxEvTOeiaJqn2l8+bwe8qS1JfMf7PM4nT5Bhjwrk3C4m8WQQUNIAlLLQxuf+0HNLcYDDCv2Xfw8WNNuxFn4BufjKJpFWm5gfxJTGS/85rJ17M7CEt2EiVOyyU4d/CI7r5p/J+wspRfmqGTGiyrRyPhW5qMP4XFIdMuk/MMX9CNGHvf0pdMaN5l5nLCeXCbXbtLu4jlCkCi9JSx6BRIvpVON2xauReIxywEuE6nG78gl2n6+pTqIfhyFzEhBGXK01nvNKT3+hOOYes29YdTzhF6loCGz64Isq8pIAJIUTsO/hA1+ntrJIrZzvY8Ak/taHSgJyDXpPn4oIkDfj5aFEBy5ieTjU8ZRRYwmt2NkFre60K9Xch0LGuKYVPPHbmAy82N4g2uuuM7rk1Ct7zlwDiF2ljsAT66umBe/E5i7ZVUpp+DskgqpEm9ueBjo5+nrLFebeNWrxBtEovWCPpO0FxIp/pErTyoNwEElQPqPu8t6rZjlpl+s6McP9oPrc6WuMO3ISGBcmFybQQ/VK2zGJ/Qv+pVv25cLWus9vkG8/RcRbXCqIuw59dunkd9NtHgO2+hNniGIZaqNOJdr9vFl3RG9VhApu96eGgu8104xn+Dhux2E9ME5KOH1ao9w1u2cE+b1YJBF7g1PxCo/Vw== 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 function kvm_arch_has_private_mem() indicates whether an architecture supports guest_memfd. Until now, this support implied the memory was strictly private. To decouple guest_memfd support from memory privacy, rename this function to kvm_arch_supports_gmem(). 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/include/asm/kvm_host.h | 8 ++++---- arch/x86/kvm/mmu/mmu.c | 8 ++++---- include/linux/kvm_host.h | 6 +++--- virt/kvm/kvm_main.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 6e0bbf4c2202..3d69da6d2d9e 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2270,9 +2270,9 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM -#define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) +#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.has_private_mem) #else -#define kvm_arch_has_private_mem(kvm) false +#define kvm_arch_supports_gmem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) @@ -2325,8 +2325,8 @@ enum { #define HF_SMM_INSIDE_NMI_MASK (1 << 2) # define KVM_MAX_NR_ADDRESS_SPACES 2 -/* SMM is currently unsupported for guests with private memory. */ -# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_has_private_mem(kvm) ? 1 : 2) +/* SMM is currently unsupported for guests with guest_memfd (esp private) memory. */ +# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_supports_gmem(kvm) ? 1 : 2) # define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0) # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm) #else diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index cbc84c6abc2e..e7ecf089780a 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4910,7 +4910,7 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, if (r) return r; - if (kvm_arch_has_private_mem(vcpu->kvm) && + if (kvm_arch_supports_gmem(vcpu->kvm) && kvm_mem_is_private(vcpu->kvm, gpa_to_gfn(range->gpa))) error_code |= PFERR_PRIVATE_ACCESS; @@ -7707,7 +7707,7 @@ bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm, * Zapping SPTEs in this case ensures KVM will reassess whether or not * a hugepage can be used for affected ranges. */ - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) return false; if (WARN_ON_ONCE(range->end <= range->start)) @@ -7786,7 +7786,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, * a range that has PRIVATE GFNs, and conversely converting a range to * SHARED may now allow hugepages. */ - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) return false; /* @@ -7842,7 +7842,7 @@ void kvm_mmu_init_memslot_memory_attributes(struct kvm *kvm, { int level; - if (!kvm_arch_has_private_mem(kvm)) + if (!kvm_arch_supports_gmem(kvm)) return; for (level = PG_LEVEL_2M; level <= KVM_MAX_HUGEPAGE_LEVEL; level++) { diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7700efc06e35..a0e661aa3f8a 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -719,11 +719,11 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) #endif /* - * Arch code must define kvm_arch_has_private_mem if support for private memory + * Arch code must define kvm_arch_supports_gmem if support for guest_memfd * is enabled. */ -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) -static inline bool kvm_arch_has_private_mem(struct kvm *kvm) +#if !defined(kvm_arch_supports_gmem) && !IS_ENABLED(CONFIG_KVM_GMEM) +static inline bool kvm_arch_supports_gmem(struct kvm *kvm) { return false; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 898c3d5a7ba8..6efbea208fa6 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1588,7 +1588,7 @@ static int check_memory_region_flags(struct kvm *kvm, { u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; - if (kvm_arch_has_private_mem(kvm)) + if (kvm_arch_supports_gmem(kvm)) valid_flags |= KVM_MEM_GUEST_MEMFD; /* Dirty logging private memory is not currently supported. */ @@ -2419,7 +2419,7 @@ static int kvm_vm_ioctl_clear_dirty_log(struct kvm *kvm, #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES static u64 kvm_supported_mem_attributes(struct kvm *kvm) { - if (!kvm || kvm_arch_has_private_mem(kvm)) + if (!kvm || kvm_arch_supports_gmem(kvm)) return KVM_MEMORY_ATTRIBUTE_PRIVATE; return 0; @@ -4912,7 +4912,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #endif #ifdef CONFIG_KVM_GMEM case KVM_CAP_GUEST_MEMFD: - return !kvm || kvm_arch_has_private_mem(kvm); + return !kvm || kvm_arch_supports_gmem(kvm); #endif default: break; -- 2.50.0.rc0.642.g800a2b2222-goog