From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 BA315328B4D for ; Thu, 13 Nov 2025 22:56:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763074599; cv=none; b=HAlsip35k2woJ5HrImiuBVBfcESe4QXGAdJQFhCApiI/KTZGkmatEOnRpuXh71dE3QfjUs972FRx3LEjRE0TzZKrUnveqoUNlmwxbCxWKKn00hXJwD11QyEpwyrDkdOnW0MiDUT5Pr4XmgJfaLgPAHITDxuz3G2s0pq8CMy1Wr0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763074599; c=relaxed/simple; bh=0CIm1vKKJY5ZLYOu6NiJGAw93xER85gCl/NfVvEElD0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XcH4oOjrVAlivgx3nGVuVcNZ0koM8qpUFftP01uzRCCbjBMz4mLKkcgZiG9jBdI7y55Sj+SfaGMK/b3e421f4WWgeOzMGSNzGzMqUzxGw/AA1eEhf0AxG0HviTKEM1nKD4RNN2fLsYgKobS1MSQ/IkS9ShucA4ISg1X1cIatE2Y= 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=AocFHH2/; arc=none smtp.client-ip=209.85.215.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="AocFHH2/" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b630753cc38so2977952a12.1 for ; Thu, 13 Nov 2025 14:56:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763074597; x=1763679397; 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=YmRUHznDSpJK0xelbJUhvMx/o3h12zh1VqONC/F/8SI=; b=AocFHH2/3i7UUnauc5KbKfhWgajO9G6MONneNdnFsln9FCxkri3F30Z3aIIzm0Xbvj 62MRjHQwwRnwRpwRq72YNwQIZahjCCCZ5mpXLZeX1pJ3vTuf/1oxNYgAVwreDDzT0dzn VP8M9YdLA6/p6SqkO2dZMB7KglcDUPFIIb78ffTYp+BJzV6nOleUQ/n547x2B9umQNF2 P//eZacShUgtNDAak0qSyvCOFbo+N5HXZ/RtvFZFofMGlFnqwO0ZYU3BMl5e2B4fl5GN Z0Wg5XK4nAwCkuaGRoExRtpJavLJ0MyJ3GSSQkuAZDrR6veAI9LgY3ixlg3G7HGlCiNz ytVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763074597; x=1763679397; 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=YmRUHznDSpJK0xelbJUhvMx/o3h12zh1VqONC/F/8SI=; b=JMJzd/yJJRQIJNX5BtoSXb0KWjagu1Sjy+tPaCn1uK1qddPLhJWK31j8CW3kLK7veP opC8nIITu+4QINkbf9IA+TR6Bblect13AsKatgvLaStR7+M7iAYN2GJCxmKAtHtEThGF ZQq/I9N4ZYyCpAnnVPXJSXpggAGB/EFZxiDqSc+NEIXNPMdYhRoXvN+kkXoDSiCSYxGM AeRRga9FafXsD32rZoX+Q8VU1CTIRuyRRDl3bMxx02fIHAXKToKkzpP+2XraoBnHdR6i L4oTkx37GiGvsTQvEWMbI/bKgpH++CBmetYDrA+N90xW4KVXAEPaUR+1e9VIXk3Ld+w8 Xpxg== X-Forwarded-Encrypted: i=1; AJvYcCXt/6AfvyzXE9W6CIROAaTSEJwK5hL4aL1cj9+hpT+nTMb8g8sXzg8C6jU4ieImkVzsT3DLuTys6U1IZQM=@vger.kernel.org X-Gm-Message-State: AOJu0YwjaNKj+2PqOX8axmXfofOqCQmkCnzMe1gMFucgyQOdGRNHuqkh +ETEsqjgqmhGz7k45PW+dH7EOWWUmSdOkkNQN96nBuLwEjHrofNJbbSgyax3xJC2P+XziLgiyRm 5Kmmuag== X-Google-Smtp-Source: AGHT+IHtz3Opt/igSZsRzu0/BD9t+30LNZaNdqDEY5l03VcfbOrCZ8LxD69Ny8ODDjVmq8xM/VyGmM41VdQ= X-Received: from pllb17.prod.google.com ([2002:a17:902:e951:b0:268:c82:4230]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:18b:b0:295:8c51:6505 with SMTP id d9443c01a7336-2986a741aaemr6849745ad.33.1763074596938; Thu, 13 Nov 2025 14:56:36 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 13 Nov 2025 14:56:17 -0800 In-Reply-To: <20251113225621.1688428-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-hyperv@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251113225621.1688428-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251113225621.1688428-6-seanjc@google.com> Subject: [PATCH 5/9] KVM: SVM: Check for an unexpected VM-Exit after RETPOLINE "fast" handling From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui Cc: kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, Jim Mattson , Yosry Ahmed Content-Type: text/plain; charset="UTF-8" Check for an unexpected/unhandled VM-Exit after the manual RETPOLINE=y handling. The entire point of the RETPOLINE checks is to optimize for common VM-Exits, i.e. checking for the rare case of an unsupported VM-Exit is counter-productive. This also aligns SVM and VMX exit handling. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 638a67ef0c37..202a4d8088a2 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3435,12 +3435,6 @@ static void dump_vmcb(struct kvm_vcpu *vcpu) int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code) { - if (exit_code >= ARRAY_SIZE(svm_exit_handlers)) - goto unexpected_vmexit; - - if (!svm_exit_handlers[exit_code]) - goto unexpected_vmexit; - #ifdef CONFIG_MITIGATION_RETPOLINE if (exit_code == SVM_EXIT_MSR) return msr_interception(vcpu); @@ -3457,6 +3451,12 @@ int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code) return sev_handle_vmgexit(vcpu); #endif #endif + if (exit_code >= ARRAY_SIZE(svm_exit_handlers)) + goto unexpected_vmexit; + + if (!svm_exit_handlers[exit_code]) + goto unexpected_vmexit; + return svm_exit_handlers[exit_code](vcpu); unexpected_vmexit: -- 2.52.0.rc1.455.g30608eb744-goog