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 BD318C678DC for ; Wed, 11 Jun 2025 13:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F028B6B009A; Wed, 11 Jun 2025 09:33:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E8B136B009B; Wed, 11 Jun 2025 09:33:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D53446B009C; Wed, 11 Jun 2025 09:33:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B59E36B009A for ; Wed, 11 Jun 2025 09:33:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 71115BE245 for ; Wed, 11 Jun 2025 13:33:43 +0000 (UTC) X-FDA: 83543212326.30.9A81310 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf03.hostedemail.com (Postfix) with ESMTP id 94D4720008 for ; Wed, 11 Jun 2025 13:33:41 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=XawVYUTr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 3tIVJaAUKCC8eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3tIVJaAUKCC8eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749648821; 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=/7yd1sTKmH/kZRCQtJiM/n5Yx3TGG8dKDUQIn8zaPVo=; b=yFIp0N9GLFN+JdVzXTiPgGG3jFeMiz/WT9U6FDtQCMZKGYP2wzABiaCJ+xalYtBVHGOYxl gDdCO5eE3PrJYMMPEm7hCfnf0pFxa6ssMOe2OM2NWkKTFua4XqHgv7jzJvNB568vUSkHgO v5x/glpJj4G4WOx8UCXEZ7NTNkkUEKs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648821; a=rsa-sha256; cv=none; b=ixXmqFfGNb0BtYo5PzuNs6S6quNx1SUPHbIXQD0uFviZPKVgvKoZqaRUHotQlnl3++KV9/ DLMObaxC70dfiDu+/O1xJy3rym5ad78vWfSgOtLW3t3hEl9Sso+EwnKrox3SUeW+btZAKB IfG2zR7ACLnsLgnizW80JQUVzZ9rpPM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=XawVYUTr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 3tIVJaAUKCC8eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3tIVJaAUKCC8eLMMLRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--tabba.bounces.google.com Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-450cb8ff0c6so36643745e9.3 for ; Wed, 11 Jun 2025 06:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648820; x=1750253620; 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=/7yd1sTKmH/kZRCQtJiM/n5Yx3TGG8dKDUQIn8zaPVo=; b=XawVYUTrF1+mg/3Sw2ptWrQcLhijgnPZIcEqgwQ4n3XIVrF+uVVU8JbEId4qhmlqJR dyNyiCkWBuOn60hc3PB7sXBEek06wy3B48xF+fmSWW/gjUX3lcaKSQkkS1SXWgN/u1rB OGjTpzSx0FMWzD7s3bZEbgRrlU7cpD10CDS24sT16Q+zZ3BGvYCzXMBaqZsHQXObySQa 4MU/ecrlMS9SyGf3pcPO0kZnjxV+ojyMA6xV2aQs+Z2KLeXsbUYgt8Wj0qt8Jl1bXKCz r5SUb+Gf4UwqlZ7CnKSiVat0ztG5DcR9gth3VehbRZyTVZFmr1ppLn+t7PRZMt3tZnpp iVpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648820; x=1750253620; 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=/7yd1sTKmH/kZRCQtJiM/n5Yx3TGG8dKDUQIn8zaPVo=; b=SZwA6H/cDVeFa/438GQ6i/TjnIIPdpzQG29btGbUQ6erHqGofkuIzCUPuZQKDekwA3 Piq7NRf3uk9JSoo9ig0HVMzR9xrFlexu0B7O3kIZC+dVBFt0lYTSU2FwzFkD8Rzc0trv pvBrEJtxR9m2x/0S/SHY+XQVrzBfwMuQIzdQodjiffF+iZup2VoOw0bJqePdFR4jEaZz gJFq3AyS60lOvhdiL6Aa+TZ7vWAB+zyRahroD9WDzFh+PKQIL6ZNNcHVfD3DvF8lTbOp XDzcSOAJ/9U/LrKm319GkGwmUdHFcV0CegbcseFK1EX2MLMI5RnGjm4dWPbYgGnvrfE5 QbNA== X-Forwarded-Encrypted: i=1; AJvYcCWjs5cfsMX+eoxpWeW5q7UFyRPYy73VE7izKZqfC9YPOzzMNAyvM6Pl3mAg5DWWlBScR19q5m3/Kg==@kvack.org X-Gm-Message-State: AOJu0YzCoW9FJGyMVNWBUKE00fVszKaRI1NDWxakYuvAZ1EA9/bIOBqS nlr0vV8Iro4Rf5lJtqpLVopVC89iJZDtqfdPxjz+Zxs4NgvqSWsceKncVS2Ok5nRjQ66tEs3Ve+ hAw== X-Google-Smtp-Source: AGHT+IFYroU/xAzMZJoiD4oD3uWDCygQkGmdgzYq+m8br75EHz3uTlJS0gPFUhk11qXKmVV8klVdxJfKvA== X-Received: from wmrn17.prod.google.com ([2002:a05:600c:5011:b0:450:d5b8:85b2]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b04:b0:453:a88:d509 with SMTP id 5b1f17b1804b1-45324edfb8amr33328415e9.10.1749648820022; Wed, 11 Jun 2025 06:33:40 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:16 +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-5-tabba@google.com> Subject: [PATCH v12 04/18] KVM: x86: Rename kvm->arch.has_private_mem to kvm->arch.supports_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: rspam02 X-Rspamd-Queue-Id: 94D4720008 X-Stat-Signature: 8u5417ixxqftot3hzo3aczaw9ioro9k4 X-Rspam-User: X-HE-Tag: 1749648821-4936 X-HE-Meta: U2FsdGVkX18u7GyCV7pLQFhoqZ1e8nAx8JAFvavcaXdDWAoY6H2gyoQIt+SfdEcWeQFXz7n4NSIsp0F2EuNM35ZlcXDowe17bXkrokID+I9GHvfCH52w/0XvCDpcmr86pz/rDqtfOzd/1fZIY/Lo04TcHu0ho2Yag3sEbYg/rCn9oVn9b04/aG2Ddyj0w0paQra3vDkOUQgo695gOLGp20Mv5PCH0LHEkI9GfkpWWObPV+0glKlyLYzArcKrP6B3mGSpBIc1/KF21v0s8t6U+EmzrYseHWjTbgeKlGz2hg/KnPpymmkNMYwLrHy0Fw1WF88glIYHdZS/gkKF5LFjKv3Qy4WmSSjxnLeUy3qM+GYDdEUMrUrVI4hcGTpmdGCGyMV9Ish9zx+CleLSQchuYgf96XFEwSxrUAGSbz6ousiJTDwuJp0vi/90LvLTFTAxWZd6o3xvFnPeiK2Lhcz6jBfkADp2ZbI0Rx5BXPLXic1zW8YMGJ1NDiOrJxDKJ82LyO2JQUhN4eJga1gUuWDfiSCiXF++iBtFjlVqfnDSFpSOv1I9BrR8Silbf+qaBoijx1robr7a+FPEKtsIFEHcnNkgYaW9y/+Y8oiMUXtmu2NSLFDKh3s6ybSLOFJPLBA9BBB71iJM2utjIDrBQonQk8v722aw1vx/MKj/JQc7OTx8gFw6OdWA4wcxldKknc+MGGczf+Toz8ehUJBM4EBSEDTc4HK4JFR3g/jcmC/M0nPuKWmymPg2mNsHpDAd3nHg2RDKYKIhStSWpynoMotBBRFakf/pg/o/DBoxpZpzpdRbC69nOFWn3JttgbrqJ1bjL4S+tWH/CQaMEP9nAsbRlfbbLYpvNEEHQKwEvKco4pfd7B3n0SOgtSMm9b9P/4+foeNu0nufxoD+bMtmdy4CV7hTnSAY0Nlu5F5KLYTQW9VYiiQrNrJov6fEOFI7FVTQNxraHHWaNLjaKK0/l9y mMqiLl8R w3Xb82g6gJSLXvE57XgHXdZtML8YcFkUGLp7ehSL7Pa5Gjqvc3jAWKYMatB70x3/VwKvRhtpSULrkQRJ/L/ZboDbXCyYfbXqyYdvmI9EtWd4oQ4nf2zidGTSQqLZJogz+RIiOe/QaIR7UnwdxAltVSTMszi+EPJu5QiknnYWQIJJYV9igfaDhB34CcqBaqGz7OLHXckqH29Gar6tnJB2OzsyI8wUdr6+eraLA+PPG5iaQCjcrVoLxoWmALhKd6qHfckJsoCwaBAc146q/J/p5VyKCr9vJ12MnxpmOOfQ04bzeW9bbpBCdFOeOERzsCZxM/uZ5JzVgtUov5ysAUa+ELDz4XP8Fenc+bJ8avRw47A/uY5vrGfZ/qwAzNZz6lN0i3+r0djHdxuMG9//qBKWm4dnyaPCoX2jdmFP4umGbfCn07580qsWCpUPD+/4liInfOozpxxXq7UsEzhaz64wQeyI1I6/KBAA2TRtJBubLuk6sccLph+k8Lzw+KOObkOTvarqJuSN71fiwqheSnxpqrO50NXB1cyml0fcqBkU8hmtqq/f4lp6TDQBhQMMGrL17+sWS8YwOzXkP9ngwYEPTWnIBjG+aJF3zMqUx9dpC6pvoZd5WbUSzg0eR8ARxIeRqyReFpq/hTbgt9YXLmp62K4jURYwwd75HKZw/5Fmy9/3k5RXH9rT/XXSI0ZQTInKj6HEWDmDphMqP5Bm8wdy/ymTmHw== 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 bool has_private_mem is used to indicate whether guest_memfd is supported. Rename it to supports_gmem to make its meaning 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/include/asm/kvm_host.h | 4 ++-- arch/x86/kvm/mmu/mmu.c | 2 +- arch/x86/kvm/svm/svm.c | 4 ++-- arch/x86/kvm/x86.c | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3d69da6d2d9e..4bc50c1e21bd 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1341,7 +1341,7 @@ struct kvm_arch { unsigned int indirect_shadow_pages; u8 mmu_valid_gen; u8 vm_type; - bool has_private_mem; + bool supports_gmem; bool has_protected_state; bool pre_fault_allowed; struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES]; @@ -2270,7 +2270,7 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM -#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.has_private_mem) +#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.supports_gmem) #else #define kvm_arch_supports_gmem(kvm) false #endif diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index e7ecf089780a..c4e10797610c 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3488,7 +3488,7 @@ static bool page_fault_can_be_fast(struct kvm *kvm, struct kvm_page_fault *fault * on RET_PF_SPURIOUS until the update completes, or an actual spurious * case might go down the slow path. Either case will resolve itself. */ - if (kvm->arch.has_private_mem && + if (kvm->arch.supports_gmem && fault->is_private != kvm_mem_is_private(kvm, fault->gfn)) return false; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ab9b947dbf4f..67ab05fd3517 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5180,8 +5180,8 @@ static int svm_vm_init(struct kvm *kvm) (type == KVM_X86_SEV_ES_VM || type == KVM_X86_SNP_VM); to_kvm_sev_info(kvm)->need_init = true; - kvm->arch.has_private_mem = (type == KVM_X86_SNP_VM); - kvm->arch.pre_fault_allowed = !kvm->arch.has_private_mem; + kvm->arch.supports_gmem = (type == KVM_X86_SNP_VM); + kvm->arch.pre_fault_allowed = !kvm->arch.supports_gmem; } if (!pause_filter_count || !pause_filter_thresh) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b58a74c1722d..401256ee817f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12778,8 +12778,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; kvm->arch.vm_type = type; - kvm->arch.has_private_mem = - (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.supports_gmem = (type == KVM_X86_SW_PROTECTED_VM); /* Decided by the vendor code for other VM types. */ kvm->arch.pre_fault_allowed = type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; -- 2.50.0.rc0.642.g800a2b2222-goog