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 7EF59C369D9 for ; Wed, 30 Apr 2025 16:57:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D2FF6B00CF; Wed, 30 Apr 2025 12:57:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25B616B00D0; Wed, 30 Apr 2025 12:57:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AF806B00D1; Wed, 30 Apr 2025 12:57:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D47866B00CF for ; Wed, 30 Apr 2025 12:57:08 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8EDB1BED22 for ; Wed, 30 Apr 2025 16:57:08 +0000 (UTC) X-FDA: 83391315336.17.9AB8CC4 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf01.hostedemail.com (Postfix) with ESMTP id 85A684000A for ; Wed, 30 Apr 2025 16:57:06 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KWyk4KO6; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3YVYSaAUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3YVYSaAUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032226; 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=d+iNXVDAdj/+L0buigDqwZwszhQH/OtOVJlCHKS7HfQ=; b=bBOBOUBZ2zBeTPWEwmlcitTP8a1akJ5plpbt0EdjR5etLEqa3Uj0mIgAej5K+h0P0okfcQ dBkJUALLS4ZATe6HnG9GzgakRJLu62K1BdryaI6SgSVy4VkChh1ruOPcL6uysneI5dKRJJ ClzUvNPxYZ2nQjzVfvSyLpMq/LvyqiU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KWyk4KO6; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3YVYSaAUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3YVYSaAUKCJ4R8998EMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032226; a=rsa-sha256; cv=none; b=aHhdiH6KmsYOEKvr0bLfxD1WJHrCgjr1CEmiuh5NaoO7z1dCHnm4jWF4EZup3Gu4WvCrEs SubY9EVBIgWpzr68ohPT4yQjykA9dJoPxeoA2j4Qker9p7SWM2zGHQmHPMqASO6xJ1llsE W0iOJo6ecaPgbR/wkphbCTC/cAxW++M= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-44059976a1fso102055e9.1 for ; Wed, 30 Apr 2025 09:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032225; x=1746637025; 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=d+iNXVDAdj/+L0buigDqwZwszhQH/OtOVJlCHKS7HfQ=; b=KWyk4KO6sZfawhrhlC5WdbW9EJSLyjz/0Uf4r4j5slwmV3MEV80TEW4vpXJiXBJoqp wiss3VxKN0V0iEh5GuSdKgLKG5S3O8bB9YglKFzKlRT2YWiLJUOj4sF5+N2iijQMXRrE kZnJpKGWkhhlGJF0c7MsJweNy4ZZh9UKIGLLAAqS/PMveum4348V9fj6cz6MQu1mjWDV 3A7KWAJjWXaHdRxoRhyFFHpxqHm6S6TNMHV0FszcOexmxDsngqbZ2cEWj0/pcmnc2vQu HCR+U+rbVPxAYVEAW77DcS0KUWDD6wba0UB4ofgZDPqsNuHgD+SrhhoVFKblnvPyykjr bq6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032225; x=1746637025; 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=d+iNXVDAdj/+L0buigDqwZwszhQH/OtOVJlCHKS7HfQ=; b=qNKz4W1P+P9q3bseIfpsLbkcXwOLRoTnIk6KxMPr5qzbpLJD8tl1dZYgcRxzw7FP7H oLXGb//pfGFYVR0qboxwkpEH2R3+NFqsvQL4dD4ERgVDiISgSZTKg+/HEW4AO+bLH0pR Z+n8kycPuDZPYhf0Bo4vDMj1spvlxX01QFo53bX29VhOFAhbXygzEW2Z6sXyyoXNFKbb 6yOThFAd68e/pLnNuuXA2YPOiHOO8zBoGAckUeYsCwmwCX4rHIJJTHN6JCFsygm73g1c 9ocw9x6bf4wzx/BrCYB3Jj9DcJl9CRVTy3eadcKTnUvqxyy0TQMEQiCfg7t3Zmotb7TX L4GA== X-Forwarded-Encrypted: i=1; AJvYcCUHO87YwMQVYqOSI+yu4Kwc1p3T1CClvj2eTXEQVXHAyTI0Ty0fG3iDwkwc6fY5rO7M5a0NDXaugw==@kvack.org X-Gm-Message-State: AOJu0Yz3yOfxtfeUBV766gO2kk5yg8ZSeBy6x23+2RWsk+rcbq8CqE+l FZdZGE0w4Y5EDAhttJhpqa4Wp5asEzrOX6T+/FCoAPVwaKbDUSsOW+70F/3iYUQ2s0ZXcfCD+g= = X-Google-Smtp-Source: AGHT+IGeJ+b68NCUJ4eFqZSVib8F8N0sKNWqmlNPLoK9UTBi2tb0PPBoARkhkoRHW90xn5kcTM/fwf0JnQ== X-Received: from wmbep11.prod.google.com ([2002:a05:600c:840b:b0:439:7e67:ca7b]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:310c:b0:43d:fa58:81d4 with SMTP id 5b1f17b1804b1-441b1f61365mr32474785e9.33.1746032225114; Wed, 30 Apr 2025 09:57:05 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:46 +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-5-tabba@google.com> Subject: [PATCH v8 04/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: ff647px4nx3h5pgo8wbgdftwzyymsx3h X-Rspamd-Queue-Id: 85A684000A X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1746032226-310431 X-HE-Meta: U2FsdGVkX1/ngYHEeLHmP3eDJ1SRwXW72kIpTFh9txIfXvlhbgJI7NPQsoXL/eBQVlN8oixmN8euzUAnMNWowYKZekOtyAoKbSNzexmkxmPXKQgJYU+c1Pakpx8NBpe2mUVrUgJgxhs/E4O5fMbdilEe/x+Z1um63XlWyHdltnq7z+W6zOhj3L4lDxflQrg8nWNMHwQN9FEMpJWOOgwBa2L0UN5CU7EGv3rxA8h7IPwK/5YSRvXItqZMb1LFkMh8n9shWBUC+OhYugwLJdf4n7iFExgvGvZseUOuG+78Y8Onu/MkTLDN77cxiSTO6t04ZHhjYBAywR2zw6nRGMybz2wn07YxHFbh+QZXsFNNs89JIgU43+q0HaF7ccj1KrEIKK+RQuMVLBVooR4aggIY1Jgg6xzT8RNC/Yf5ujfI0lknRbekKqWoeqmCYzHhhBFUD9551wtT3AKSAnISVwVjC+d8f8dc8CqFrF+jcyLvnbYDi6crZNFEAyKKQOhDPw5dMW/dN7IzMIFvKCb5fxVDUrhw0nuxWPUR0s74HVHULWDFvhKHS6FNJZJ8FiMNY4dH7HcK3LmfqLEcMzHW0HSrSOWfY62RL5PM1Hu2yfyHMPv8t+6ex0tJYSCBPPhiZCOQcO1sbU3Migs96S9BZ7w4Q6Ecg2K9B9Jbjd5KJfafhH+R50osP/PM0gMmvIErZEpwlbrcVVq9gMLL7Cx7lEtYUjpYx4s1GXXt8lkrBWN3SrsA5436X+7A8eonHYHEvOQ7oI2UbheQiJhzy1PUBF1NHRfG9t5U/7gV5LMqD3Szcm1LEWkc0bbhELLu4SBEk1FwMILFUZhn/O/A7OqsP5qNqd7/YVTb1zzxfpn3absY/wu73HsANLYTc712UA3fsWZUWPZKCEaLY/on4Udm7cH9vQ1argiz8yjBCBzWjSb48NgZD7GzZ5lILHb9BAVjBeGVNFTRWQnusC76XsZZ9Sj KXmM4UQw VMzJtFrikzB3L9CR5ZYusedQzVOMZFSSch4LGtN/Ro/TazpQMnR8e/KU9F7QEFUaYkrUSVQel0Nr2TSvF2KNgAD2/MqjsmRum8wmygwZcNfmM66UwFou+aCZ+A7NaRkmBLps60wwIWzneuITT3XJp/yQk1tBpcC/VSfeldDOyQ6/s6174ePTFNJKIWm7MnHWru6KHeEQiLUUdFpIQ/6KQVgcnY+LdbDxSe+9S6uX+42XLwux3Z/pzivl+YlI4kkYh9c8zU1BTP/fWTliyUENLIfiFQpXAizdZZnVXEaSwsdfkONdHmutbSTos1knoeN/0RuYPRbLkc9VGItXPjKIf4PYp70X6sySMWnXiF8zVrbGo6lQ2IkM3gqHwhOLBy6zLg3Sm4KqbNscmRtdhCsorj+OepBitl4url8EkQR2Z5qACK2oeytUyvIbY8HzF80nERuJYFy5UHku2wpY1xjvLF4PTaHBDJuDA+I9cHgj3zTd4aai83CEbvnfEHTefEMl0bxXddLe5S3ddXag6uSJaM55gbfPrA6cNu2QOcYTGVC+5Rn6o1Pm7q60tlJxvoZe/oYbiY8Cd4+/bSSUSH3C5bU7ISqE9erSqFkVwVsmwc8dRyStggbedZZ/fCFaD0LYPEEncMrpW4A0iQSgR4uDKzVPI5lItp4oI+dXlVAeEIl1kJCE= 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. 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 7d654506d800..734d71ec97ef 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 d5d0c5c3300b..b391dd6208cf 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5048,8 +5048,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 df5b99ea1f18..5b11ef131d5c 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.901.g37484f566f-goog