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 33FC6C3ABC3 for ; Tue, 13 May 2025 16:34:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60CE76B00D3; Tue, 13 May 2025 12:34:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E4516B00D5; Tue, 13 May 2025 12:34:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43BA36B00D7; Tue, 13 May 2025 12:34:51 -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 210C56B00D3 for ; Tue, 13 May 2025 12:34:51 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6BEA31A113D for ; Tue, 13 May 2025 16:34:52 +0000 (UTC) X-FDA: 83438433624.02.AF07CC1 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf19.hostedemail.com (Postfix) with ESMTP id 859C31A0002 for ; Tue, 13 May 2025 16:34:50 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ct022KqV; spf=pass (imf19.hostedemail.com: domain of 3qXQjaAUKCGgZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3qXQjaAUKCGgZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@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=1747154090; 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=RemcVjZbjZ9ZPgu+3d5I80Ik2FoSdKLzJPcqSfEXd4g=; b=e8xosIZ8VRjCdxR5C7MKYxqcxmvmwAqDCKltDOOeylMdZcWq3F2Nj/BTb20cTz99NCtqIV XHLvXblHk5yARR+PjEXfLwAZOk1S79ZoLIaFZ8tQOLLqOGebDV9zdTHwpU+vvPyCORzeMz ksZ3AuUi2lnuMHiag3Td9O/xyjyWNII= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ct022KqV; spf=pass (imf19.hostedemail.com: domain of 3qXQjaAUKCGgZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3qXQjaAUKCGgZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154090; a=rsa-sha256; cv=none; b=kyQKudQaC4lAagNFwGibPQsJ2e83hoKMyn7djZExd9UtgidnRACnvegDqcvV5pbqq8oXM7 tJk+NTlUlynvSVkrNKvcQbVVkw+ydVK1S4BJjTPssgNPLQ/8MzpH8dDuqaU3XcjHCz7WY5 Tz8/i8Gz4y4wr8ha4Q7VIxsB3M2La9o= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-440a4e2bad7so111585e9.0 for ; Tue, 13 May 2025 09:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154089; x=1747758889; 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=RemcVjZbjZ9ZPgu+3d5I80Ik2FoSdKLzJPcqSfEXd4g=; b=Ct022KqVt8m887SGyUJOcr5m7TCTMtjZ7UcAkKl25Smgbl+beSQRCE3c0VAJj+LeTS edyBAcfeFLu3mALkebcj/PvgCUlqoULkQINx+fnUn1OfNWF+p5517EannIkNhn/TTwO1 roN/+S5dx5PxU3fybtQbWt3JbgQLXCMthaxVAA7eaU+ElbQekL3OOWUGzFdCTcBl4m77 S5pCUdobiy5WHK+PYU5aHZTzKlRS36FJhY7YkFS78XtYWpTxFMcvq6KD1w4txiO/Vvme RaUilK5YlVO6kjClfmJh1P4U7hkbmD+fEFFKQD9idm+q/rM7Qa2R9v9pKrdiDue8H+bR FHrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154089; x=1747758889; 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=RemcVjZbjZ9ZPgu+3d5I80Ik2FoSdKLzJPcqSfEXd4g=; b=UHGfAU17dDH5Lj+iZOb4C8HVjGGC0Zt/jCXSkY3gK0Qg4inH1qeY2nGVk/FBZu4oBl fW5R7SX/bBPdyIwK9SrOSVZmUDNWOK7J+j3FlYfe0FtKjipZamzq7TshU9H4ecZjyNuk oX6aFk47cHhLOoK7pH9b3StIklI+tszwLfdudC5kojx1hWbTwt1zsr9+ttzvxLem5HWr An2lAKrGpJPrERKr8LuMspi38XsNCkJAc2EBDh+TAGSt4ikR2syv2xRjRPR3nFqDQayA ULll6hnwDpaESQZ5jz/fQbU8mEpFF0JV5UOaO0oJOunJbv28krSDgKdOuCyzZjzw3fGJ U9gA== X-Forwarded-Encrypted: i=1; AJvYcCVnTEsfkwz7qQOX9Nbu6m3PYPp32z9sHAWvU/xQyPqsieZ352Sql3xkVynX/z/WrMJbjIJsrX01DQ==@kvack.org X-Gm-Message-State: AOJu0YzKwLUO2lAJgl2+MFMNXZvDqR9b7KyCadpP5Oz2gYSW+wAGqqIY wvHQMQXasw2X5B6He/vFVBvvTGg+7kjvL9JwF7awagavtklhSZdcD7QYqTYxXyb2Q9QbPCMtBA= = X-Google-Smtp-Source: AGHT+IFxEwob+8byXmXMbz/khknkrLHMGFrF9iGceLErqSy/3DALfFa6E4jLemK1/8N7omYL7d0nchlvjg== X-Received: from wmbhj10.prod.google.com ([2002:a05:600c:528a:b0:442:cdb9:da41]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1ca0:b0:43d:5264:3cf0 with SMTP id 5b1f17b1804b1-442eb8855bcmr27319875e9.11.1747154089111; Tue, 13 May 2025 09:34:49 -0700 (PDT) Date: Tue, 13 May 2025 17:34:25 +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-5-tabba@google.com> Subject: [PATCH v9 04/17] 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 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-Queue-Id: 859C31A0002 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 87oji9b8h36go4td5db56s54m95sz8e5 X-HE-Tag: 1747154090-205862 X-HE-Meta: U2FsdGVkX1//JBaom6fH1DuoAL6MUj4JFU6zDRnRr3Tm3Y6HpFPMAlP2Iz0YMVyZmcQ5GieTEf4LLFhUdfJSsQqti8c3JwHG9i8jRunEcBjK5UO+8t3RW4LXTxElsgJ6ABtyOIUkqHoV7c34UaV6gnGEJ5iPDU/UZx4cpHJLp4AiJGyigcPqiM2tG3wLIZULImIBnMhZdhgHi6MLGmK1Ymy7dUGSN96ApfndEkYlSrHrmYTNhtOJoSc9Qy5KPyvFKLk2kTwZKBVRx7K2k64jUUKcOyfMaH0u8Dfuc7IWOhQIsXyFgnT+UTClhKq9kb9/2H0Z7yHoF4Pi1VgRbsjhQyuY/5+cCoPe1izmmoXj1crRJv6aERnP2IhH7zGfJK1IWLc/gJ3S0UnhoLV9HOAgVTx5ldlK5A/TifREfYQr1bewJIHbphxBhMgJVoOQsr2qm6ZjPf7nLL0hvjQr5bB6fgRmKhEBvqKVWLmWWHWcXswxAautIIFRv6/eS09PeMoJBHx5QRSvaSTDXzpuTCaxeMjxbKYWEA3o6OT63N4+0WUcTQSeeQaBVWL3TYhy3yLwVq4u4RROECSTi6EcYSvo9G4gZCxx2195I74G8b3ETZ/5iV5hrxrbhvPCYWjmd9PGvaN58UNrn4jLpaNaR3iQYas77b50kwZ7Klzo25KYDUs4jYWbHscYe+SKHvBotvHNwqbXm868k5eqww7IxZzQIfrXUYZp33RRExHahQfXCoz0JoGE+PqWYhlOkQ1ZN77Tf0DYmBlB0p5xWLx3Zlx6iWpZaoCE4bqcVKFkNygHHoSvcFlTJK2MyOqsMBBZk5CIfWvHaEqvXnEVEsYh46IaigiKmfUbDvIzMPWR8ws9+1finldhtsd5tHujg3FUIQiECLgpBZmsetH54ODlpxp6D3sTbcHt1eMdKkQuJwzjjFizf2fiI1N2ceTDME8IgzT0vaMfeA/wZKfXU1wAbYK BFBCAila 3ylIejD/M5tg/kjh6kSEq64As7miJLPVWE3a9JddQJILB9vixiv6cITSG25tohlFSumgmp9nxATIwobHWox4V7YZRQnYFOGzuyltTDD3/fsgeH4PI3mV9Owsf6YS7eODkV3/3NyY3/J1NwWCSZsAWZUX9JeONk6S44q/YyDoToWMc/hYLE0p7q3Lpgzjs/QqXDxhpadMxo/VjFKQiToTtzuKOOC9JCX72t25XxsMpuuvPTbInjEMWh1n8vjK/hq4kYwTf14jCLAxMmZg6ub08+dlnwPc2k/DfTvO8HP9LYrG2c4rFJm9T+ggPv9sSSuFrTnnYl2jgXs55Rfer4W2CmDxBIqfHCyvBBeNzzn8XbwQXQI193ub7BRKAODJABCs7qxUo/NqjBXkohPj3fXd9EyfiCvh46pUZHB1wU6K/F1x2iKMg99J2Zt17eZG90PXQSCToxfo4y1HA1Ko3HOLDn23OeF9uLSlrsi90IVrSgH+MiQAUyhmHDPfEjRDb/KjTeaOfqXh7/kgQsmYvh9hkSNuv9Sfo0fofePibNX/xJ7kgWf+4PmG42U9Z2Af0hIkAb9bLK5hElzmuL2kP9ZFeSqANzxc6P87L3TCJhzk5wmKyd/0exjxevhjHVhgYQl39+geElmquj8WJUmNYqYPgm2okrSf2zVrLeDzomLFRwmPhVRu9hOXoIXSrm7BqcPYoinLN 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 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 4a83fbae7056..709cc2a7ba66 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1331,7 +1331,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]; @@ -2254,7 +2254,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 b66f1bf24e06..69bf2ef22ed0 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3486,7 +3486,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 a89c271a1951..a05b7dc7b717 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5110,8 +5110,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 9896fd574bfc..12433b1e755b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12716,8 +12716,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.49.0.1045.g170613ef41-goog