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 A3FF7C5AE59 for ; Thu, 5 Jun 2025 15:38:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7D296B02DE; Thu, 5 Jun 2025 11:38:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C54AC6B02DF; Thu, 5 Jun 2025 11:38:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B43856B02E1; Thu, 5 Jun 2025 11:38:14 -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 94C156B02DE for ; Thu, 5 Jun 2025 11:38:14 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 43795140DFD for ; Thu, 5 Jun 2025 15:38:14 +0000 (UTC) X-FDA: 83521753308.22.91D6DC2 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf12.hostedemail.com (Postfix) with ESMTP id 644254000A for ; Thu, 5 Jun 2025 15:38:12 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=310bXs7R; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 347lBaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=347lBaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749137892; a=rsa-sha256; cv=none; b=e8oqtXiBhX4vQXrexfyvNYrUj1rBXKMc0DE9KQfEV7MR0gKqi0iTsGgsfmqqKUnjZY1/NO KGUD6KcOv5q0NvmCQHURs4yaHhkTIWpzQTtHKnbI9Y5rT9X4SreR/4VGCebhAv77zB9Shr wgyKS9TBwONgrDi4wBaaNTRhlfIR+wM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=310bXs7R; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 347lBaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=347lBaAUKCKYZGHHGMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749137892; 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=cw6+Mpe4Y9YYGqB7SSsL2ZJhDik53zQn0HS8MVl9BPk=; b=izdWKKri0oIEvq/O/8U7Hhlciyvj8ysmtmUEDsUSRk2hOBpvNeJ/zVNN8gUaKQvHxqrH9W 7ayvaDTnhYlWJTGfgjCDcTksz5sYHn+eFCcTpgRW3XGf/lQZ31/NA5C6t93sV2SRhraAWF UTmVXe8mNXVa8yjCN+aAGPbHw6aKEr8= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-450df53d461so8792925e9.1 for ; Thu, 05 Jun 2025 08:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749137891; x=1749742691; 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=cw6+Mpe4Y9YYGqB7SSsL2ZJhDik53zQn0HS8MVl9BPk=; b=310bXs7RqJj8L/zxUHEQYAshKjdycdJX0MlG7Bz9q/o3wlHvmZQX15e7H1rA1XuCPq v5hZFU9/WWM+QrUB8j30Ez7SNxTFHc3/owpVsjwQzXeKuNF9krzztgBuLaIlyDTPhsMF pp+Mzh/7xP4fwAfzak/WvAyT1KG0N/BwSyjKOPRhlMunrdRzJunU7aKFap19w4tVCpQU OpqP9siyhJYDOdZEQNv+44ewfg1yg2/5OUvVmrOM3K890Xq79CP2dEIYNaONwwWdt1/J bIfx3xfRihym9Q+uTc4s9q3ReRIkiAtrQfkBbUIn+uhI5Ytvwz4C+nXB3UkCS/pNtcea xLMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749137891; x=1749742691; 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=cw6+Mpe4Y9YYGqB7SSsL2ZJhDik53zQn0HS8MVl9BPk=; b=B00JvgYh7/BIiigSqVhGUHwSjdAjg9nUjUt62Dvkvokw689aMrCIVZ0XHrvC5zUML1 ikNClUYhCg36H05fM915a1rrwvISAD7mzUcId/LicL5as/se1nBe4pUJ5Kd3urTTV2yz xagooHcPXKPOoB4LHTc8rWzt0AdCfuSMVt8AzlXkLDiW70Uq1lzKCeglcXok6b2yOlgC 2IJCHTXj5u9zpNXJ7C6KK3LuMWtf4PcWcv3TMBP0+bwOEjNF7K8bG7cPcywbgpRy9AHF M2P4zi1uQmkVT3P6zdHNdhQ/AcubVztWjdaF3+EYdQe0FJVQJl1TrWylP7Ji1hJm5qBJ T4JQ== X-Forwarded-Encrypted: i=1; AJvYcCUwuyqZohMvkhcUgLBBWVKS6omH9yzUQu8RYNS03eyd7DzehMiSG7GWfot+lDgcYMTYUx7pAOlCkw==@kvack.org X-Gm-Message-State: AOJu0Yyvi9WMOk5NZwBg2ceJNni/zBVPA1FiX1W8FIIJSf2/kgLkucRM 2FX/JfyZsiTZbhN4FQUW7MlkHWPugy1ZJ/AaF2ALmm4p8fh2MYcTZ8O8uSFZnyoXEd19+nuLMdb SaQ== X-Google-Smtp-Source: AGHT+IFYsQ27vypuy4NYsL5G2D3PkTdK4tJz+eGgF3cJ530C6liNPHZmvXo6DXqMwIsM1QvbwO6I/y4yDw== X-Received: from wrpk13.prod.google.com ([2002:adf:f5cd:0:b0:3a5:2a0b:d7a3]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:250a:b0:3a4:f892:de7f with SMTP id ffacd0b85a97d-3a51d95dbbcmr6703161f8f.36.1749137891053; Thu, 05 Jun 2025 08:38:11 -0700 (PDT) Date: Thu, 5 Jun 2025 16:37:46 +0100 In-Reply-To: <20250605153800.557144-1-tabba@google.com> Mime-Version: 1.0 References: <20250605153800.557144-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1266.g31b7d2e469-goog Message-ID: <20250605153800.557144-5-tabba@google.com> Subject: [PATCH v11 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: rspam08 X-Rspamd-Queue-Id: 644254000A X-Stat-Signature: 7aysiyckn8n9scuam5jbawo999ba67it X-Rspam-User: X-HE-Tag: 1749137892-630583 X-HE-Meta: U2FsdGVkX18jdvKxicEqcjcTICzTX3B5/GEZvdBdY16xEywnIiitGSmIs1Pe6BTIxRfDCNzZ9fVp10UvhxEcvFmOf1PsoM2H5C7XM2t/fIBKYO4Fz9l6CLbCh/V9iTgTvO/9trJ5dP1kfsNo2sLhMlwhq6Ahq5aoX4cicI24xvMOIrXg6iKt4w1MunbQSzgECIIR4i5Gw+uUTDqcXvM/hOHsacsiIjJJH10QIZwI8ob0xH6JNn3lbORnYZk1ikJvA01p9f9AYkRBB1jT+vtxOWELYDFrCvZRPUcDI49EdgXtRZ2pC2YOmOG7Bn2QBj+4Oo31UxsreWPpA59JjLLBTzjlOOj2ynqjsremMnDuNqzH4snsUZ5jq4EX+xQICV8hoeftCT6+GUhlETzgKho6Se1C/BbcFdsqUZ2+mIiNkTenEzs1bkN1qjxnCu5QxsxkqVphv9x6DHTNp5rC+MyWCYdD9j7EYfXL0JcNOCtU8EuPPeb2wDMiYxdeQVa6PEl89+0XssttPMtMzC1XnSjJ4V7ND0LQoM/XQPLqKGqGz5pJ1u2hvwpT8j7ZdCrnOJUyseCm8vZTnVSCmxy6O89Ccr+upljvRYUnpd90rZGTz71a0q7eRE4tdZfLQApD6qb7Jgqlc9fK9MlsAPOkU13gdRnce9nplv71xFi1nEcIwtwzmhPRuCw2DDBjrIdP2r6bB79/w2n0QAhAkSJZ68ZtzzHRWAn7SIK/xdNFXMJhsVg13/Xv4bZPuhm5Q7FVqU8baqYVLxmdj5X5TnOC/tIHPsTKfOKSJtjN7UqK+A+RqzVFOzYMgI5nGO9KN6xpAToMZK87Bj0NQ1qMxLY8Jb09fAMfynFlTN9vd4YbLCwoeZwpE8Q4+PEdGwXkOScNCptsSr7rpuy2PjpMOob8j+AS5B4NxQkeDcZh00pc7QQbfsRy35daNPwSw8Vs2q+HSvZldLiFwR9aDPbHlBj2PW+ 638QmWUG SRU0pb6MDPg3z/5XnM01no1JpH2vo8gQwQzeuwKm6NQE5kpS44FOHauRN3L8DyE5cDRI/Z1Qj2IC2FTs3JTbCdyP59pytfwaibftyB9G44MkyKN+eVS7xs2QnIsofeA6tovkCLhFCryqGaQ3HWw8vAE4/+Jy0GdrXJzYVGeQF4E5PS96l6Xn+6GY9jqEdr/+D8XvIesLZHTFw/vticp7dT5F+N+Mge/dIQ+L2qQbTBGia2bSwHWXtGBB46xnB5krtXHGlKAa2pOQYDOxKadW3LoXhKuCFQRDwnh8Prwqx4i401vbw7f0kdKrOIN/IftjB/h9H7GCsUbL6dcOI3oBzwP7sgeS0lM8zGiXjvl1RRUDLc/HPtznZ2M0HOXnijqVcqzG1HckO/O/OB0/iHoIM8JZS47QqxOIN4O5dm09U5FVQYY9Tkz2+jUP2OqikAj4CDYkgNpMp561JnxYLf7YeV/ChWLEY7bGNRrT9utkyQjlvMlmIUCkQ81rV7IiVKOVO4sVdSbuKtf8EtqeeDFWwcOh42jif/1k9+VNOPfj6whrEfLnaiV8JJ1Z5UdeLnRBvTkKAikIOjtWNMyystMYha403/AFQJRaSndJtEyRj14UVQTIcCv+JC6zWq/wIrHN6y7JmPBMuoGdL/8OaJ6OGSChtErnW6W0zNiPJx8iRMy2kfW+k9jjnWKLsfYB2yK07wTxZ60w6d+pOD/BdtxL6dC1JNg== 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 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.1266.g31b7d2e469-goog