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 23FDAC369D9 for ; Wed, 30 Apr 2025 16:57:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4F726B00D0; Wed, 30 Apr 2025 12:57:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D8696B00D1; Wed, 30 Apr 2025 12:57:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 794846B00D2; Wed, 30 Apr 2025 12:57:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4DC7C6B00D0 for ; Wed, 30 Apr 2025 12:57:10 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D1BFD1A0592 for ; Wed, 30 Apr 2025 16:57:10 +0000 (UTC) X-FDA: 83391315420.06.7F4A521 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf28.hostedemail.com (Postfix) with ESMTP id 02875C0004 for ; Wed, 30 Apr 2025 16:57:08 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WQie27Gs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of 3Y1YSaAUKCKATABBAGOOGLE.COMLINUX-MMKVACK.ORG@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3Y1YSaAUKCKATABBAGOOGLE.COMLINUX-MMKVACK.ORG@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032229; a=rsa-sha256; cv=none; b=Xn1hbWe5Sorcyt+4GU9rc/IlnynViDlUhQftMYor1+9Oq3hFxBlTqoD75A3W26RiBRM5KH A6dg6u6HRqYFVqz25a+TR6VQemIa8WOkX0MaBti01jpArk/dbSdOF/1gAj64aEsawZNSwp iluBl6xOvbBokMhzw9TTZm9//M0GDUo= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WQie27Gs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of 3Y1YSaAUKCKATABBAGOOGLE.COMLINUX-MMKVACK.ORG@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3Y1YSaAUKCKATABBAGOOGLE.COMLINUX-MMKVACK.ORG@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032229; 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=3CtfAFFPAmimQWAxnHhowOi1TY4SeMONfCUu3d2ZV+g=; b=kAcRJA/5c9AekxmJH4WxwRhoYGvrVZNnUR2h4FEXLmy2mhv605pABtCpAiJgomfsRKCEwL ClYbsAsliieS22w5ur5/nw7rtaSICfiBOfZtSLHEgGiaKMQW68RarOJaCqga3gXzNEjcni jsSs8JwikRkMAl6TP1qmZpd7ygSWcEM= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-391492acb59so3537101f8f.3 for ; Wed, 30 Apr 2025 09:57:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032227; x=1746637027; 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=3CtfAFFPAmimQWAxnHhowOi1TY4SeMONfCUu3d2ZV+g=; b=WQie27Gsl2N7UkpdlffeSg1MV5QuJAF3RygibyLuiB9WBnFFmnWPobbCwHhSRyAmZs 2b3fvrZk9HmOqsZE1yQ14xUHxYsLaSlR/+cuQcEr59a2aUzHQYA+ZLuIPmpr2rIL0Lla 1usoDoBXhPLyKMdXfVFxTPXP8jfaQU+jirJ8VzQL2Z4mnRCxZRGtOoUGDMwx/CDiP8O6 gKwlyKFtlJlgG/Q4KRS2m41wTUrQo9x7TeJG2A5+Ch8tIeXpubDz6+47eDb7qtStTxcI H1Zfx3ktFOJPqcqtTl7KzNbqy45dTyUeFTWQVlmFkpjgxiKojhkeogWeRH6sUMav9EUu ZH2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032227; x=1746637027; 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=3CtfAFFPAmimQWAxnHhowOi1TY4SeMONfCUu3d2ZV+g=; b=suPHNT0azhma/4gKW36onxoDNB7W6X/3nucRa2ErVVyw/9H5qHf2IVCYO5F4SP2wfe Jk0L47oBbra6zkoTg50ofT1Juczu3nwXGfkUd8V3v/yu1kba/qFdmnBPo6k7Hhs+8kEr hVLjgGBTMEguJK7WyLQh9oL3HwIPKOCIzCb6WdWWrCElkJtesTJ3bg2Rg5lhyTniYFLy 6+3vA87zbxVwytov9BIumiIb3MtdNe6AO37d4poe3k0ZFsQm3u6kgdNwT/EO3aoeK1pC 2tLdxCqJtfb6JwBSsA5ZZ9D1kAbMgpuNeKx9SVQk0m+Lz+b5rVMNahnRmp4CWjUeBmWP aPIw== X-Forwarded-Encrypted: i=1; AJvYcCWKNlpiil4mxpImTYc9jvrxTFQqP5EKALbiForcFntv2NQhQhe/ep8ORekEbscci3U7qc6lOVxp7Q==@kvack.org X-Gm-Message-State: AOJu0YzNJXIbNaX4yUN+gY7uHdGXfQwkKgy4017GnG0rFxvxW+rIBsUH OkjMNt5d8O02HoHF5/vGQtdenxxfzxzDKiHQIzrBQfIqdmVYsnVvCCgtepznYmAWveBbTwCjNg= = X-Google-Smtp-Source: AGHT+IG7z8QVHL81WQHnmCOzSujF1J6sOiLfM/15DH9y4sE0yZpL+jCikhfVxgZ427ckeUYKfQPTUnZiOQ== X-Received: from wrbby19.prod.google.com ([2002:a05:6000:993:b0:391:41b6:d274]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:55cf:0:b0:3a0:90c6:46df with SMTP id ffacd0b85a97d-3a090c646f8mr1848861f8f.48.1746032227177; Wed, 30 Apr 2025 09:57:07 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:47 +0100 In-Reply-To: <20250430165655.605595-1-tabba@google.com> Mime-Version: 1.0 References: <20250430165655.605595-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430165655.605595-6-tabba@google.com> Subject: [PATCH v8 05/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: 02875C0004 X-Rspamd-Server: rspam04 X-Stat-Signature: mbqkbiqjxu3u9yayyurtu8cfynhuoxfr X-HE-Tag: 1746032228-238283 X-HE-Meta: U2FsdGVkX18tE9YhG+XbZEh50q9rGe6Fp3syTMLGQ1juHclX7bpgIH0xyoxMEip8lacSvdt7mwOXVYckD6b2EzgN1EPsDN6z812KRLXgd3pswOKlBW1BXE7YONA/giAKEcYyEloadeCQzjTg2WZt7+JXB/Ga+DIi5N9j1PaYWYss99Elu910xsJLxgvNjYdAPdmjq4SQ2EjlEA9DogRzzMfGTBgYlz2E4o++dxo2GqqYQxfphkKS1KMPjYUdb366fo8OA1jYzOibGGn1Ke+0NCezVNczqQOAapgjP6Vd9XPOHrXMV1B6eughfgvsDXA9j8p3+LxAxnpjGp8aIJ1Ovzdo2vh6AG3jDLHG+AbH5FZlfS1VOA5OThi0qMe+YVSptmMLHQ8ydioqnwhbFy0DbxD9eyaQeLMZbTamM4hzjvOJEGerF1Q7DXBBdHcsKKmKuaV+ITD6pl9o2e4tbahTAiyED/bsjHqn5dX0jWjoNTPlh5TqoUd0Mu60p3pch3aSOIKK60mFa3SD9DheRA/PsQP4AcGhPZcVzMoxsMHFWGszs2ek2amKjbXbltelNTH29IP9kK2WtMQFLQtPvtlo6tTw+nrfnVZSOsK/68V4deZnnBhdY7R3eOXF1pnGkz6l8jV/qSjsV3N/wzvx3Op8wZ0U0vXvAiukbn5bmL1O55JZKNG21lnFjpItmXs2QG9O2fTha3ufJmg+Redp/9IztVHA3ZSvQbUkpr5fwQSfs4PGjAnISwrPXEyPGs933m1cDXv0E91ulStsXRDeRMogOwPZk3I7tNYr9ZNlNwsdugjR9pWJil1t6ActF53yzvy75OH7l2EhGZAU+UHQnh3okB/wJrM9Mb/taNXJBape4uxgj1fGL1oxar2wCbnpHvG+tBmj8KM7UKyv9f8isxZDXSPnDuWAA5lZMA2kvbYgjYOD1UoxknqzTuqudNMiawf+5Ytogg1YmDByNQa1BZK ed5sMuK0 7Csg8iwupjxbbBplxnc69AyfZpx1k5jvO7h0XyMrwpcJo7opNngfESP/k6b8Hyewh4goHLM1X0tB02XHE38hTyRz8bni8cxBpoQI9I7pCkjePxmEcSaEOd6v+zTXMEo4pRDlbUyaQKwRXIsZ2asfihxZWOk9b1yng1c1sJQQnMVQeXUgIRHNW+5DFZThfLeq2KMmVQgCAwP110Wcr+CdMq4awMcryIrGvflQnc+lg3GL8H8O8CuWkIw6KvJTmXFUMGtE55JC2nvDA03VjVH0Aj+jwcrreietpmN/d+/l9/BmKCvgJJXBIUS9uhdeDykaBjFcubItL0tXDN/MOP0pX7Wy0+ydD3RGsRHEE7PvQ0ZC0YtU8DOtm2btDR0GvSuX2IppoDCpngclwbonfHNQ9UeIdYVzrrLT2tphBiyCs5oNYs2kXouQoPCphdhB7BzXvRv82HE82eUOl1kqQMwgCgdmqqB4inZ9yCat6VPRmnEIgoKwy8HxjCsVk75oa+/q9uAzJHN4Yhlpaw073zaOFdxYx8Z3vzH48Nv1Sect/Cd6ccmrVZ4TQ2FErPC7nU7hRBKhbKbfLWA0RrgwS1G864ey96NtHDNc5e8g/WTCfK1/rEENvET9nEOpJMdLjQUuA4fzqDO1A6p3Eov9w85l0lb27AgwtKmi3GAUcOKBRU8RIZCc= 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. 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 734d71ec97ef..6d5dd869c890 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 0bc708ee2788..fbf55821d62e 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; } @@ -4682,7 +4682,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.901.g37484f566f-goog