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 20859C54ED1 for ; Tue, 27 May 2025 18:03:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C23D6B0095; Tue, 27 May 2025 14:03:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 071FD6B0096; Tue, 27 May 2025 14:03:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2DDE6B0098; Tue, 27 May 2025 14:02:59 -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 C20766B0095 for ; Tue, 27 May 2025 14:02:59 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6B3B981305 for ; Tue, 27 May 2025 18:02:59 +0000 (UTC) X-FDA: 83489458878.27.57ACCF9 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf06.hostedemail.com (Postfix) with ESMTP id BF130180010 for ; Tue, 27 May 2025 18:02:57 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kFRuPqLi; spf=pass (imf06.hostedemail.com: domain of 3UP41aAUKCG0eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3UP41aAUKCG0eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@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=1748368977; 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=lLl1bAhu1edqB0aL6MbIfxoXUqqHcE7E+0hknC1ZGy0=; b=GEQuOCp63sWjnnyS4nOOdyEUwfWIc3cvNnPkzJF7WPX1EWT8Hk52Cx+s7XzEDSk7AbJpxS SsfdmChC+6AqP+wwLZG89bjwIwsDoH+BN65k80oLnePJuycxT8nx4ElEAw7FGy2MyVSRU9 RtNZ5BUvUmrlEn/JvwDwuHVA7yKhWl4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kFRuPqLi; spf=pass (imf06.hostedemail.com: domain of 3UP41aAUKCG0eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3UP41aAUKCG0eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368977; a=rsa-sha256; cv=none; b=QPDFoExl0XBIKVXZ8K/IJ4IWkmRR0GRFmf49kSrfgVxECW9WPDGF4EeIp8WM+a0wfc2IXC fDSw3Y2oZkQxuq+mVHvhjMHVfEUuDClcDTdKM3ER/n7OPBBMc3zj54zOVuoaPx43mcO6Fn a+2GuCuhFuchIZu58tTpxIoD0F6Dkic= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43efa869b19so23561605e9.2 for ; Tue, 27 May 2025 11:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368976; x=1748973776; 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=lLl1bAhu1edqB0aL6MbIfxoXUqqHcE7E+0hknC1ZGy0=; b=kFRuPqLiuOcbdjikfzqNtVnBv//nTQsoayhLqgcfBeBKWa2DNTZP/2vA6FQn6XOWft Hv8yFlw5+j2YuXCMln0NS1Y4MrQO3gBqNYk1Y0G+Ev7b2gMu8er0G4C02Mv3u5fSBTog qMLp8dX2IJXYbdBHjYJ6JYwqOpGwpLb9brYbkbIgauetb6CScQcyB9zCbCRTunGkmqmg dF0MxsUIWwjN5fO2Tl1ki7WUMsi8OzdrG/8n99JfFkXoUdTepMJ4PRK8BG3VfY6FHKdE zlwzEFAHCumFCOSLvdHEKYyc/RmEHrWVX1evuIKBqaMhESuiGxbrkT7sTGVd6yp6101g bm2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368976; x=1748973776; 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=lLl1bAhu1edqB0aL6MbIfxoXUqqHcE7E+0hknC1ZGy0=; b=i/90HPL9lt//wVZqSM/qBl/6a+lhC5m7jxoItaKeJzCpfz/Hoe5GXVIGthKloFkfD0 MM55zBcJBEhBbfaY+WW4adIRjODoLYfsRc9dNmOK7q+WvMlhZHTkWsEskw3EWSqUGe+/ eLg4EwEi07WCCDym1JFzk4BG1TB0b0pIEcNlj32EwhKCDEIUkLvf+toPWDF8n+R2NyQY p1NL6KSx61n5RdlHpuUJGIV6bGDGQ2xVARPSKJp76JcjoRLXXutMITAn3dGNLjQVDlVH Y2etmjgyexognMy6zBihAEMiR2TV+X5jKU9dqrbejptxoM/CEhG/MO7QK/hlnQlCweAk BXiQ== X-Forwarded-Encrypted: i=1; AJvYcCUFA7vyGOs8MxG48e9GbhwRYshn7sP8qvpjQ/wPhk8D4uI35ORic7MLsYyXfPjJLRoiFPvGuWucqg==@kvack.org X-Gm-Message-State: AOJu0YyLsjL1ES0rG3vmEy32uv1quSOn6FNtJzi5llWG/st+Egjt+SEm hpDy5LS7jXQvHzjLE/A7GDmcNVldI3MEBaPmFRAWBVcYdWB5iQsvmKhg3FvjTlwbJBGZwiHa3V3 FoA== X-Google-Smtp-Source: AGHT+IF2T9kruthHanldNzTC5lsPTPvkZrQxx1LfteCYkDfwCMzrLxFPW7sjZDnseKL7faWqPowpJMeTcg== X-Received: from wmbec10.prod.google.com ([2002:a05:600c:610a:b0:442:fa58:cd7d]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3f09:b0:442:cd03:3e2 with SMTP id 5b1f17b1804b1-44c93da7f1amr146003305e9.2.1748368976248; Tue, 27 May 2025 11:02:56 -0700 (PDT) Date: Tue, 27 May 2025 19:02:34 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-6-tabba@google.com> Subject: [PATCH v10 05/16] 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 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: rspam12 X-Rspamd-Queue-Id: BF130180010 X-Stat-Signature: ozji8a9swrke6yk1r8mbkds3mmzc9fhp X-Rspam-User: X-HE-Tag: 1748368977-756846 X-HE-Meta: U2FsdGVkX1+n70Lz7gqKvSX9/QIlaYd6RH0Tckr5xNzavE/JFsWFdzobaBmqYNdXV7TiFsvKg0Ec+Ars+U+cA12Q4frVrb+rxHIZX7KK+ZQzg7ChnQse0Ktfz7SLCoG3/q/JHZfQkloa1AYHboZNHAeqc8JddsZ+hvyTBbercaS1DI/0I23O36+XT2A7FRZgku84LiLzucLeToJh9xESKUbK/NOSdqztPQ9IYBomrrlonveTT8+lsDrGMOoAOa0a+NGqH5jMCSHJlweF8cNvDxB/SPRMdNMPeCyiTpq+0ZxJDAHTRYUZPBA/QVQ4G6TpPaKigGB6ShqqD198+SS7LJyIQhlKZ2zCFYHyKcw7WSwaxdAi1mVlrJfE9Oh7krXjSEVvtBUkLfF1NTLqom38PpdSg5Xz+mtQxeBsOCut6gY0l8aENv/pBShesRDrNiZ8Thd6Spwk6d17hBfPCIZlxsPZQTB6oC0Clulqo/A7DsxeBtWKqrHVCDDtI7acfqDkAVeQWcQQsf2I0DkEi2c3VyrAAJxcUdtSyzvt7aXbQxJKt9GxeDJ7fk+fJ1AKIvk2V81RSMY23voNrDFcfuOdyhf/PTI5sjUhXZuWqi/zcONd7uSG8EN0Yb+CDhYpnTER1fxCPHLNeu9g8e6DvJf4rRy3bxlqliQDvvClwxtaCRpuRLFmQa8qKqeLmGB4VV+a+UemAXV0tildauhiLd1WSYcDG9Y+lnF0g6xXFLSTvalqAdguM4Yj37N581v1mja/2zxkRJfhbXuum34NDSWl8p4BBsMqAQRlOvWdS4MKtbhmwjB3vXpWFTa7jmfm8lYfXcbqhau50ofzNz0FBq2tcLRJypcBaS3aWeqdsO9cq5q2OIYnzxGs3xiebPmkGnzhECPM+iVAssNY1qOTD+5OvnzdMBFHDZo8ExfgNIYRjASOlfuNxzjXuksECMhYwA1kYbZkZtW2Ng1yr4vF9Fg J8Jq7USd cgKe70TDB/DtcaqbcU3cQQg1cNeIiTW6jmjg8w1hL91W4hAN6/6HBo/l0yWl61W/H+2kMWeSLKMLF46XjffeyqkEfz6HXJC1FL7rrATCdrxOp9MJMTjGDggf+pvEh/E65+jf3EmtrsG8MzBAIxUlackWNSkRQH+TmxYKazXTnppJBCKlHHcQcXR6zKw/vUFgV+F/DI3bG74q2Sl689107PXCoVrRdFyYC57WYsBMu9AbqvwmglPQeyiW9+GAX6bGhTMaJPFS9yxEm5McDsE66ZMyR78/OhSyzuLaQCs2eb4cN02qVAagW7RByLCq0mPAjzYni0TafMU/ZdUgD0MX37jyukeI4MI2dyQRYsSsVYiGYRt0= 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: Gavin Shan Reviewed-by: Ira Weiny 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.1164.gab81da1b16-goog