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 3FAFCC83F17 for ; Tue, 15 Jul 2025 09:34:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D09DA6B0099; Tue, 15 Jul 2025 05:34:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C6D6D6B009A; Tue, 15 Jul 2025 05:34:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B33616B009B; Tue, 15 Jul 2025 05:34:05 -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 A43306B0099 for ; Tue, 15 Jul 2025 05:34:05 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6D73512C4D8 for ; Tue, 15 Jul 2025 09:34:05 +0000 (UTC) X-FDA: 83665987650.24.32005B4 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf30.hostedemail.com (Postfix) with ESMTP id BB91D80004 for ; Tue, 15 Jul 2025 09:34:03 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ET5NIVxK; spf=pass (imf30.hostedemail.com: domain of 3iiB2aAUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3iiB2aAUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@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=1752572043; 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=8pudhEgqt6j9GkneYmmruy0SFjYwu+6usi2MMhMEwBI=; b=rxCpdwb0+kjYA5AIIa0o4kgTYlmAp+DFeen/nn6LP2DhESt9spF7N95H2RjwuFSUOZDVcg gk1kUnEh4pmUajU1FhgP7zxrrUpZr1Qjz0GND5M/4jeHBsfZNuP/4+9dhix06F9nygVE/P s3rPnCmfdSYFg5jaz594I3gxstN10uM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752572043; a=rsa-sha256; cv=none; b=cgVyaTJnpYsuLiTCMUzeVEhsijVGLMF+JgPiQFBD8gl+Ce2UtT9uWM3jWA/rz5jpr1ipwG gw5ZVv0snejtH2+KIwlY0m2/cb7tPhbSHq7AkpkjaCpq8z9BLgwwDHYuV1bK8CgoLYlQWo nWLPw84rE+fCFR56mDuiBhqpnp4lLtM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ET5NIVxK; spf=pass (imf30.hostedemail.com: domain of 3iiB2aAUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3iiB2aAUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3af3c860ed7so2304182f8f.1 for ; Tue, 15 Jul 2025 02:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752572042; x=1753176842; 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=8pudhEgqt6j9GkneYmmruy0SFjYwu+6usi2MMhMEwBI=; b=ET5NIVxKUPddYt8aMxFrD9wrB9Xw2oqthf2LydRN50ASGO4Umso3Wg/VKsZr7dJZ6d BYVq6ZgObs7AlNveEXh5dz0rpx7Hfoe31LvnRu8WZ3I5h99Mr1Mp8h+wkj5rs6SMsBu9 Et7N66uy5PbLyDUDiDieEcbdpklbA+KeWCHyp7i72vocyCrupgdOnraIMtwyOIsoZ/+F R6nkEB7X7NhRDQN5DekZ+Qcz8tOLeXH0St/9udRvOpgdFzMzk/UcKAbDfFyMWCgR2kvy MBjJunDwzQBneuBjjKIdb0cPHLjVEqQp1ecwaPozixZtR8p/elHIl3RNISejg7Sq+WJs VqGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752572042; x=1753176842; 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=8pudhEgqt6j9GkneYmmruy0SFjYwu+6usi2MMhMEwBI=; b=TgOj5I06/QoM7RyuWF7OS432QdcmfdgaBdltCc07UURMHr3coiKZBwzzqnKIJ52NS6 ver/9ZjBEomyiOej18Evnw3FbRcqQTPMsKMebIuPeky+cLGSX6r38nOxJkG8jp6GMjo6 ivPowG1twdGAQdw834VI5fr0HGw/2vdQI6QY6fRa0J29kSENteXiEPt52+lMNk8iu5xF d5Fu0IPJc+clS4S5XvMVgqVo+qKkA46lK5dcUneUDfOkzof3UvHi9S9GNO8Tw/o0QrjQ yriHAwi8SDgQsx3pdKMQ39wU300L16zfdVY8x79Ey/BYqH9hTBttON+cvCwaYQl3DB9e q6pQ== X-Forwarded-Encrypted: i=1; AJvYcCXs4/ILiw59KpLhzjVoMba8aLkpo4RTXGX3wDOqE90ZB9O8JLJ9ySSzpdog7O/SE3rzY7Vv4C31yg==@kvack.org X-Gm-Message-State: AOJu0YwHmHWiLMSWv3+lnpTjyLNue71sN9Y1Uk17uuZzuWqQzojbecCv IA5SKjTUpsEZiOtQfnFqRIgylz9woeRKCID20wuFjXMtA3u6MSUxlNyHFhwGRn2nsnq18EJkxnf 7VQ== X-Google-Smtp-Source: AGHT+IFctu0fAkeb8CPBUq72/4rilEf/lWwdMxSroppHEiafl4lyrm/kvgmt1YhMWTR9YyccADVY1z8Y6Q== X-Received: from wmrm6.prod.google.com ([2002:a05:600c:37c6:b0:456:13a2:2e7e]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2207:b0:3a5:8a68:b81b with SMTP id ffacd0b85a97d-3b5f2e26cc0mr11225293f8f.44.1752572042216; Tue, 15 Jul 2025 02:34:02 -0700 (PDT) Date: Tue, 15 Jul 2025 10:33:34 +0100 In-Reply-To: <20250715093350.2584932-1-tabba@google.com> Mime-Version: 1.0 References: <20250715093350.2584932-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250715093350.2584932-6-tabba@google.com> Subject: [PATCH v14 05/21] 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: rspam03 X-Rspamd-Queue-Id: BB91D80004 X-Stat-Signature: js1n1gmjkb3ib51z9catohz1kjw475wp X-Rspam-User: X-HE-Tag: 1752572043-987173 X-HE-Meta: U2FsdGVkX18XsF9NioF91RoCnPM+7Oy1kvvWBtogjHzZmchcDRmTENAnptL3QUW5/Pyf0sdY5jh+Q5uYVJZ5QyH+JNNaFmkY8jNgik6CvSyhbSn1cyN+EMFPxv4XvtiN2SIViVtuJSEYelQcly6MfGNjLpOpJErT3MaByNzuJZDSuzu9NW0KNQiomUqSmyHxUWCi9cPs8jCjzXCpviyDZHfdA1QY160+cYLJ7tbgNsTdENu/KnH9lDF0NrxFOe9P1Mq0JItyFe9y11LCvJRN5zBcz45OSv8hz0JIv4sAu5fFRj6B959B7d1ZfAAoUDzxENWFocFPCy1ffMBEpaK2Ng3NgdN9bbQLXUbssK64mxWR9UKAkXIFgSwUj+9CX/1M+FjeeoOvsVp8raZpTQq0B9wcsqppXprbtkqLwu3Q9UIluEQ5lDsbBzH+iyJTkACSteDoVAwMYd+/Wccbswh6icLN4h/YyQQsMBs7q0+1JP1VTAhzF0HZAQzm8m/VDi38q85IvMGRajuuBQcWhoaM4gLieFxQCGp82d+BY8lEPN2drinKy8vQquHI0wMu8+jheNPTfEH/CMmTko42JI0aluUUrhHnlxDVib3SxREXPv8OSfP94UvQY5S6wrLOUXf/IMeil1DLwqAMsUg25hF/4PwqslYNtZZ2oh0OiUDEc1ja7lF1Pb7hS0p98cpEkB6oekldekr1MZMXpVv9eDZ2j2b7uBZSWA7zVz2tN2s6YYM5z8qaaHJbw4UiSf+oz2KRUvGb+5H7EjdmRH3f1bVqJ40JWmiF/wuEgSGdAsMAlmVautA+RM1onSK2IBiRNzj1OkGrJZSK09ssPOUQXJhtY8kMWh/DOCGpEwquE3X32nba/5uneFCbd9G0+xxc+D95taEiZqkRwlK8PvskY/24uMP+cwEx1Y5WGPMctTDwi5N+rkTaEMSrksJTYOhdeu9T0hwiB7+/3giJOVONQHn gXjHEDO7 2D+dDGaLQwMDzmtZD99uRTA59HcF66ruiKZhxoQtgZwtT5wbRz7uowChIKyck++++8hfOlzlAYq7CErTkVf0hkBbrT7zCF+t2siNbWZJty3mKJOUgbC+D6rSBT1My6D9g6S60F+wMT/4P1WgWY3iLTIP9LJ+RCqq/hqoQWHv9bz1M7TV5YP13Y/9UnFAO9sXHwe0W5q7FhxiDPz9PSlMlvA+cJ/yZhNfjPvvOmwc6fat2gEbpvfOj4wEj4OWaPQAlwVICogixEKaKG4MqySXRhfNts6yFTb6k9eLvKPTalH0enBPKreZwrzYeM9xrF8zXRkqk7nhPXTvsnrv8JNQ47Gu/+KLPYSfFjHB6zcnPKj3UpwU= 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: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() to improve clarity and accurately reflect its purpose. The function kvm_slot_can_be_private() was previously used to check if a given kvm_memory_slot is backed by guest_memfd. However, its name implied that the memory in such a slot was exclusively "private". As guest_memfd support expands to include non-private memory (e.g., shared host mappings), it's important to remove this association. The new name, kvm_slot_has_gmem(), states that the slot is backed by guest_memfd without making assumptions about the memory's privacy attributes. 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 4e06e2e89a8f..213904daf1e5 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 b201f77fcd49..687392c5bf5d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2323,7 +2323,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; } @@ -4678,7 +4678,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 ab1bde048034..ed00c2b40e4b 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.727.gbf7dc18ff4-goog