From nobody Mon Feb 9 05:58:34 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 95A592FD675 for ; Tue, 30 Dec 2025 21:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767129236; cv=none; b=ClfC4q2bplMGO4v8Liq8LkJkpYZT8ZA9GJfudXSUsQR1lGiPn6NraPhNXz8R1pYzT0DORovZ8a/0swY8UkwbxMc8GP2BOE5HGwAEptba75hn2+uPWPWy3yZPxjWtKWAZnWssBTdSu9EM9WM8q1vWnSq6+5Yp8p3ODs6PtOdTitw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767129236; c=relaxed/simple; bh=B+4ERGzRCfw5jMwC37fXuEHs9A9jh2a1ZNa1zK4cuGQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mFVRyKN7o9M5AdWztd0voAj1aP7SLwoCIviiZb+n26uV+IXsOOVtdL+XKP4ZxslgshWo3Tt0R/GZ7is0L92Xq0ufz7HsMLMfGPthGMdsjrG01Kdxkc9LfBGDpDKGcGS0lawuOXrFvalYmd1Ff2V6r1PCDdg/OJFLxLhkkyNgGoo= 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=cfsZcIU4; arc=none smtp.client-ip=209.85.210.202 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="cfsZcIU4" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7b9321b9312so21440587b3a.1 for ; Tue, 30 Dec 2025 13:13:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767129234; x=1767734034; 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=v9BolbukkfXEm81oWgJJ+XaSPsS7Ia/w4dyAHDKHDXI=; b=cfsZcIU4Mnl4KsKMlbqWzOnkdE+yckHbKFlkok9wX2gIXDpxPPm9cgRH3WAzAo5Nwd bbpgWLa0egLVgPNviLesbRJdItivXru0K1z08vkbBOW05Fgs6JKcJjHjsCLvgbdR4oam b6NxKlm51XBZPjmFuKSD46R1p5Q71TdG3oLinGh/3tyrBIgi4hNu9qDR9aBUT2UzqaM/ yG4f9L6akK0+kqnREWATJu6FHBdmHveBgNaRBYioaLJk4N13rfTuQQtXlhch8s/YerV0 LPWPp/OmL5CTJUwsbrc7anMCl3EVqZapWKBSCSlrtIkXJ0rLY+2jkcITcRvS6ZVeKd8q BBHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767129234; x=1767734034; 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=v9BolbukkfXEm81oWgJJ+XaSPsS7Ia/w4dyAHDKHDXI=; b=Nih/KAgoU2Bx20M4hKvHOCdFiDX2JUC6twrh/4c1HieJ1kTfucAveI0rmH2iE9O5yl YdQC8EE0fphBWQuJ2Vkm87KFKKgmo2CV7drsawL2v5+N007qfnWop6MAmX7VunYnCjGv s/Xq7qx4TVrMpnHZ6Snka4TWCC56HFAiAXyiddeTKsSjK0AZtmJUSqNXVCxAGzShMHBf 7gjJGNW0wIlYMRgUCeGUXiOdNCqde/sJ20RFK1pB4aRfhLCkrFcfFi/R5Twg4ji20ZtT w59SzAs8FG4M/Ib4rtQ2aMkW835VdkUZUMNANH8/1FqZcQY8RpUodmNK70MSDhJPGjpp Sq/g== X-Forwarded-Encrypted: i=1; AJvYcCXufchiVO78kyunW+nWUo07XvXyTQ1cLWz3GvNkMYpDaJRiR9gvu/EsrA0TldqCtjzi4QO9y6PgFJ2eHfo=@vger.kernel.org X-Gm-Message-State: AOJu0YyZNTR3nJT0dqt+m1k6Ksamp5uYyRr4dDX2Gb0RyocOGQLy2U7W Gug53hnu7wCGlscQsNQxEm62K8rfGaB9zKAClqOXCEWLlaJfJZ8yuE9l1qlhjCvuRMcaGgj88F2 kKWr/9g== X-Google-Smtp-Source: AGHT+IHHfrYGaC61aPB/ea5B/ICFankJwCsUHy15saTAvrWaEpZGe7M7AgYdzFXF+BVWYJ5DWGu3cCUZQeI= X-Received: from pfez22.prod.google.com ([2002:aa7:8896:0:b0:7b7:8636:7b21]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1d0c:b0:7e8:43f5:bd23 with SMTP id d2e1a72fcca58-7ff6735eb64mr31633129b3a.56.1767129234006; Tue, 30 Dec 2025 13:13:54 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 30 Dec 2025 13:13:41 -0800 In-Reply-To: <20251230211347.4099600-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: <20251230211347.4099600-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.351.gbe84eed79e-goog Message-ID: <20251230211347.4099600-3-seanjc@google.com> Subject: [PATCH v2 2/8] KVM: SVM: Open code handling of unexpected exits in svm_invoke_exit_handler() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li Cc: kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, Jim Mattson , Yosry Ahmed Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fold svm_check_exit_valid() and svm_handle_invalid_exit() into their sole caller, svm_invoke_exit_handler(), as having tiny single-use helpers makes the code unncessarily difficult to follow. This will also allow for additional cleanups in svm_invoke_exit_handler(). No functional change intended. Suggested-by: Yosry Ahmed Reviewed-by: Yosry Ahmed Signed-off-by: Sean Christopherson Reviewed-by: Pankaj Gupta --- arch/x86/kvm/svm/svm.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index c2ddf2e0aa1a..a523011f0923 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3443,23 +3443,13 @@ static void dump_vmcb(struct kvm_vcpu *vcpu) sev_free_decrypted_vmsa(vcpu, save); } =20 -static bool svm_check_exit_valid(u64 exit_code) -{ - return (exit_code < ARRAY_SIZE(svm_exit_handlers) && - svm_exit_handlers[exit_code]); -} - -static int svm_handle_invalid_exit(struct kvm_vcpu *vcpu, u64 exit_code) -{ - dump_vmcb(vcpu); - kvm_prepare_unexpected_reason_exit(vcpu, exit_code); - return 0; -} - int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code) { - if (!svm_check_exit_valid(exit_code)) - return svm_handle_invalid_exit(vcpu, exit_code); + if (exit_code >=3D ARRAY_SIZE(svm_exit_handlers)) + goto unexpected_vmexit; + + if (!svm_exit_handlers[exit_code]) + goto unexpected_vmexit; =20 #ifdef CONFIG_MITIGATION_RETPOLINE if (exit_code =3D=3D SVM_EXIT_MSR) @@ -3478,6 +3468,11 @@ int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u= 64 exit_code) #endif #endif return svm_exit_handlers[exit_code](vcpu); + +unexpected_vmexit: + dump_vmcb(vcpu); + kvm_prepare_unexpected_reason_exit(vcpu, exit_code); + return 0; } =20 static void svm_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason, --=20 2.52.0.351.gbe84eed79e-goog