From nobody Sat Oct 4 16:20:46 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 26D64217705 for ; Fri, 15 Aug 2025 00:26:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755217572; cv=none; b=uJ7HZjgJ8zpT3TT3WjREMC7S04wIlQ41kVN3SIS/ZQ18RW8thdW4J9fIKH+pwj5PntxqYXU2sqju2cJRkZiHv7YAme3m3d+GMokPRkZW0NToRjX2a/H8aYdp0RuCvKjbmjwpJb9waKuMDLPcK5TYKLgq37XFdqDyFBZN3oqm14o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755217572; c=relaxed/simple; bh=G23S4kNqIwEsQRVADerKeIDf6O0t9XWndToh77VNu98=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LtUUlj4vTYP7TTBw/x1qjEXkF/OBp7pC7x1ClUDgmAP7gCFDYxW+RmWCXONoVFlS1Dz77hnK71SDYJ8exkQG4lPVkzVZa5dL27XJQ2uOyv9wVv05R1J534MuVCusQQEfKyVF1CPopcIbvrQZVuFnS/GB2oAfMnn9FRxJucoM8Do= 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=hkpI39D0; arc=none smtp.client-ip=209.85.214.201 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="hkpI39D0" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2445805d386so15616735ad.1 for ; Thu, 14 Aug 2025 17:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755217570; x=1755822370; 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=b3Ex4BhCqTclsBZTxw66rQdaiSPLXQ9JFOBRn+0+cL0=; b=hkpI39D0ofWusd+rI3w88ZQ0nrnUC2GqR+bJreSPPHaJvNyhg7yNrrqjydv7o7IbVl JGK3U6jH+sb8I+fSCifZvrgBDWaFFYgIUqC7Q7uTrSFFttReFNi5v+rpQthnNGtDEa3r f7fFcGr9ec48l4ruCClv1/IQe08Jpfy3RKljYA6EjLhPwpeN4cjNDFtQZPYNfAFMSB9U RuG5/xtQS8QVL7rr2tn3BRvRyZnOEX8mmnlVYcNll6Us2sgpZog58fSf86uNAejZpZg9 fLzUvgDkaZ0o1oXVlNm+lGT53svwHEYMQDxM+p256VTDdPQet7aND3KetAISqSgbMELv zoYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755217570; x=1755822370; 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=b3Ex4BhCqTclsBZTxw66rQdaiSPLXQ9JFOBRn+0+cL0=; b=sYBRg5r32mIe9eFOZwQoCqoRVmtiiaQ6sROxtN+fWGvvsUyyOb8fOamXUhqiIXJoSQ rCsIXXMFwLkrzEY66fPL3Re3luhGPP9MNLTaLb+1X2mh0KHZeKrhjhz7eIcG4pxAaPbv fm7usI9ztJWABRQMgfeU0G3EgRuVUEvIJADxgKpWN137h8ygxyfKITgDxM3GaUCbEQm8 18bqY9az2zRi/OFmpZpsuoTHKtmpZxdPuz2rTF2U1U7mxlOKzwrIaEW3kABHEPrQzCsX R87cA7n8X1xl5fLGdA5OS8sCXuEKJy1rbLxpl/ay0HFdnxoDZj0pfOo+G3JC/L6tbW5Q 7Bbw== X-Forwarded-Encrypted: i=1; AJvYcCX67LZeXvnc8ugRprIgqU/qGIr3UDAcdQoLRjTgSOEqAeowkIC/PM5hdOWcrzcZfDzk2JDeDV62YvTmAcg=@vger.kernel.org X-Gm-Message-State: AOJu0YxjQZeBIuTkIITYJ02pR70fzmZsaIPpfz8MSKxkU8l3rY9gxEol 6qW3GWgbWNKwUcasFpBxv++HIIX5WbOCB1qQlEd7Mi+O/7RDOe1+JEgascjyMuxCEy9pWajOrM4 dhkh14Q== X-Google-Smtp-Source: AGHT+IEVbOY5aRbEI6Ttg/wSMQ7ASZVe+c20PkZNWtxZFSYT5D7jsz8719NZTSboYv5vr3CpWFkKtdeI4mE= X-Received: from plhq10.prod.google.com ([2002:a17:903:11ca:b0:23f:fd13:e74d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f708:b0:234:c8ec:51b5 with SMTP id d9443c01a7336-2446d9a0045mr1553265ad.53.1755217570536; Thu, 14 Aug 2025 17:26:10 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 14 Aug 2025 17:25:34 -0700 In-Reply-To: <20250815002540.2375664-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: <20250815002540.2375664-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.rc1.163.g2494970778-goog Message-ID: <20250815002540.2375664-15-seanjc@google.com> Subject: [PATCH 6.6.y 14/20] KVM: x86: Convert vcpu_run()'s immediate exit param into a generic bitmap From: Sean Christopherson To: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" [ Upstream commit 2478b1b220c49d25cb1c3f061ec4f9b351d9a131 ] Convert kvm_x86_ops.vcpu_run()'s "force_immediate_exit" boolean parameter into an a generic bitmap so that similar "take action" information can be passed to vendor code without creating a pile of boolean parameters. This will allow dropping kvm_x86_ops.set_dr6() in favor of a new flag, and will also allow for adding similar functionality for re-loading debugctl in the active VMCS. Opportunistically massage the TDX WARN and comment to prepare for adding more run_flags, all of which are expected to be mutually exclusive with TDX, i.e. should be WARNed on. No functional change intended. Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250610232010.162191-3-seanjc@google.com Signed-off-by: Sean Christopherson [sean: drop TDX crud, account for lack of kvm_x86_call()] Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 6 +++++- arch/x86/kvm/svm/svm.c | 4 ++-- arch/x86/kvm/vmx/vmx.c | 3 ++- arch/x86/kvm/x86.c | 10 ++++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index 8898ad8cb3de..aa6d04cd9ee6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1550,6 +1550,10 @@ static inline u16 kvm_lapic_irq_dest_mode(bool dest_= mode_logical) return dest_mode_logical ? APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL; } =20 +enum kvm_x86_run_flags { + KVM_RUN_FORCE_IMMEDIATE_EXIT =3D BIT(0), +}; + struct kvm_x86_ops { const char *name; =20 @@ -1625,7 +1629,7 @@ struct kvm_x86_ops { =20 int (*vcpu_pre_run)(struct kvm_vcpu *vcpu); enum exit_fastpath_completion (*vcpu_run)(struct kvm_vcpu *vcpu, - bool force_immediate_exit); + u64 run_flags); int (*handle_exit)(struct kvm_vcpu *vcpu, enum exit_fastpath_completion exit_fastpath); int (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 4a53b38ea386..61e5e261cde2 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4197,9 +4197,9 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vc= pu *vcpu, bool spec_ctrl_in guest_state_exit_irqoff(); } =20 -static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, - bool force_immediate_exit) +static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_f= lags) { + bool force_immediate_exit =3D run_flags & KVM_RUN_FORCE_IMMEDIATE_EXIT; struct vcpu_svm *svm =3D to_svm(vcpu); bool spec_ctrl_intercepted =3D msr_write_intercepted(vcpu, MSR_IA32_SPEC_= CTRL); =20 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 704e5a552b4f..065aac2f4bce 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7345,8 +7345,9 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vc= pu *vcpu, guest_state_exit_irqoff(); } =20 -static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu, bool force_immediate= _exit) +static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags) { + bool force_immediate_exit =3D run_flags & KVM_RUN_FORCE_IMMEDIATE_EXIT; struct vcpu_vmx *vmx =3D to_vmx(vcpu); unsigned long cr3, cr4; =20 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 44784ad244c6..342e666a0d13 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10518,6 +10518,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) dm_request_for_irq_injection(vcpu) && kvm_cpu_accept_dm_intr(vcpu); fastpath_t exit_fastpath; + u64 run_flags; =20 bool req_immediate_exit =3D false; =20 @@ -10750,8 +10751,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) goto cancel_injection; } =20 - if (req_immediate_exit) + run_flags =3D 0; + if (req_immediate_exit) { + run_flags |=3D KVM_RUN_FORCE_IMMEDIATE_EXIT; kvm_make_request(KVM_REQ_EVENT, vcpu); + } =20 fpregs_assert_state_consistent(); if (test_thread_flag(TIF_NEED_FPU_LOAD)) @@ -10787,7 +10791,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) WARN_ON_ONCE((kvm_vcpu_apicv_activated(vcpu) !=3D kvm_vcpu_apicv_active(= vcpu)) && (kvm_get_apic_mode(vcpu) !=3D LAPIC_MODE_DISABLED)); =20 - exit_fastpath =3D static_call(kvm_x86_vcpu_run)(vcpu, req_immediate_exit= ); + exit_fastpath =3D static_call(kvm_x86_vcpu_run)(vcpu, run_flags); if (likely(exit_fastpath !=3D EXIT_FASTPATH_REENTER_GUEST)) break; =20 @@ -10799,6 +10803,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) break; } =20 + run_flags =3D 0; + /* Note, VM-Exits that go down the "slow" path are accounted below. */ ++vcpu->stat.exits; } --=20 2.51.0.rc1.163.g2494970778-goog