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 400E8C5B543 for ; Thu, 5 Jun 2025 15:38:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3D396B02E1; Thu, 5 Jun 2025 11:38:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EEDF86B02E3; Thu, 5 Jun 2025 11:38:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDC6A6B02E5; Thu, 5 Jun 2025 11:38:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B6E916B02E1 for ; Thu, 5 Jun 2025 11:38:16 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3BC1E160D37 for ; Thu, 5 Jun 2025 15:38:16 +0000 (UTC) X-FDA: 83521753392.02.A2E7050 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf23.hostedemail.com (Postfix) with ESMTP id 6385914000C for ; Thu, 5 Jun 2025 15:38:14 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="sCV5qpA/"; spf=pass (imf23.hostedemail.com: domain of 35LlBaAUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=35LlBaAUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@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=1749137894; 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=qe3sWK5q5nK1m5jGk9UWStlvXP6F2F3f83ETUbM9FxM=; b=N/Rfk31oyQLLp3WkAd6YRylbG65CK/ZkFBSCPXuSXNuQm0DCrpQCt0nsIER0MzsWYsOa+a 6KmnRIuuNrS7AVD1fBN9rARGwfLVAzVanchASseqWYoAiA4x/lFJ0u+mq4Pr8UdCcbMgHL K/VPpufGxFaT7J0NR16FiUQF9KSnEPE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="sCV5qpA/"; spf=pass (imf23.hostedemail.com: domain of 35LlBaAUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=35LlBaAUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749137894; a=rsa-sha256; cv=none; b=xHJ8WMxkqncQVDCeuqJS6/1V+hF3PajWmvzbRfL5k5Hd31g+4kjqBgvvxRRbyHFRqKr+iu c10kbinnVJDuvlEzApLNquYSbDkM1qHvhBwLuqpimchVOQ+mHEQb1qGH4TPf5b3D4v68UP egbSYl2ZhBilHrw7S2Kd+l/ZPQt54/0= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a4f8192e2cso632772f8f.3 for ; Thu, 05 Jun 2025 08:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749137893; x=1749742693; 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=qe3sWK5q5nK1m5jGk9UWStlvXP6F2F3f83ETUbM9FxM=; b=sCV5qpA/EaEBLZOx+cwkw31mSaaNI9j86Nh/xYcZzZDx/0fuNr2MLlZuY544Y55JeT io0grBUczI/aCi6tjqs0ruw33UXNP06D9deS90mR3oh2sxwpnbahLpkFoWbx7DcCfMgS GUyb2AYYC1xT+/ugo4H3xoa9O9c0su+o2BJLiuC3UczG1gNUO//VxiBRF40Fd3/UEP36 0RFoWjEmv0RQyJ7Cuo7WB9rsLt07XFE9XCgpg8ouTi/1ebrneafTuuzqeywpt7uJ8hL+ HN8Wjid3x7AtP1CEMORuR2BXRj61cWTbSPla+hHbTKIvOkJ7h4ScToxYWO31AmHiDHqb GZRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749137893; x=1749742693; 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=qe3sWK5q5nK1m5jGk9UWStlvXP6F2F3f83ETUbM9FxM=; b=FiY/DUOwCLU2dsWMh23cx/CEm3xv0sEL9aFk6e/xqrizyAG2w1fhBTWBJeuv8hRqzC z9NjLOpzqodVIBowlelN0e3xjWXH6adcK8DugMsoNHTmJ2vpiwAK19Zytdkj9jHWVHg2 mwybhauTwAby6vT+nGd3UdQlUYgZUZjiDkjVL0t0+Ne3OFwRPn1I8htMwy86a7l37vP/ TwWhlIMwJkGOnEUg9JUGZzcgwBqz80cD9rkx9kk/2flZWNkPRUuTXSkPqCBauUKabegm Ahdw3hKj1/BK9+UXGTZQo6qaU8ef/WVf2babUH8qMxrgAo64N/PwxGyjZcvENNtt2b0r RMwQ== X-Forwarded-Encrypted: i=1; AJvYcCXWBMGZHjxt7SQUqMMiJHdEZQ4AgR6+k6fd87XYlL+1LfLycyeg7kvBXLD+FbdsZmWZMWYgG59/NA==@kvack.org X-Gm-Message-State: AOJu0Yx/3szAYztQGGGp/w7Gj6uMmSH2jcB8tXe52bsYz6nXaWU0zRhs HNzBRXFjc7wGQG8Bmmj543adCsIRlGkdLEXQnkJXW3GKIFpwnPv8RuU+huwUcwuWR39DrXKCusV n1w== X-Google-Smtp-Source: AGHT+IFmcdwhn2LMYNxP+uGrHHW9kSBs4n3ZI9kvbXxMD+ySlDN/PQ/FygdrWVTr0+hjocoxBaJLadObcg== X-Received: from wmsr2.prod.google.com ([2002:a05:600c:8b02:b0:450:d401:f555]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:588a:0:b0:3a4:d5e8:e352 with SMTP id ffacd0b85a97d-3a51d924837mr6940909f8f.7.1749137892942; Thu, 05 Jun 2025 08:38:12 -0700 (PDT) Date: Thu, 5 Jun 2025 16:37:47 +0100 In-Reply-To: <20250605153800.557144-1-tabba@google.com> Mime-Version: 1.0 References: <20250605153800.557144-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1266.g31b7d2e469-goog Message-ID: <20250605153800.557144-6-tabba@google.com> Subject: [PATCH v11 05/18] 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: rspam01 X-Rspamd-Queue-Id: 6385914000C X-Stat-Signature: msg8jx574hf3xj8dttpduo5w54cpp6da X-Rspam-User: X-HE-Tag: 1749137894-136699 X-HE-Meta: U2FsdGVkX1+LtkYcgXy06pGmhajdlD8gOJqmKHyeRps2C//aC3EKHI1j7qHg56OOyMKx6n3lweaLPeSUr4t5sYFVezV4Qi2P4Sip6PaXav6ppGIzaxxmgDdeXGzvjqNFseJegr0Kg/J8uBYAaRrjgpvMqUf10XHjCwoojkIzJRxFZ3tBaYl4bhP6kTRtgyB0FFYgUNW3ZjbHcOnPDWKzdJdbApyMsED9S8PaBOfFkLk08E7u5w6SUpqpsjB39W+Nfm8V8s75LRb9upOX6MocdHp6YrEM1XE8jw12ZggmkXR1ff0QjwGZ60u0Mfr74DYuDjzgKIUYbFML/hbOBNkkbjN66VeWEnwbegZAYxPJ0nL7UmmSmtODd9VUEhdSDHme8HXC/bAnwQSexexKQRGSG/CZc7funYA0pf5teyiyX21E3wB+wjYvXoDmAWNqRrvTyCtilzh9F3CWZnrx/AbMz1+ynI0p0SleuGRZIZlGfwxFtDAV7fjpALid0SliN2yCgPwI7T41efcZ7RSCs+VfaykgqqaU8iu/LXBVX11hx5UeuY5Dn3JI/Cv3b43QFskZEiPJ9ZprKoXWo065PhlttEFwbuqIWO/64tp+pwfkgQv4AtbgZ+i0IqxpbJUpIt6d0IODGV77JWgZ1Yr0trHe0UNVWRLngtay6LlsyzXVYbnZIzdGDJltna8dsNPMNmiCeyYCO2clOHKS67qFR6BH/YjxP4u5MYxVWZdL8/hjrmJCynuq25yOtVhlHfzIh5rWvaZhxTKiUmWHGcu1oEGxPy28ZUSyQXREckBtc+SPhg+NzSff9EHwWHP3zhmYQJZtkvi815oZr0Qb4outP8BgaOc7ZgMtnZJWIUKQqqPjpers1MvVAvNgLs/yqDFfYagNrcyVBZp/4yG6T26pf1rLn6Y8FxVVmQWaZqC+ydk2BP6CtxMrEw4mxSqVwsJM7c1YFeBTxbXgxq4B565ctik lRCSAC9R v2motRXRW4+tTg/Pu0wuoJi1UllOkMr+qUcu9bTWdSgsvzoRlTrN1zz5033O2dCczTVuZhGn+HnO8E5PcNM3M3WD+U/VKf8G6b4tW4qE3JwB77XKI/mYNejqoFnyaHY3XnK4ePa5/mmL2sREJ7PBY72DF0Mzb38UhIYdXJXrY0QGBfexVkh3h/OiO7uxjHHR7uhNpk4DTwseZXvlMvwQ+u1a911J0/Cfe2wPkA67cD1adzSjT/L//UZQMR8E2JIeq+cdYVEmJFHjcYj+Z3IYQjocr3PywLs4zVaCQsrMSP6QcVUWdocEc3UcuHMU1jfvHyGaeoPMSlYRMDQpA7rK+ILczwWr/OiYW1hFBL9TFbJBZj4x7wc4wZa/Bw1C0rpppCpIJuLhxLZwhUtW8oLzLnUKNUiQHeoRM9s5hPYTWxYk7jGbtG49pSyqvmCbdqoVVzSPlclyZFUeEQAADFnbx100jBWE0cH3/HtnebfFIpx7rPzth412mPqcW897dwkltpw3VrhDGdJfr69aGbDxWIbFX+sIdWI32JIJkFMOln+X4yyB4Uh9Wawg82vT5VXZNdFa8Ncv48kJe7FJy4HX+VmzlhlYCUPzEVP0bfLUgt/lCdBVXR+yI+DYjHjvA8OTi5n8/6fvf5auu5nynotAWdOd/WEACbFJsPwWO+w/l6vpO+GUGqC03UWobC7flKfeFpJ2rJpXBSxASNpnHCfNtf7FHNg== 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_slot_can_be_private() is used to check whether a memory slot is backed by guest_memfd. Rename it to kvm_slot_has_gmem() to make that clearer and to decouple memory being private from guest_memfd. 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/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 69bf2ef22ed0..2b6376986f96 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3283,7 +3283,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); @@ -4496,7 +4496,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 a7a7dc507336..27759ca6d2f2 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2378,7 +2378,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; } @@ -4688,7 +4688,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 6ca7279520cf..d9616ee6acc7 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.49.0.1266.g31b7d2e469-goog