From nobody Sun Oct 5 21:42:54 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBC7528AB15 for ; Tue, 29 Jul 2025 22:55:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753829742; cv=none; b=eFlyii5xbSoKn2nbig3h1478EDzGdETU/EwkmEvjfbkgRZt2OiFXUYNm2QRXic7R2WF9eF6YdHSxakY+eHIsbXXW0PoGak0wcx22EM9tG2qi6T8zrj3kkRplnQ23HHDgg08Aawpd8Fy5Q0yDbqbDMpEi/1Zz93jSFasAW1mpTfw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753829742; c=relaxed/simple; bh=hi/18U82wGIIZl2EYW42KIDZYw4mjolrxOlqRIgipOw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CQy+iJahSfdlkPDxygEVfwEZUuQaFWtERNjWLdYBfaqnAGngiSl2TesvWoqYGaFOCi9tUi3rMwOa/IwDALoiB+0CqefpRFuGFcHbKcO7XUuGtA0OwaWFdmmGmXnUccTMWsKEJldLwX26iXTOfqa39QxE8ROYMtlDYvAiXx15/c0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EF0dzby6; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EF0dzby6" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-31f2dd307d4so1474244a91.0 for ; Tue, 29 Jul 2025 15:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753829740; x=1754434540; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=FhtpXawluoN1TztYZndQOy+flGIHfIQx6Vy9IgjwFIs=; b=EF0dzby6ItDT0pCzra+AWpfFdrV7B0MxhNGjaMyLo/NOmpuKwtCSn7TdTQuHyckR3g mNhwvmGnviHOe3XJTL96D4mbO+c9Y8AxCLQ5JKFMMzUky4aYaU3iIn1GgVnnCeVDmBM9 W6ycl82WK3BBJNzBZa6ITrBg0nKVYdNt1XYInio+mHyDsv1c7/wamDEajvqzI7oUZiW6 WD5eX+SCWsJev9gIg5l1tdYXjFUvS++47nMDKH1l9pIXQ/oXZ5zRhvo14t2EI0mwOEGa RbiBrGPp8qCFP28a7z0BiJh11zeR9khdxvEYAvuFSp8+y/KSDJjL4wCM/NC2NRU2INHn P9Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753829740; x=1754434540; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FhtpXawluoN1TztYZndQOy+flGIHfIQx6Vy9IgjwFIs=; b=TKk/RJoI6xIj1suaGsiMyFnsKmOKvxXqq4O3680RW7EY378SKf/w426+oIIYlmQqW0 acyhJGmjkbL/us7rbcGLkeVAFVBloyP/NmZDJKDU3Fz+wiqZdGBR+t4+TQghfbEPRMld +yQyIuaG7b6Y5Dsqwaea6b0ZsZwYaHq6Zvh+z/XD5SwWjD7WogjmAVz5s3xLeKYZ91rs fxgUfh4RAZ/zE4H04hTSsfeuM8JlUcj7ZYWiPhMMDmMOB6BCdoBLGLucJ2bNaOjnw6KM hAD+warf340/+z5e78bRTiKQ2eeHg/7Gf4cr2mN8kj1Ag2RaX29UDDQ2ITGtwoB0PEEA hjVA== X-Forwarded-Encrypted: i=1; AJvYcCUDalIwmMYq9z/WFrmW1jn4/cIIn5SyevxZ5D+l4VgiBbESYe7XIHGOLxIQhB8xSOKriudYn5RMapKUFF4=@vger.kernel.org X-Gm-Message-State: AOJu0YxC8+lL/eb7D7TLRUqeVmpSm6PrB8EbGSGOMPhLPoY8tv3CbCAT t2XsZiUmuMnS2T5Zn36YOiIlEFUC98hLzsLGr72Guy3TEiECAoMy/mqMlZzLxI5bFs9pK5HpFxg vdgZn6g== X-Google-Smtp-Source: AGHT+IHVaYv0c9Xo7sfmO9HlXWVUgQ/03BKk+znZ6UuFoh4T2PuODk3nkbH2GWjiFHs5USAjAtpb3fE9ROQ= X-Received: from pjbtc16.prod.google.com ([2002:a17:90b:5410:b0:31f:335d:342d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:e7ca:b0:31f:150:e045 with SMTP id 98e67ed59e1d1-31f5de942f7mr1332792a91.32.1753829740086; Tue, 29 Jul 2025 15:55:40 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 29 Jul 2025 15:54:37 -0700 In-Reply-To: <20250729225455.670324-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250729225455.670324-1-seanjc@google.com> X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250729225455.670324-7-seanjc@google.com> Subject: [PATCH v17 06/24] KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Ira Weiny , Gavin Shan , Shivank Garg , Vlastimil Babka , Xiaoyao Li , David Hildenbrand , Fuad Tabba , Ackerley Tng , Tao Chan , James Houghton Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Fuad Tabba Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() to improve clarity and accurately reflect its purpose. The function kvm_slot_can_be_private() was previously used to check if a given kvm_memory_slot is backed by guest_memfd. However, its name implied that the memory in such a slot was exclusively "private". As guest_memfd support expands to include non-private memory (e.g., shared host mappings), it's important to remove this association. The new name, kvm_slot_has_gmem(), states that the slot is backed by guest_memfd without making assumptions about the memory's privacy attributes. Reviewed-by: Ira Weiny Reviewed-by: Gavin Shan Reviewed-by: Shivank Garg Reviewed-by: Vlastimil Babka Reviewed-by: Xiaoyao Li Co-developed-by: David Hildenbrand Signed-off-by: David Hildenbrand Signed-off-by: Fuad Tabba Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 4 ++-- arch/x86/kvm/svm/sev.c | 4 ++-- include/linux/kvm_host.h | 2 +- virt/kvm/guest_memfd.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 6e838cb6c9e1..fdc2824755ee 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3312,7 +3312,7 @@ static int __kvm_mmu_max_mapping_level(struct kvm *kv= m, int kvm_mmu_max_mapping_level(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn) { - bool is_private =3D kvm_slot_can_be_private(slot) && + bool is_private =3D kvm_slot_has_gmem(slot) && kvm_mem_is_private(kvm, gfn); =20 return __kvm_mmu_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM, is_priva= te); @@ -4551,7 +4551,7 @@ static int kvm_mmu_faultin_pfn_private(struct kvm_vcp= u *vcpu, { int max_order, r; =20 - if (!kvm_slot_can_be_private(fault->slot)) { + if (!kvm_slot_has_gmem(fault->slot)) { kvm_mmu_prepare_memory_fault_exit(vcpu, fault); return -EFAULT; } diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 2fbdebf79fbb..7744c210f947 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2365,7 +2365,7 @@ static int snp_launch_update(struct kvm *kvm, struct = kvm_sev_cmd *argp) mutex_lock(&kvm->slots_lock); =20 memslot =3D gfn_to_memslot(kvm, params.gfn_start); - if (!kvm_slot_can_be_private(memslot)) { + if (!kvm_slot_has_gmem(memslot)) { ret =3D -EINVAL; goto out; } @@ -4719,7 +4719,7 @@ void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_= t gpa, u64 error_code) } =20 slot =3D gfn_to_memslot(kvm, gfn); - if (!kvm_slot_can_be_private(slot)) { + if (!kvm_slot_has_gmem(slot)) { pr_warn_ratelimited("SEV: Unexpected RMP fault, non-private slot for GPA= 0x%llx\n", gpa); return; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ddfb6cfe20a6..4c5e0a898652 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -615,7 +615,7 @@ struct kvm_memory_slot { #endif }; =20 -static inline bool kvm_slot_can_be_private(const struct kvm_memory_slot *s= lot) +static inline bool kvm_slot_has_gmem(const struct kvm_memory_slot *slot) { return slot && (slot->flags & KVM_MEM_GUEST_MEMFD); } diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index b2b50560e80e..a99e11b8b77f 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -643,7 +643,7 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn= , void __user *src, long return -EINVAL; =20 slot =3D gfn_to_memslot(kvm, start_gfn); - if (!kvm_slot_can_be_private(slot)) + if (!kvm_slot_has_gmem(slot)) return -EINVAL; =20 file =3D kvm_gmem_get_file(slot); --=20 2.50.1.552.g942d659e1b-goog