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 0E5CCC83F1A for ; Thu, 17 Jul 2025 16:27:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51C836B00AE; Thu, 17 Jul 2025 12:27:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CC9D6B00B8; Thu, 17 Jul 2025 12:27:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 394856B00BA; Thu, 17 Jul 2025 12:27:41 -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 288EE6B00AE for ; Thu, 17 Jul 2025 12:27:41 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E8656129935 for ; Thu, 17 Jul 2025 16:27:40 +0000 (UTC) X-FDA: 83674287480.02.56A2E5A Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf16.hostedemail.com (Postfix) with ESMTP id 150A318000A for ; Thu, 17 Jul 2025 16:27:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gOAa2LvP; spf=pass (imf16.hostedemail.com: domain of 3eSR5aAUKCPAlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3eSR5aAUKCPAlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@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=1752769659; 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=C4FWofDuxo3LiAutlhmOSHe+Y0D/llAlEXKakE+6Iv4=; b=kPveHQSFVStllPR/iBgMzIxIUMmmQ0E8QMm20NmQNGUxHQRY56hJZT6lYqQrxwejovP+fg kMB1Eq5sMz2p0rkmS9BnvAHJYseHk/2/vlJlpPMWGsO84eASwoOt3mb0sxQ2q3CBuo9ni/ cynpxUkJ6zjllCfo7U6Q6IuboMSU67c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752769659; a=rsa-sha256; cv=none; b=DyPncS2pIkdGLfnU9337alUAF1vmgEqfyLoZQ3yVnlmd7Se6Wc8CeeopO768TLoU5fiDGM pN9X4Pi2sOQHzuz42eeXDmW1a5oQ6gWz9mumPtRxK3sY3mecQsSisdmsy0eFuQHIdGe5ca Xr6R8Omt21MvYvCyP/0w3KP2QNs14jk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gOAa2LvP; spf=pass (imf16.hostedemail.com: domain of 3eSR5aAUKCPAlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3eSR5aAUKCPAlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a4e9252ba0so690195f8f.0 for ; Thu, 17 Jul 2025 09:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752769658; x=1753374458; 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=C4FWofDuxo3LiAutlhmOSHe+Y0D/llAlEXKakE+6Iv4=; b=gOAa2LvPppgv1OSM5znnvI3alrIo2YAtkbN1C8ttz2Sw8Tu2a5VMBvmnMzsKucRXfE u1JQOAXWZtWn/NXTHhdxwulNT/d3BCZDXFTCj+H8oZgoFFF9JQ7bTPplOnqhojvfpEKL H+t0vDvBvlCMfehPjrw3SudA5m7tyFv0632x7VGcfQi/oLZMyJKgtzHsSeCsMJuJ/F5E 1yg+c/oQa8dBtTsbw+xpYYxXNK9+b0ZrYNEVW75RoSbM0u1YVXlXAOpnMcoXMShMM81j w+RCgaMKL+VgJUme+fipQh8KJbAoF5joSdDuWyYAFodO0E0GmfBcIEtPJSWuy4WuPHIc /DPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752769658; x=1753374458; 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=C4FWofDuxo3LiAutlhmOSHe+Y0D/llAlEXKakE+6Iv4=; b=GgdQzdptce9/nWFF+QQTtqRGYdWFph3ak3ilnUMT3izZ1f+Zf/LsCfYWxXh0nBgia2 1eiSs0uOCoQd/gEvY+bdTeegnZJ9Xvwfzg/wJugAwnMWNKLjkdijWgq4REuE9F0FO+VK rV3rpdmF922Esttikc+Z4q/cHaWzUO+cV6xJVsfGiccY7PZB4NK+VbKsS2dN89a7hlq5 NzJixD10vni/Z1RZ5NzTZ5NZnV4T7a04rzPNr54He2awSStQIt6HbIOq6a0iAqwYwRyh P8VQM6IYKhHo+j7UCnhQjOcx3UuEDjBeBl9+yNexm/pKZNN5r5kQC4ZTjs7at0HrxDO4 oyvw== X-Forwarded-Encrypted: i=1; AJvYcCV3HIXVomRzHBKlj06gAfV9cTnkLeNyBLCSrxmTajoZqY5+1CUO0zNfXUt/e4a/Bmexmg6/C2ZMuQ==@kvack.org X-Gm-Message-State: AOJu0Yz86JXW4bUpy2JXcuRCEzB39otFYf8LGRUKU370POeXtiZnedpz /kHxHQWzEBGQirtgzZHg06Kwn9FvwF+nEVxCXkG6FbTOHkDD+m84G3zhZw0g37lHBneIYttiTbX L2g== X-Google-Smtp-Source: AGHT+IHaz+yroPg0NKMwZMkX/KC2XWpH90jKrNk29OTREzYSqrwLXlyKc1zvsU986x2v63y7WEDy/ENfdA== X-Received: from wrmr13.prod.google.com ([2002:adf:e68d:0:b0:3a4:e608:d34b]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2903:b0:3a4:e75f:53f5 with SMTP id ffacd0b85a97d-3b60e50fe57mr5344519f8f.35.1752769657583; Thu, 17 Jul 2025 09:27:37 -0700 (PDT) Date: Thu, 17 Jul 2025 17:27:15 +0100 In-Reply-To: <20250717162731.446579-1-tabba@google.com> Mime-Version: 1.0 References: <20250717162731.446579-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250717162731.446579-6-tabba@google.com> Subject: [PATCH v15 05/21] KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_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: rspam03 X-Rspamd-Queue-Id: 150A318000A X-Stat-Signature: kmj58td6xrbiwqix4y31xj4i3sbody3r X-Rspam-User: X-HE-Tag: 1752769658-366266 X-HE-Meta: U2FsdGVkX188Ag0p0xpxzFSyubdnShg1sK9FJ9tup5C4TippgCjHb75qst/EYy6OjVpyRXeYKLP42Llhg1VC24bzhut5Lu51K6cJkjw5Y5TINj/2U2u5PKgHUKiUtFBde7RpLvoRZnN4j8RpdXmCzfCBBIj+DF/vtkCgNj0Da3uJGIcPCSDnDmpRzTu3Mzg4h2rbQUVmUYOwnlQYCY8UVlDCPLgKT30xRiLRx1t4F/js4Q74JVZAVQWih2+oi3Ti9K3JTk+uxoJpmgGQCDL7EaulYTPn8jQB/pmNaJdELFjueB0Uy7RwFfpINNIL8aikHZ3WZQyhQAhlUDdBhLgP6wlYI5a3B2wD8bZwGJsxm8riNnIeBkXD3tsqhScylIJMrVc9+TsK1vh0GKWcrJ62q2KciqVBzMVytOkZ0g9frGi1JX3ZOjsNbJEHUC4TK5NHLOXXsTRQSMuKQLvu5pGZ1SgtZJVGoy72d96kbOFCYfT+gaAxBL/Uh2GN/Vl+qqnlgu78Pd0PspEmGZAV54en/5vJmlSFwmdJwJtDFyrPq2pXY/fFFLgQAH3NRtyT8kGbqQm6CBgUnfpAIkIYftJcB6iCQSkivTxumppIRmdQHbA+1/LOtCCPt9rI716U3vUTOqtz/bY2Qapb4fYERv963eBBAuuUfgnlRLJnPgdx7smzvB4Gi3Etoaapw1lfRovM1DFIBCh0vlGMb/nk985NiXzpwMOAyiOc2iNhW52YwGXdyAUgm7zTQT+2zThnaY39ee83f9PXvZe/VadroDt7aN0pmJr8PHydZeqJxkLykRtzU4EUWG0qzSglGdu8IZJ8SfNxIXX7hlmGuap++yEnDrjJpJkHss3jJ2UjDPvYPOZQMnrOjb5Jbc2qwvIBOUq/JMhTsM2/VNEBITkVV+M73tJEMJVMm2z7A/sYZ6Q1jfQHTpaYhjjlmYRgSIckxYapqL3RKm8Dmus35HXGrj1 AgM+7x+u vl6YmGRRAr0QDIUrPm0djl0d/aWAaxNwzQdbQON/Mw8kIy+oTy2UXfEtJ/FrOvHTfiMPoUzQUHSVprEklzMg2v6+zm22E8ANnDSDSdRj0qvah5FqO9GuctCfTSLriBDMcpQZ7KVKtZLz8K0CGnFTbq5Xvx13QtU/pFDQ1UwcEUUx0CMVumuR8q6Um0NulAqg6o82MMFxQ5Kp52vpks2jFB5e+ImMvPHheS14D4Lv7al2dJLN0f30tHlTd3nKfa9ylTOVAfrwWdjsrIGO+pcqbrpVogIbxNb7fk9scOk1i9X7EcK8mfmkeDUIrDIv7Y1ijO8s0DJfd3kIWhzmaQHupfz8P6OvWdOtLVXfDciaeAqi+vKavAy9Fu+8eiGusKgnuVAyiGVyxoe3BPTWtrVETSFUjGhLgIE57qdgkKcBwK9gjzstH+lMiRaPky7JG4Sdzxz9ewfSafJaLN4whEgRhe9bvY81tKNXBgEEYJfXuRIjeYDiwcOKy7ffsJBq4uNVraIUTmg9QIhVS9DKdFpBF+w+21lKe1ZRNA/Xp++Vh95+QG0ZgJJipTtkqVCvupoddF6h9wlpKPJLGhMZQsWzE1wDoGDj4J+sETprsBja27hS/9nqqKY9+pwZIJh0YwquNpAmE3l8DScakklV2ywkrwpAQxlEAW4o/dm47GQUInSHf5rWaIn6/pgy//5P6W0itZHq+Dbv30Dtovexqww31fCvp+g== 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: 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 --- 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 4e06e2e89a8f..213904daf1e5 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3285,7 +3285,7 @@ static int __kvm_mmu_max_mapping_level(struct kvm *kvm, int kvm_mmu_max_mapping_level(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn) { - bool is_private = kvm_slot_can_be_private(slot) && + bool is_private = kvm_slot_has_gmem(slot) && kvm_mem_is_private(kvm, gfn); return __kvm_mmu_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM, is_private); @@ -4498,7 +4498,7 @@ static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, { int max_order, r; - 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 b201f77fcd49..687392c5bf5d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2323,7 +2323,7 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) mutex_lock(&kvm->slots_lock); memslot = gfn_to_memslot(kvm, params.gfn_start); - if (!kvm_slot_can_be_private(memslot)) { + if (!kvm_slot_has_gmem(memslot)) { ret = -EINVAL; goto out; } @@ -4678,7 +4678,7 @@ void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) } slot = 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 ab1bde048034..ed00c2b40e4b 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -614,7 +614,7 @@ struct kvm_memory_slot { #endif }; -static inline bool kvm_slot_can_be_private(const struct kvm_memory_slot *slot) +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 befea51bbc75..6db515833f61 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -654,7 +654,7 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long return -EINVAL; slot = gfn_to_memslot(kvm, start_gfn); - if (!kvm_slot_can_be_private(slot)) + if (!kvm_slot_has_gmem(slot)) return -EINVAL; file = kvm_gmem_get_file(slot); -- 2.50.0.727.gbf7dc18ff4-goog