From nobody Tue Dec 16 14:39:07 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BBD630171E for ; Sat, 6 Dec 2025 00:18:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764980320; cv=none; b=Elxf0cnmGTClUWzHcl8NTO955joyz3M3Kjc83yFx3fxyFmE+/zrnh7Nv3mcdtsMUg2xFH9lKnITZxmPk6JlDjBNZKfLQau7O7q6W68gjNMwciYvZaBEXWc9NaSw8weK3XOhdGHR7fbGED58B64DxewZ+ypjuj3XebGtwwswGqeQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764980320; c=relaxed/simple; bh=idLMRNHkxj+prEIBFHlo9xwnmQGyalobOpJXM4sezD0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CRFrWqUyAyX/6Fz8Ti3B08PBjdaTFoRhUO5l/v8mpEb0xnkFe+/KQ8PdhZUzWB9kutXTJfDuVlJgm9Ly1f2Eig2pIgsG6y+XBWYYmOUqCNCiLPBarzXFVZ4XdA6rqbHoc71ykoF4ZCHQPLfyURmVh3BXZcrPfPTePSsyEBuyKj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YXuOOAK+; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YXuOOAK+" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-34378c914b4so4920841a91.1 for ; Fri, 05 Dec 2025 16:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764980317; x=1765585117; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=M6M+TUCunGgZRp0HQ274P454YeO/pMlL0Ud7LaETHp4=; b=YXuOOAK+IfYfCD1nGxvanCt5ZYGG9d5xqAYHnE+CUv0jkhfkMrKfPGFZoQnqGEHM2M l8jAkI/sJQ+LVd1/VmkGhzCCLPtB8IS3ofZBAZTLCzD328p8sur3wNpMybbXIaP7+gjt Dkt1TACMkPP6QNi5rxBUOELLFpoonof20I4dyyXyX6WL0tp/iGQRZBvrcY168s84Hf35 dt4R/6UZXH1aFsMLj1QUlA0pi/bu9e+G1cKX2ZZWgfbUIbKbcbH603+yKx5pk7c0aHWe EO68Nlz++GJRueNWyjdoNrZQNW9ajsXSY1bJwgpgIKL88pD8gPU5qFAhjVsnV3zOtZ8s Mgig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764980317; x=1765585117; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M6M+TUCunGgZRp0HQ274P454YeO/pMlL0Ud7LaETHp4=; b=EZ7iSJH6YXVqlA/VKzjQ4OI0Ua7zvIZhEbbxUj46+MU+VvyISbHkbdGvlsyYrwg1rm vf1OjT0dAZtitOUe0KC43JIY/9tutzotpYsk/Qd66e9c+p5qY+X2HJ/tA4TuZBMfP2aU p7YqtnoAjA6sspKANMuSUvImjCFWg5jxWzy95ZNro75R0anRotR3lLpTm4Lt13zA0P1W NeqlUcBlCjnoq2TuDWDXjIB0nUGaWHRzsuNYznQ0qC1jGOUDJN/q/HVnFVAV/7x3jcTr VMoLmUru2vVgthuD05TkqECQek5syokjHbOA2yHn2RHC4oY6tYI4x+QW3dUr0u7fEYTF v+xQ== X-Forwarded-Encrypted: i=1; AJvYcCWjhLtd/aJhuNrDgRPo61yAagiMxBBgC7ohwfFs0RP48/pqsW3Ih4M2L/y5T0y6x5INq7ztSkKkCNqpCuU=@vger.kernel.org X-Gm-Message-State: AOJu0YyrWROPODr1R/vh5ZMRrzaJBNgcp80cPwj8woaBAzir3lAXxbXb ckyqgxE7CVMLF4vieEcwg60uFBi+CYLMb13Op2qodEwaAq0OtlNRsYB2c20O2JIROfktkbg9ARG sUMthUA== X-Google-Smtp-Source: AGHT+IH4rM0hrWDLcj1m7KmQfI0LQhMNTOrUf9WMiZFUwgaE9DsfO2YaBs29AIBYl4bKM4D6uGtnUb5M7G0= X-Received: from pjbsb13.prod.google.com ([2002:a17:90b:50cd:b0:340:c0e9:24b6]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4c89:b0:343:6611:f21 with SMTP id 98e67ed59e1d1-349a24e3b08mr610435a91.1.1764980317071; Fri, 05 Dec 2025 16:18:37 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 5 Dec 2025 16:17:11 -0800 In-Reply-To: <20251206001720.468579-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251206001720.468579-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.223.gf5cc29aaa4-goog Message-ID: <20251206001720.468579-36-seanjc@google.com> Subject: [PATCH v6 35/44] KVM: VMX: Drop intermediate "guest" field from msr_autostore From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Xin Li , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Mingwei Zhang , Xudong Hao , Sandipan Das , Dapeng Mi , Xiong Zhang , Manali Shukla , Jim Mattson Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the intermediate "guest" field from vcpu_vmx.msr_autostore as the value saved on VM-Exit isn't guaranteed to be the guest's value, it's purely whatever is in hardware at the time of VM-Exit. E.g. KVM's only use of the store list at the momemnt is to snapshot TSC at VM-Exit, and the value saved is always the raw TSC even if TSC-offseting and/or TSC-scaling is enabled for the guest. And unlike msr_autoload, there is no need differentiate between "on-entry" and "on-exit". No functional change intended. Cc: Jim Mattson Signed-off-by: Sean Christopherson Reviewed-by: Dapeng Mi --- arch/x86/kvm/vmx/nested.c | 10 +++++----- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/vmx/vmx.h | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 729cc1f05ac8..486789dac515 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -1076,11 +1076,11 @@ static bool nested_vmx_get_vmexit_msr_value(struct = kvm_vcpu *vcpu, * VM-exit in L0, use the more accurate value. */ if (msr_index =3D=3D MSR_IA32_TSC) { - int i =3D vmx_find_loadstore_msr_slot(&vmx->msr_autostore.guest, + int i =3D vmx_find_loadstore_msr_slot(&vmx->msr_autostore, MSR_IA32_TSC); =20 if (i >=3D 0) { - u64 val =3D vmx->msr_autostore.guest.val[i].value; + u64 val =3D vmx->msr_autostore.val[i].value; =20 *data =3D kvm_read_l1_tsc(vcpu, val); return true; @@ -1167,7 +1167,7 @@ static void prepare_vmx_msr_autostore_list(struct kvm= _vcpu *vcpu, u32 msr_index) { struct vcpu_vmx *vmx =3D to_vmx(vcpu); - struct vmx_msrs *autostore =3D &vmx->msr_autostore.guest; + struct vmx_msrs *autostore =3D &vmx->msr_autostore; bool in_vmcs12_store_list; int msr_autostore_slot; bool in_autostore_list; @@ -2366,7 +2366,7 @@ static void prepare_vmcs02_constant_state(struct vcpu= _vmx *vmx) * addresses are constant (for vmcs02), the counts can change based * on L2's behavior, e.g. switching to/from long mode. */ - vmcs_write64(VM_EXIT_MSR_STORE_ADDR, __pa(vmx->msr_autostore.guest.val)); + vmcs_write64(VM_EXIT_MSR_STORE_ADDR, __pa(vmx->msr_autostore.val)); vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host.val)); vmcs_write64(VM_ENTRY_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.guest.val)); =20 @@ -2704,7 +2704,7 @@ static void prepare_vmcs02_rare(struct vcpu_vmx *vmx,= struct vmcs12 *vmcs12) */ prepare_vmx_msr_autostore_list(&vmx->vcpu, MSR_IA32_TSC); =20 - vmcs_write32(VM_EXIT_MSR_STORE_COUNT, vmx->msr_autostore.guest.nr); + vmcs_write32(VM_EXIT_MSR_STORE_COUNT, vmx->msr_autostore.nr); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.host.nr); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.guest.nr); =20 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 62ba2a2b9e98..23c92c41fd83 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -6567,7 +6567,7 @@ void dump_vmcs(struct kvm_vcpu *vcpu) if (vmcs_read32(VM_ENTRY_MSR_LOAD_COUNT) > 0) vmx_dump_msrs("guest autoload", &vmx->msr_autoload.guest); if (vmcs_read32(VM_EXIT_MSR_STORE_COUNT) > 0) - vmx_dump_msrs("guest autostore", &vmx->msr_autostore.guest); + vmx_dump_msrs("autostore", &vmx->msr_autostore); =20 if (vmentry_ctl & VM_ENTRY_LOAD_CET_STATE) pr_err("S_CET =3D 0x%016lx, SSP =3D 0x%016lx, SSP TABLE =3D 0x%016lx\n", diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index d7a96c84371f..4ce653d729ca 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h @@ -245,9 +245,7 @@ struct vcpu_vmx { struct vmx_msrs host; } msr_autoload; =20 - struct msr_autostore { - struct vmx_msrs guest; - } msr_autostore; + struct vmx_msrs msr_autostore; =20 struct { int vm86_active; --=20 2.52.0.223.gf5cc29aaa4-goog