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 E3F9AC677C4 for ; Wed, 11 Jun 2025 13:33:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE3336B009C; Wed, 11 Jun 2025 09:33:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C69816B009D; Wed, 11 Jun 2025 09:33:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2FC86B009E; Wed, 11 Jun 2025 09:33:45 -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 91D036B009C for ; Wed, 11 Jun 2025 09:33:45 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 478F8140CF8 for ; Wed, 11 Jun 2025 13:33:45 +0000 (UTC) X-FDA: 83543212410.05.CD74C82 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf05.hostedemail.com (Postfix) with ESMTP id 931D9100019 for ; Wed, 11 Jun 2025 13:33:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=GaADRxD8; spf=pass (imf05.hostedemail.com: domain of 3toVJaAUKCDEgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3toVJaAUKCDEgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@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=1749648823; 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=fHa8ecXiFjILMVX7ljzeBm36pfeRCdeP+Tg7zuffq3M=; b=jljciLLZEb1/XUqr/bkl7vOtXcqHRlCAwoMg9H/DSPr0cqStzdTZfYOrh2xhem5mq1SZK5 LP6A5eJPlDBficdnttCzaG0h+HxqXysvkT28klMA1TuqLnoRrN6CCNTrqWh1KDsLffpKAr LsMrjfZBXhUXkQbeFUplS4fu+tYKN1E= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=GaADRxD8; spf=pass (imf05.hostedemail.com: domain of 3toVJaAUKCDEgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3toVJaAUKCDEgNOONTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648823; a=rsa-sha256; cv=none; b=HrDXTdp7+94MDndUHIqlce7lW6x9S6JfVztMHlM8xkhyDkRNqjAA2QbJXOwVT+QaLy9rSH fDFNjHiR4Y73oLn0uJfbcmNXhp5QsAY+s2U5TyH/LZNI/+p/IlDVB+f7XgksPxF6C/kFeV /GwiYfpxjcROe5EUGBSiJpZXbFhFuc0= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4532514dee8so7445035e9.0 for ; Wed, 11 Jun 2025 06:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648822; x=1750253622; 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=fHa8ecXiFjILMVX7ljzeBm36pfeRCdeP+Tg7zuffq3M=; b=GaADRxD8Ca6EVy5C+L6g0M0JBfB+wVRqLZMxF1w2oe0vulMwbn9L7P2T+8bT7caeYA u34ZoRL0ObgVT1lb6u2gf0yjB7I5G8VTjTlCNzbJdzcUgtmYXjZh/BFSJI2jcJr0/+yW D/YwPjmhxKMH7aF0rMqJwIN2/yKOA0ylVsffS9aCsKX+Kaudp8MavTjH5FDxmSw9Ik40 PYCv50FuTqKFfCP/en0wBABJYDMv6/F0zhBanL63tWGPpP0xS1GU6TqTFSZvfnxLxO8x DwtTg8zFHP87hLsWppfy/2owaXHH2V31iETYFRrwIu8s/njt27G/juUo7iXXN8u0GqvW rVkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648822; x=1750253622; 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=fHa8ecXiFjILMVX7ljzeBm36pfeRCdeP+Tg7zuffq3M=; b=D0lpfe6LCTRaLzi13s4b9aslqYlQwe5NfwrPxSmBQVdCM60RBPHhudNnjaYOKY3ZBX UFwzo5gSxbdIT3a3QkyZmYaUOvWFk7p/WWY9OVgZjOX1elLekRJlSi8MdenlsPoOLGDd dqrws2e7mSdR2LIAKsrekGl/BKXFlNJP31cNo+8ASmsP+Teucgr6kzRx2QlnzRmX+fqg qa2Ku88VVIU1CCva42i5OiTg4vhDT/qI+gVk4wHm5uIl8j80krUdyiC+sfMrpVwA99lX ZUiMT7LDzL9UqkgozM9x5+YK7zqxo3XFpIpvoysQ3Ixfl13oWbK035IXCzSCMxUufvey vJAA== X-Forwarded-Encrypted: i=1; AJvYcCVP22B0+/5sC7kEI7hvRNVGA0OePdOZLK2NdTGlzsDUi2POq2LLf/uZTIVQ4lYhb10NplztL09XGg==@kvack.org X-Gm-Message-State: AOJu0YxXfLXZN+NSt5EoG1IGQXkl/DPwKrfHdnFuGP+5vZMH0yGQB55l S/eVbjljLOXV5tqnEgguPJkGtZqxQXRkxWz8wSzGAk02UYIPAazivMoHUXKP9lYAQzZiLnBcDbh K2A== X-Google-Smtp-Source: AGHT+IFWFQPWCUEP2H/3glpy9tz6msJlvW+obnyNE3/UG7wTeYJGX28sYe2VOsbPe4n9KYugqPuHFDfSAA== X-Received: from wmqe17.prod.google.com ([2002:a05:600c:4e51:b0:450:d104:29f8]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c08e:b0:453:a95:f07d with SMTP id 5b1f17b1804b1-4532487b287mr27952385e9.10.1749648822211; Wed, 11 Jun 2025 06:33:42 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:17 +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-6-tabba@google.com> Subject: [PATCH v12 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-Queue-Id: 931D9100019 X-Rspamd-Server: rspam03 X-Rspam-User: X-Stat-Signature: xbwyx9gr1muizwigcbz3xekorsb7y91m X-HE-Tag: 1749648823-682605 X-HE-Meta: U2FsdGVkX1/EGTEHXak6+d67GO5EIjkhvxMeYuoNOlAkZsUTMdPSgHmiZiHZygePuzra2KxRwQKUgCaVJlPtXestGp9eP6yoZHAUUlBzRVVLQGQQy/sw4AbBOamQzZ1CD8JIgygf6NOK9OnO6Y1Ua6qK8re/ktD8EbVHtovyNQ+uqUxM/bAtPHpZDkBCb9dK/2iT2inBFR3qHh6Sui2mOmnHgJslmhYm96oSjqlI91b5RVXL6Bv2SQZgiHYfOiYSR2hcoTFoWs9vXApylnuDiSyT86bEmVzZrkYhtb4yJpjrwnlatgf80ppCT0Ml6juaheIiO+sDw4ccRkLBuiyACJjL6eLK7ZW4GG9efZwC1ltPHLRbFZMQmAYwdhIViYrLL0A/eM3J5uez93F1xteZG9RiR9uBPQrgjiQVwVsU0UmKdXo9ti0Qe6KB08yI5+HZbLMZ5MmyW19eMJiitepSLJd5jhkSpoePW87PrZgFSMMvWTJ4jzMWQkwYUMIgZHFe5X+T+sH/d/KoTWBsgiLctx+32ne/FTtGFaww+VZKGDNeZFju5XC41RHJwJGLs0jalLbW4XI1NvNkCxBVjexd1ntz98OJDCz7cK4dngPn8JMaxEry8YM0i4Wl+8fVvSOVEejDi6zqbm9yFt5t7IIPV+SUYpEsSOsW9qwbqWSMUPXnRxrKdujs512XyK19k8ceDU2pSTczX156UeOabXSJSBxXPHwS+oIhZxIN8Ao+kjM0suk5pKOIJ2iWTdSoWq3L4HRP0ldozuX2THU7agnC5jcjlIyAKxODzd4RVof1eC/ufvQEoYNz8n2GO1BLlC2R9gH4q+YGePmNEM0SSiM83715BclOS/aKt+/5yqlt640bdukj8DGRTARdf1krOZGHwj8tA5U6tlVMfohUHUAfnCnoPmrw3G+3a2m4Q3bNv8EINrDVLD2TqE3jRoi2MFmDx4oUb6WHhdOz1YXHv1J M02mut3q ungCEhkTGVV07TcYAiAGAPougVXYfGP7HcSY0FtTforwje1hBV0xKlXprfPyD0EH2hJ5jKkWqVr37TtZiNtbgEVeJk3Pw1ZZS+6tWpjZ1lTAwruP0SgpXhKjteVdbFeqQf532qAoCmXTBAbqe9E5HETzZCwj2iRLxGB/a5jQViKlW/cMLq9gnSx+wdwa6YddxYESYxZyjeupN+PmnoPgIuSz6s3kv9tbIBvMyk0pk+/UOaazD/+wTy5pQ1w0pVoSq0nswEujwzozL53gzviNe3mY2RZwAPyI6hlxka4M902G0V+6Qi6KCCiz+LmckxdePltmw12SOOdOPqdFV3GDA0iV2MKU95jBWAm37xNavQ5PsiYc= 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 c4e10797610c..75b7b02cfcb7 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 5a69b657dae9..ed85634eb2bd 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2319,7 +2319,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; } @@ -4644,7 +4644,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 a0e661aa3f8a..76b85099da99 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.rc0.642.g800a2b2222-goog