Received-SPF: pass (google.com: domain of linux-kernel+bounces-148713-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 17 Apr 2024 07:43:40 -0700
From: "H. Peter Anvin" <hpa@zytor.com>
To: Hou Wenlong <houwenlong.hwl@antgroup.com>, linux-kernel@vger.kernel.org
CC: Xin Li <xin@zytor.com>, Andy Lutomirski <luto@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
        Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org
Subject: =?US-ASCII?Q?Re=3A_=5BPATCH=5D_x86/fred=3A_Fix_incorrect_e?=
 =?US-ASCII?Q?rror_code_printout_in_fred=5Fbad=5Ftype=28=29?=
User-Agent: K-9 Mail for Android
In-Reply-To: <b2a8f0a41449d25240e314a2ddfbf6549511fb04.1713353612.git.houwenlong.hwl@antgroup.com>
References: <b2a8f0a41449d25240e314a2ddfbf6549511fb04.1713353612.git.houwenlong.hwl@antgroup.com>
Message-ID: <B04B2A1C-8FB7-4D8F-A67E-1666B6DA4E14@zytor.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable

On April 17, 2024 4:34:25 AM PDT, Hou Wenlong <houwenlong=2Ehwl@antgroup=2E=
com> wrote:
>The 'regs->orig_ax' has been invalidated to '-1' in the entry, so in the
>printout, fred_bad_type() should use the passed parameter 'error_code'=2E
>
>Fixes: 14619d912b65 ("x86/fred: FRED entry/exit and dispatch code")
>Signed-off-by: Hou Wenlong <houwenlong=2Ehwl@antgroup=2Ecom>
>---
> arch/x86/entry/entry_fred=2Ec | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/arch/x86/entry/entry_fred=2Ec b/arch/x86/entry/entry_fred=2E=
c
>index ac120cbdaaf2=2E=2E099697ba6e58 100644
>--- a/arch/x86/entry/entry_fred=2Ec
>+++ b/arch/x86/entry/entry_fred=2Ec
>@@ -28,9 +28,9 @@ static noinstr void fred_bad_type(struct pt_regs *regs,=
 unsigned long error_code
> 	if (regs->fred_cs=2Esl > 0) {
> 		pr_emerg("PANIC: invalid or fatal FRED event; event type %u "
> 			 "vector %u error 0x%lx aux 0x%lx at %04x:%016lx\n",
>-			 regs->fred_ss=2Etype, regs->fred_ss=2Evector, regs->orig_ax,
>+			 regs->fred_ss=2Etype, regs->fred_ss=2Evector, error_code,
> 			 fred_event_data(regs), regs->cs, regs->ip);
>-		die("invalid or fatal FRED event", regs, regs->orig_ax);
>+		die("invalid or fatal FRED event", regs, error_code);
> 		panic("invalid or fatal FRED event");
> 	} else {
> 		unsigned long flags =3D oops_begin();
>@@ -38,10 +38,10 @@ static noinstr void fred_bad_type(struct pt_regs *reg=
s, unsigned long error_code
>=20
> 		pr_alert("BUG: invalid or fatal FRED event; event type %u "
> 			 "vector %u error 0x%lx aux 0x%lx at %04x:%016lx\n",
>-			 regs->fred_ss=2Etype, regs->fred_ss=2Evector, regs->orig_ax,
>+			 regs->fred_ss=2Etype, regs->fred_ss=2Evector, error_code,
> 			 fred_event_data(regs), regs->cs, regs->ip);
>=20
>-		if (__die("Invalid or fatal FRED event", regs, regs->orig_ax))
>+		if (__die("Invalid or fatal FRED event", regs, error_code))
> 			sig =3D 0;
>=20
> 		oops_end(flags, regs, sig);

Acked-by: H=2E Peter Anvin (Intel) <hpa@zytor=2Ecom>