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 695C2C3ABCC for ; Tue, 13 May 2025 16:34:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A8B36B00D7; Tue, 13 May 2025 12:34:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 80AA36B00D8; Tue, 13 May 2025 12:34:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 685696B00D9; Tue, 13 May 2025 12:34:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 42BB76B00D7 for ; Tue, 13 May 2025 12:34:53 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9CE97C118F for ; Tue, 13 May 2025 16:34:54 +0000 (UTC) X-FDA: 83438433708.02.A977B41 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf08.hostedemail.com (Postfix) with ESMTP id BA18616000A for ; Tue, 13 May 2025 16:34:52 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=a6hqi93P; spf=pass (imf08.hostedemail.com: domain of 3q3QjaAUKCGobIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3q3QjaAUKCGobIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@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=1747154092; 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=z4Y6TGsiTr3tqPWwwMchy8j/vXKPtI/QJFPjXad1Sp8=; b=4QhSKyI2u8FyMB2JePw5iXy9RXaAgbxXJHUoGIXfqSa0gxn4z6bhpFUygXtUArTrc0jb8+ /wPeHkrE66597XksmV2tf6hhx+pEIa2obsknsKWk198J/Disp1c2bKbiVPNhGA7YNyfjFW x9Kq7A4eJwoyU0CsN/4cXFkfEh/vHv0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=a6hqi93P; spf=pass (imf08.hostedemail.com: domain of 3q3QjaAUKCGobIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3q3QjaAUKCGobIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154092; a=rsa-sha256; cv=none; b=hgiJcTD7z+JX4+DKBe4NhNwBOMat572iH3ujeGkD3uQHEdiP1wWZcu/0Lv56vdYztg0v+I PDWjf4MmIEfzdWvqXNWVpTEBFfEmZtiZiXOsTyqldo1XeBbcMAPWmt1WlymRIcHwoSmjgb s1p25ewgekfpy/SFnHRUHqhvWbPgi7I= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a0b6cb5606so2635876f8f.0 for ; Tue, 13 May 2025 09:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154091; x=1747758891; 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=z4Y6TGsiTr3tqPWwwMchy8j/vXKPtI/QJFPjXad1Sp8=; b=a6hqi93PnaRYdTC859w5UHUg7KUtNMKgutqAQVxOZDHVb4qaAhhZwX2sWynZFfxi3i Yh70PEkKmVmzhYDP+Fs2Ux1MaSh+W0dwZHFkhyF2zJ2e46QQfCa/kmIooCz1pI4ZPChg 99FlFG0C+vuGhIequ/w6NoLlhAVAkCznaBjj/HEZV0l8j4yX+YWZtpTr3GMDcDJKwoVr aRkuyaFAvKnmGvKhlg1B+iLxjOzgpg3dJ8mFI1InaksokgKTqdcNxVtlT14vq5JD1Ztq VbW9N3ZzKeKIN7pjuW/NeXrsLgJsdn6gwfaxLBsJNscGDNltkyVis43qbZoRCDWrIG2h HtPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154091; x=1747758891; 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=z4Y6TGsiTr3tqPWwwMchy8j/vXKPtI/QJFPjXad1Sp8=; b=snHcFvxIbkfRTyPCUdM9iqLPi8jVa8uFfNFHggTRAVU4qx76w7oIKNDUZc5zY2Bcpl Jic/gyoMm0GTCJ55Jp6fFM8oNeMpextrkBSY7o12hfLha5nVTU1C4WRO63dRo1K34a96 zmYuZpFRJMtUFIgvnAk5ACPU15n9bKAr7A69X2g5NuVK2eKepixuftY1USQTcfTDqTv+ cswWudNlDfKOLXFkxAYRhLyAsqEjBFOAC89+4PGvKsnune0Pwn26E15UlDi8Ze60nZVG fz0MvHHy25hhqzMQtNhZA64VSWDn9PU2txKcsUu33czjhKtiPTmpjyupGo2UnTAV82jK VShg== X-Forwarded-Encrypted: i=1; AJvYcCXDEOG6arkXCDgxJkLu+Yio+ZO9C8QpYUPVZnUSR1vlm6/5DEDM9LoRHQwVI/0D0BFVdr/sAmVHxw==@kvack.org X-Gm-Message-State: AOJu0Yyw3DCcHg5ne1unmXty/zdPuHrp5YqsQDEHti3WhgiNQyJ1wOKa jQX0SXD3i1Xl8pr29U+nQ6Nwc7u/UbE0oWjfcAgnvexJCzBaCmnIwO0LGERNeg8f2iqmuenpVA= = X-Google-Smtp-Source: AGHT+IHW3MOJ2rEkdcM1Edo/ds00OBnNEl97oBivjg68cagNTaciFlwYJOcR54vqibaM891n/OdLrMHUUg== X-Received: from wmbfm20.prod.google.com ([2002:a05:600c:c14:b0:440:6128:9422]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:37cd:b0:43c:e6d1:efe7 with SMTP id 5b1f17b1804b1-442d6dd21e9mr126539735e9.26.1747154091128; Tue, 13 May 2025 09:34:51 -0700 (PDT) Date: Tue, 13 May 2025 17:34:26 +0100 In-Reply-To: <20250513163438.3942405-1-tabba@google.com> Mime-Version: 1.0 References: <20250513163438.3942405-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <20250513163438.3942405-6-tabba@google.com> Subject: [PATCH v9 05/17] 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-Rspam-User: X-Rspamd-Queue-Id: BA18616000A X-Rspamd-Server: rspam09 X-Stat-Signature: wxkwpwtq14pwnip7wwdgj8ny7jnfz5y4 X-HE-Tag: 1747154092-490404 X-HE-Meta: U2FsdGVkX1+gzWE/jn80hAbkaTUV+Y673BG6rze1P4XIwnQ5NyZ6yHLCliBfhLCA73SaxZa5nvjUm4PLg+t7cRdRKAGXTkh/8CHwLVtUBSKlHKTR20kioaFORKwTZxdVbHwzRsqnUnh0EoDY336ic3T1aqCxq/rf70HEw+70iZ9UUdRii33XQwh9I0U5Dzp5rr6bz8nT6Hu1G0f18ZHkVZWBz0Lso9N/k4uRbMCbkBYa6QVtUjaPPB4VcTWmPpwWj0S0XZ/kCm+jf8M5djtOtY1tyQb+fj1mGOyrq53AfjP8LhPwgHyrhGL+DTtCJb6J4KuHAEbmwWOrJC+LQhmyMnFIKyULfXRSaOAYZdIrvohWfomk99rqeV/DLSc6l8etMnsKHNe5P4WDLdiJLLWUBnsVmgQNn9PQ4JUZZZbLGeUjDGBWU/BSUTO2aMNRvI4G+3OmKRijKBdkjgKVaP1zPWEx8gpI+BsbdDRsuC/JyW9aIHxn1rtGwxWGqJzC7WCc0FIT/eis9PrS+cTRLIO67Qe+puGWU3BSEtZluGpx1V6yIXiNQP8iEIWuVVmcc49uKVODyDshqsxtxq+EA3DieuIYqQfiz/gcs10cSpN+nze50hQM5aeBQP1FnQKX0nqKX1uiOjfkOUsM1PkRLmgV0rqTXXHKtc1bMgwpfnpHbu0Q6bsOuu5OAiq7FXKZs+bprTaHSMS46bpCFqaGVSuoMHNlwMtp1khu0o+OaOZJ3I+yM4nSCs6T+hNL8MZk8aqm7XgbYbRboQ/dAyKkXKH6ABIRukxHH+QsY3jGaUmJeE/468ebjZGTz00UeINP2ZJnpsrFC4hswVl7CwNqQkPPUMHqOe8hZ/qbOBsoL1Z4uaPQ50olv5sopb08Od/I2QS0y+MOEsUCnn0quzsiltcs1OMW/NFwV9DGLLaBfU3DDz6PauOtEZ5bal7Kl+TZGHinkH63/c6/xoZUkOlqgpQ QhDxmVin IjMtRRhXjPiZfGOLOgsTMNhV3jszVpyiw+yZRzVT0fBQuS/Wi91LmYqzBSTWs2IqXh95goWV2BWGGxWgLRas7eJMNMOT2vsTXPmmYvRxkrFb4EcgQZSV1YdPgF1XNX1AF7k+KGXyA3khI0v7x/+6+ZTJfB87TzAdI18WYll+oTbqhNOrL6kO1G23lKQNhZrUTSny//Fom7lJgB9ZMYf3AeOlQt65/lDDyOaklZhzX+7ZmwIQci9qMnW329USx/3ShGez6NB5G01b2euMivYjRffwHJWDE1TTdpEPMISIqiGWPL2xMMPRIX4xhYp2w73sVGHIkHpEiIIyMkLf1hp2o0V4YUZp5KXpeMj6h0TaEjWVfwPJHuBgjbFRXMHtcUfLfiBJWFEEVz9S3H/ZPQFt8fof40zYEHNBBPYgFsKzIkNLtqSrj0nyy3rHF+nkWlV5FJ1jKOmayDcly2qTmtfanc9cqgVuAB/FZl4XW5D5nnOziMjoBRr3TKaTOgyzeSuHsb12NyShfjAVsAVthiPJ3mU5nOyDAaHcgJg3kGq5FE3IH2K0/naRkxaUK71oJv05zH6M85J8trrF3jMvDiTbinY2aBn3yNRMkXzBpj7nJ2LI2eIrq6+IfRIIiFJThZz/HdPHLGdWK2YSBV9nH1rZLwCGRKoLf1dWsc3G72+W5ejaRW/6QaSPd+JEqUDnEIuNAydSY 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 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.1045.g170613ef41-goog