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 2E9D3C54ED1 for ; Tue, 27 May 2025 18:03:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B6EE6B0092; Tue, 27 May 2025 14:02:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63DDC6B0093; Tue, 27 May 2025 14:02:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DFF36B0095; Tue, 27 May 2025 14:02:58 -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 24D8C6B0092 for ; Tue, 27 May 2025 14:02:58 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A883BEA83C for ; Tue, 27 May 2025 18:02:57 +0000 (UTC) X-FDA: 83489458794.21.94E78E1 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf29.hostedemail.com (Postfix) with ESMTP id B6451120008 for ; Tue, 27 May 2025 18:02:55 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=r8FyNzh5; spf=pass (imf29.hostedemail.com: domain of 3Tv41aAUKCGscJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3Tv41aAUKCGscJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@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=1748368975; 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=3qcf5r9fuEv4TeXNhRM/FFKnchxS488iMuxF5wS7th8=; b=tdqKaGVJuPrs5Qokcg2oTxihVz04E9vIJx2Qz17iBb2t8ereq4Y2YyVVlpsSQDpL0ofb/c DMScvyVISJ84457gDsGsFPtzsNwVvnHbCMW8yvpCGo/muaqyBjAfVmnVoxMUng2kzhEJ/A TNGD4nq+8avM0x50poCjdq63WPn9Yaw= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=r8FyNzh5; spf=pass (imf29.hostedemail.com: domain of 3Tv41aAUKCGscJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3Tv41aAUKCGscJKKJPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368975; a=rsa-sha256; cv=none; b=eaNdpZkzLHdQRg6Kh9w0GjO7MNM5mFkWhx2U4F9etMpUqIjzIGhqVGM2nh9xV+k0xD2s9r 71EczDvOiXaBPoQ+r8g5T6KaSCd3AyRAXTmYhQmTgvWBKEcqcXh6oeTC4JquUnGpEW9Eql KaakcfjTH6Njr6JFpgbwofOqavuem74= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a364394fa8so1470294f8f.0 for ; Tue, 27 May 2025 11:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368974; x=1748973774; 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=3qcf5r9fuEv4TeXNhRM/FFKnchxS488iMuxF5wS7th8=; b=r8FyNzh5/gKbIjjCEeeCoEOPkY+7WlN3UAb8cCttexaCUc4eWE148C4YARar47GKMK 1ZWza+m0fC9m+JLvKyjZsPILFBdu8vKpWLBfs26wEUyEdelYcYqhK20Y374HDZ/fJYCp 87UslH9LRkdXlv3oHvdZptfYtKHILw99iOwOm2i2F+zIKJY9IXM7TAc0phmE5CyP3w0c kccBaxhfoXkNWUs5mr+dAeobhGN6CIovEvVsYQ8IClNjUdzDl0zO02a1+BH6GG2c8c66 A1bJZweAyd5hqscTJkGbRXOrScgjzs27GU3kiolD2/aap7lxCWiRzAp/ZaZvLeRmszf0 +1wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368974; x=1748973774; 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=3qcf5r9fuEv4TeXNhRM/FFKnchxS488iMuxF5wS7th8=; b=bLSq6jg+XAt9W5Ja94HeK7cF4yOYdDXhywKaDU3eWnG5xbwZ7w5CVpTPmTdnsUQRG2 IgWqhbSsSqocLohA6YtjCDOHg4LK8oBf/MDaWYgL7mqOqHzl9ZPe2+J20v4rZJjo+8l8 WfAb7LBftenuDK9PIcD15CeyWxh/r2wbijs45VbI7SQ7AgaJsAygqIN56WFI0ME6ysKi uJ5sG/98h4/rFIQnEFsnTc1mQAQPbjIVD6vgU/CpMJLRQccoxHh753QeciD86Zyi9cyA ACB+xMgWSoxfDKxHTK5b2uPEIWr/2z3YW+LRiT2HukAVGFvJDanwhBfR1VT56MpAvuby uTCg== X-Forwarded-Encrypted: i=1; AJvYcCX3/mxGownY7w6rf3+Lus8pewZFd/9P7tc4NIG41aJYpx0Q6rVuhMtC7rYqPat0ltkPZyYZVZUHSA==@kvack.org X-Gm-Message-State: AOJu0YwFJUVhU0ygdQn5zyHg6sgjvJzmJqVxBB2fUU1lE7mFOaw+lI6k rCIfQyRz7D8GC4ygx/jmO9XZORodAnUkW7AjOV33j/fWOFpibuDy6AbSZpfpWg/MYt8a9cZINOn iQw== X-Google-Smtp-Source: AGHT+IHCvb9oBv7M9nYviQPq2lfNId9bBMU1rJU3c1ZALC9CNK8cl36mxeGLwyYnRx/AcP4NkYwJmgvK3A== X-Received: from wmbbd24.prod.google.com ([2002:a05:600c:1f18:b0:442:dc6e:b907]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:430e:b0:3a4:dc32:6cbc with SMTP id ffacd0b85a97d-3a4dc326fb0mr6674535f8f.20.1748368974318; Tue, 27 May 2025 11:02:54 -0700 (PDT) Date: Tue, 27 May 2025 19:02:33 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-5-tabba@google.com> Subject: [PATCH v10 04/16] 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-Rspam-User: X-Rspamd-Queue-Id: B6451120008 X-Rspamd-Server: rspam09 X-Stat-Signature: mjc934bbhbqfyyz8a7nqgkjgiffcubzo X-HE-Tag: 1748368975-915899 X-HE-Meta: U2FsdGVkX1/lg99eUqB3OCLGykv4NmKyjdWmZdSzWyNiU0j8kjvsouHmixX1xdVkoyZSX6dcWikz8LB/u7GV40uchtnOMHBwNbEtYw7jbS0fWZdlSv9H4AX4CXuIxbG9IopDEouSEKafAR2951h3IB4fvjj1h4jWxHl06+I99UHnQY6rUNAsKAqnjDt5UX9CWjMgbNdu+STgLtXPBoToeGptge3z+LUwa2IXbWvFD09z+f7F8+mWPAaJGDi4qA5Mg7+ElTXU14sPm0Y3e7p4jkibFvUFGAr5A/HBisnOEf++KyattfJse/ZxSAV06vV23tJTSehum4yaHNLzv5KiRW4EGQT51v2MqXuzegv8kuhKtIYgfp/pr7r4wNZIYDXja43scwRZLYrG30gijEglj9AePAviFJyiw+ZnWRSr/DuI4uyox/Kad6H9CNt+m4G2/AE4t6CEybo9nlJC5EOFajbO+dbUOoSH8jgtbkIz53QajQVGj3Vr+m4v++8/mHGtEnrNm3RCyWCMAezH1n+2Vb6+rKFhHk8HBgO7DN+cuPIPJIx+ZVTSR0oBxCl5TesYGVKya5igfiYGUuFgDMthBqSRgLirhzAp1+GfBhUlUXvnzcVUXCRf75DCsw1wGGj+iusCYgGqOjGz8u5BtgOT/VN03k7H2Z24sgfLs95+OKoYoaINnmbbE4FJQ66rJy67R9180uYeWvZWV7njkmI934Sens00/a3NKXACUkN66sX5RMgAMxD38iLipbqr/ZQK2gStywHtigZKlhtTqsyoa36ACIAQegJ5hh8uLynTp360Um8yzuAoF+zYhKu01J1NLPNH+Hlw8ghrd/uq6zOCumdfpBXIrWQ62aLHoU8J3d6I0mBrwhFRk2Xy73mUshq0AX+42/+SmyVB40Xt39DldzpN3hWtyK3kuQNFV2AAJ4GmGR6YvxwW5Zz7glbMmGUyH/Aa43sWiUez6TMbbws fwMtQ5fs iRJqhonJS0PL9zN/7fhrQDqaxVxX+0RJhwBIyNKl24VGLwh/mG/V2wQa4YT2/hi03HgQcLCeCoyLaNwVAcbBp45lc1LlCCafx/nj3Ztrex+dPklmYAALE4uIPrfkJvHt7cmggLzyFXYdOAs5gntdAlkir61mUEgS4dXE49euN6yxMuV7EC9GgT2xar4dyxcrcHQ4QEON77BCnrN13UPjbNZz7UWHRBfa3IuekJIIhrV3McAyG0/daoRzBHcAjSBq/c+QyfsqpCS7qXNw0zBsK7/G6Bppa8TAVmEHFkVpQ4cKVqS5qyDSn/dfB+9x6+I1GewGeBSBhWsaseCppf1qLYECrzRDYTWZSo4iLWgDMZNuyT5YcWc59cxeqOLeFSqx01mwATDiIBFDQjuqilCjxaG0tvW7vYva45UsB3p/O33HfvSXBufzhvKFEBduMmmoR3I/XVOIj/IkAl4G4GTiONonJx0wJW6jw+jdSWEV5QuKdWfJxPJXs+YYtFQc3fNtTtMwEgMsIJf7ERnvQNsAhVTzDb33EH2L7YaQykeUDJp0s1vb5wtzJ/Tv+M4s6aYRD3big69ytBZ+I41y4e/Az7paG0MYn2+1PFw9OnCQWvYvkyB5u/K14NOCL9bJam7Dm7Ac3WuPRwckOX7L4uATz37X2e9DKvow4LP6PCZtPRBjUpzBED4+jqSQTCDsB2uKeAhNB 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: Gavin Shan 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 be7bb6d20129..035ced06b2dd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12718,8 +12718,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.1164.gab81da1b16-goog