From nobody Thu Dec 18 11:49:17 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 25DF41C5F22 for ; Mon, 13 Jan 2025 20:02:22 +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=1736798544; cv=none; b=YBj9GFZymHtUaiHaFXBhTZRpPqaWZPMDHm3+RXyMGSFV10GSjPtTjYb05lo3T0EPQ6seS8WSvU2GxoVJv2G5flXQ4soB8ktUzugrUIJjdlaIfE1cD6xEAd9DtqJl8PrGa1FFImq87VBjYnhohIFw0hwEjdGrP2rtXahx2YXIX1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736798544; c=relaxed/simple; bh=YTs1dpjXQrZJaO2PwxhJPmloP3yUD+EWIBykta6id/w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nM7cRfR70K9ahl1Jhjc+wk4qtF3VzvA8vpkROxrHkir+ebJJzOrtY9YaJy8HfLVboUUXun2Hpd1E+e8aQLAqo+yQUI5cebjeX9y039y3oE3LJEMz80biA8bA6qn4wDlZvGWNkit3oLwiVx1gXD4fuVTfApdDjk0eeKSGNfKMm6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jmattson.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=t4f2V5Zr; 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--jmattson.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="t4f2V5Zr" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ee46799961so12207832a91.2 for ; Mon, 13 Jan 2025 12:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736798542; x=1737403342; darn=vger.kernel.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=jtdiVJ+ztNcHT3qzoC9fhmElHCLjwxZM/dCdTnmBzy4=; b=t4f2V5Zr4iBGFF9WlJe0/K6br7MzjYP3IYzlAVFP+74J1puELYyJGrCNyAjIaaUGAA uyqnenenPXmxIkCpx7MC4J9I90ryL8A1v7w5eXLhyLXkkxtH7JED76uukqOYoDsdEcoH Sjzsshod8jpm7VTySOo3y9mUZ9bfGHmb4bGUgnbKc32VJO6ZBASa7BgXZ5xjny/RwBs5 NIUlkSwlvmop6wYCkFZbRuHEs2Y2HWC1uHAfmcr8LES13N5+UVrek6kjxmwWGsoPM7TZ 4Qt3fJbdk6AwkcgPYzCD1e4Aja2wy408gQhRMa4i6/l1UI26ItfnPy2zXd5vDc6s0xOG 5CbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736798542; x=1737403342; 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=jtdiVJ+ztNcHT3qzoC9fhmElHCLjwxZM/dCdTnmBzy4=; b=lZ7LFnekwRm88JXzOLU+LhUXWzS5nFUD7F52RnS0zyrTpd2G4rEbloNuvoK19lfM77 Cj7zvcVkjpWVAvm1a67laP68JBLBp//qU99xCXNILMDW+36EbdoDYkRlYmEZiQuteZUb mEwVM9rIqATozpJKHq6PoZ/HuSIKz0wGbzfDk+V07Nrp135yGFONf/ytAix4DPTHtz/e VX1qF4UjkIknPNhHVqaWE2m5Kg5J5p50c0Lb5in26+X7W6yqtAQDwz5JyBGWiB8Bnk3k /T5/Gp9sNywRNqhVtzx+XWFzSCsecv8iqzG6MSJJFzkvo4XD6i2Qnpc3XA/C4vRQKci6 3/KQ== X-Forwarded-Encrypted: i=1; AJvYcCWsF7LFM+NOhtilRFdyOQrKfZdmN7R6CSh8oHACTMgR8K1kfWH4UIWcVXSSHJPCE4zbhyaIm320tmBp9Sc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5L+gdUoBuvTAT1A/KK+O43qGXwIEX7x43h73Cj0ZvLH/VQo5i yrC5cWFDVMd+YXcXb4X8/WbBpnGniOvJrmUuhou7bhoDKwrOaAudKI6hmWaXxSTjEKMGG4UImRN 4NaB2BQFk4g== X-Google-Smtp-Source: AGHT+IGRDP+dLbZYnL6SPBzmcxG2KKCHdES/kfIarY6JU5nffIgg/+20LS/dSG2aIOK4rzFmwsSpg55z3V3Ilw== X-Received: from pfiy3.prod.google.com ([2002:a05:6a00:1903:b0:72b:ccb:c99b]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4fd3:b0:72a:83ec:b1c9 with SMTP id d2e1a72fcca58-72d21f35ae3mr31398282b3a.6.1736798542485; Mon, 13 Jan 2025 12:02:22 -0800 (PST) Date: Mon, 13 Jan 2025 12:01:43 -0800 In-Reply-To: <20250113200150.487409-1-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250113200150.487409-1-jmattson@google.com> X-Mailer: git-send-email 2.47.1.688.g23fc6f90ad-goog Message-ID: <20250113200150.487409-2-jmattson@google.com> Subject: [PATCH 1/2] KVM: x86: Introduce kvm_set_mp_state() From: Jim Mattson To: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , David Woodhouse , Paul Durrant , Gleb Natapov , Raghavendra K T , Suzuki Poulose , Srivatsa Vaddagiri , Jan Kiszka , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jim Mattson Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace all open-coded assignments to vcpu->arch.mp_state with calls to a new helper, kvm_set_mp_state(), to centralize all changes to mp_state. No functional change intended. Signed-off-by: Jim Mattson --- arch/x86/kvm/lapic.c | 6 +++--- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/sev.c | 4 ++-- arch/x86/kvm/vmx/nested.c | 4 ++-- arch/x86/kvm/x86.c | 17 ++++++++--------- arch/x86/kvm/x86.h | 5 +++++ arch/x86/kvm/xen.c | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 3c83951c619e..bfbc4bc70595 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -3392,9 +3392,9 @@ int kvm_apic_accept_events(struct kvm_vcpu *vcpu) if (test_and_clear_bit(KVM_APIC_INIT, &apic->pending_events)) { kvm_vcpu_reset(vcpu, true); if (kvm_vcpu_is_bsp(apic->vcpu)) - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); else - vcpu->arch.mp_state =3D KVM_MP_STATE_INIT_RECEIVED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_INIT_RECEIVED); } if (test_and_clear_bit(KVM_APIC_SIPI, &apic->pending_events)) { if (vcpu->arch.mp_state =3D=3D KVM_MP_STATE_INIT_RECEIVED) { @@ -3403,7 +3403,7 @@ int kvm_apic_accept_events(struct kvm_vcpu *vcpu) sipi_vector =3D apic->sipi_vector; kvm_x86_call(vcpu_deliver_sipi_vector)(vcpu, sipi_vector); - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); } } return 0; diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index b708bdf7eaff..f47906fd9b03 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -994,7 +994,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) kvm_clear_request(KVM_REQ_GET_NESTED_STATE_PAGES, vcpu); =20 /* in case we halted in L2 */ - svm->vcpu.arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); =20 /* Give the current vmcb to the guest */ =20 diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 943bd074a5d3..b4d9efd7537d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3831,7 +3831,7 @@ static int __sev_snp_update_protected_guest_state(str= uct kvm_vcpu *vcpu) =20 /* Mark the vCPU as offline and not runnable */ vcpu->arch.pv.pv_unhalted =3D false; - vcpu->arch.mp_state =3D KVM_MP_STATE_HALTED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_HALTED); =20 /* Clear use of the VMSA */ svm->vmcb->control.vmsa_pa =3D INVALID_PAGE; @@ -3870,7 +3870,7 @@ static int __sev_snp_update_protected_guest_state(str= uct kvm_vcpu *vcpu) =20 /* Mark the vCPU as runnable */ vcpu->arch.pv.pv_unhalted =3D false; - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); =20 svm->sev_es.snp_vmsa_gpa =3D INVALID_PAGE; =20 diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index aa78b6f38dfe..d53bf4a5ad99 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3791,7 +3791,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool= launch) break; case GUEST_ACTIVITY_WAIT_SIPI: vmx->nested.nested_run_pending =3D 0; - vcpu->arch.mp_state =3D KVM_MP_STATE_INIT_RECEIVED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_INIT_RECEIVED); break; default: break; @@ -5055,7 +5055,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_= exit_reason, vmx->nested.need_vmcs12_to_shadow_sync =3D true; =20 /* in case we halted in L2 */ - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); =20 if (likely(!vmx->fail)) { if (vm_exit_reason !=3D -1) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c79a8cc57ba4..d6679df95a75 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -11208,8 +11208,7 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu) case KVM_MP_STATE_HALTED: case KVM_MP_STATE_AP_RESET_HOLD: vcpu->arch.pv.pv_unhalted =3D false; - vcpu->arch.mp_state =3D - KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); fallthrough; case KVM_MP_STATE_RUNNABLE: vcpu->arch.apf.halted =3D false; @@ -11288,7 +11287,7 @@ static int __kvm_emulate_halt(struct kvm_vcpu *vcpu= , int state, int reason) if (kvm_vcpu_has_events(vcpu)) vcpu->arch.pv.pv_unhalted =3D false; else - vcpu->arch.mp_state =3D state; + kvm_set_mp_state(vcpu, state); return 1; } else { vcpu->run->exit_reason =3D reason; @@ -11804,10 +11803,10 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vc= pu *vcpu, goto out; =20 if (mp_state->mp_state =3D=3D KVM_MP_STATE_SIPI_RECEIVED) { - vcpu->arch.mp_state =3D KVM_MP_STATE_INIT_RECEIVED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_INIT_RECEIVED); set_bit(KVM_APIC_SIPI, &vcpu->arch.apic->pending_events); } else - vcpu->arch.mp_state =3D mp_state->mp_state; + kvm_set_mp_state(vcpu, mp_state->mp_state); kvm_make_request(KVM_REQ_EVENT, vcpu); =20 ret =3D 0; @@ -11934,7 +11933,7 @@ static int __set_sregs_common(struct kvm_vcpu *vcpu= , struct kvm_sregs *sregs, if (kvm_vcpu_is_bsp(vcpu) && kvm_rip_read(vcpu) =3D=3D 0xfff0 && sregs->cs.selector =3D=3D 0xf000 && sregs->cs.base =3D=3D 0xffff0000 = && !is_protmode(vcpu)) - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); =20 return 0; } @@ -12237,9 +12236,9 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) kvm_gpc_init(&vcpu->arch.pv_time, vcpu->kvm); =20 if (!irqchip_in_kernel(vcpu->kvm) || kvm_vcpu_is_reset_bsp(vcpu)) - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); else - vcpu->arch.mp_state =3D KVM_MP_STATE_UNINITIALIZED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_UNINITIALIZED); =20 r =3D kvm_mmu_create(vcpu); if (r < 0) @@ -13459,7 +13458,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *v= cpu, } =20 vcpu->arch.apf.halted =3D false; - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); } =20 void kvm_arch_async_page_present_queued(struct kvm_vcpu *vcpu) diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index ec623d23d13d..bc3b5a9490c6 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -121,6 +121,11 @@ static inline bool kvm_vcpu_has_run(struct kvm_vcpu *v= cpu) return vcpu->arch.last_vmentry_cpu !=3D -1; } =20 +static inline void kvm_set_mp_state(struct kvm_vcpu *vcpu, int mp_state) +{ + vcpu->arch.mp_state =3D mp_state; +} + static inline bool kvm_is_exception_pending(struct kvm_vcpu *vcpu) { return vcpu->arch.exception.pending || diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index a909b817b9c0..f65ca27888e9 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -1480,7 +1480,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcp= u, bool longmode, set_bit(vcpu->vcpu_idx, vcpu->kvm->arch.xen.poll_mask); =20 if (!wait_pending_event(vcpu, sched_poll.nr_ports, ports)) { - vcpu->arch.mp_state =3D KVM_MP_STATE_HALTED; + kvm_set_mp_state(vcpu, KVM_MP_STATE_HALTED); =20 if (sched_poll.timeout) mod_timer(&vcpu->arch.xen.poll_timer, @@ -1491,7 +1491,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcp= u, bool longmode, if (sched_poll.timeout) del_timer(&vcpu->arch.xen.poll_timer); =20 - vcpu->arch.mp_state =3D KVM_MP_STATE_RUNNABLE; + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); } =20 vcpu->arch.xen.poll_evtchn =3D 0; --=20 2.47.1.688.g23fc6f90ad-goog