Received-SPF: pass (google.com: domain of linux-kernel+bounces-25764-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: =?iso-2022-jp?B?Tk9NVVJBIEpVTklDSEkoGyRCTG5CPCEhPV8wbBsoQik=?=
	<junichi.nomura@nec.com>
To: "kirill.shutemov@linux.intel.com" <kirill.shutemov@linux.intel.com>,
	"mingo@redhat.com" <mingo@redhat.com>, "tglx@linutronix.de"
	<tglx@linutronix.de>, "bp@alien8.de" <bp@alien8.de>,
	"dave.hansen@linux.intel.com" <dave.hansen@linux.intel.com>, "x86@kernel.org"
	<x86@kernel.org>
CC: "hpa@zytor.com" <hpa@zytor.com>, "ardb@kernel.org" <ardb@kernel.org>,
	"david@redhat.com" <david@redhat.com>, "nikunj@amd.com" <nikunj@amd.com>,
	"thomas.lendacky@amd.com" <thomas.lendacky@amd.com>, "debarbos@redhat.com"
	<debarbos@redhat.com>, "jlelli@redhat.com" <jlelli@redhat.com>,
	"lgoncalv@redhat.com" <lgoncalv@redhat.com>, "dzickus@redhat.com"
	<dzickus@redhat.com>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
Subject: [PATCH v2] x86/boot: Add a message about ignored early NMIs
Thread-Topic: [PATCH v2] x86/boot: Add a message about ignored early NMIs
Thread-Index: AQHaR5Dobycx3oYC4EWPlFRq2PJefg==
Date: Mon, 15 Jan 2024 08:57:45 +0000
Message-ID: <ZaTziftQSSg/v5Np@jeru.linux.bs1.fc.nec.co.jp>
References: <ZaEe8FC767f+sxRQ@jeru.linux.bs1.fc.nec.co.jp>
 <20240112120616.5zjojjmjeqg5egb7@box>
In-Reply-To: <20240112120616.5zjojjmjeqg5egb7@box>
Accept-Language: ja-JP, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?iso-2022-jp?B?dDl1TG1hNlRpVmU0QjhpdVpQdjllQzJnMFM5dkxzTDdXQUhLZ05vNE1w?=
 =?iso-2022-jp?B?NG9kdUNDSmVzMGFPdmQyV1hqMWFlbWxScnRiQXFnSWNGWU5XU0dNNEZa?=
 =?iso-2022-jp?B?YXJjbkpEN0pvUWtZNzlubHJ1UERJSnBUL3dVeXhNTUpDa3hqTnRENFR0?=
 =?iso-2022-jp?B?YnU1OHdUcUlaRlZ5eGVDdjZRNnVoaVVoRG5sMStYb0hQSWJXQXY2Q1pt?=
 =?iso-2022-jp?B?elZuTmdtM0IyYlNNM2JKeUxpSzRVM3l0M3ZKQUxwVG54S2ROeHhLaGwv?=
 =?iso-2022-jp?B?emNyODBoRkVZYS81ZXYzeEtBUFpYNDUyR2s2Z2NZMk9ZWERXVzlVZGpQ?=
 =?iso-2022-jp?B?cVIvV0tIQXBCSkVibEY5YnYrQU11RHBqNThJMGVSQ2R6TjJDZXFyVU5s?=
 =?iso-2022-jp?B?OTFDblNLV3N4Yy9KMVhVQ2JxTjMrN2dsblViNUV5S2UvTHpaeTJsaFhT?=
 =?iso-2022-jp?B?cUZtdGM4K3FLb29kT0pIMVk4WUFPYlRZb2xJQTRTNTNQSUwzazRxV1J0?=
 =?iso-2022-jp?B?U0dHOG9EdjQ2dkFEZ3hmVWx4TlRxN2hOVWlHeUxnQzlJamJXbXgwem9Y?=
 =?iso-2022-jp?B?MlBBWTIydlpidWxqbnFyRk56Ry82TENCRjhRcElOOVhGNGpscHZINytz?=
 =?iso-2022-jp?B?YVpMOTlscU9YcVhIdElFbFMvYkNPRHE4bGlVOVVsdU1hLzRZZWhZZkRt?=
 =?iso-2022-jp?B?dVNFNVY5a0IzZlRxN2JsMGZSRzVxYThlc1pRbUZXZ1FuNUhDT2F4T3Ev?=
 =?iso-2022-jp?B?dnZIeWhYUWN6TGxwY1h0VFdxZkVsYy9FNytYQW4vT3FTeWNnNk1qQk9K?=
 =?iso-2022-jp?B?L3hBWWtnOGltRWZ2SnJiVmFOUHl3OUZuVTNOOHUzU3J3QlRCRW5CLzNV?=
 =?iso-2022-jp?B?QnRjZDJlL3FISUM5QjJ5dVNHdDhwQ0dyTDlXaEtaeU1aK0JybXp5Z3J0?=
 =?iso-2022-jp?B?VVB3dytYNDNlRC9QTHVFalpkWkx0RUlPOUlHMitnOU9lRXhwRVNQWlhp?=
 =?iso-2022-jp?B?amJFZ2kwZHd6cTdFT1VoV1VONWFSelBqRlNaUXROTEJrZWNkQ2hmMFR1?=
 =?iso-2022-jp?B?d0hxY05NdlpGVUdxNXc0Q2ZJcU04V2FNa3NYSEFyZXMzYncxdCtPclVJ?=
 =?iso-2022-jp?B?TGdvU3VqOWtJTStTRVhZamZudTBhSmNoZVQ1YStDZEVJTllRdnh5ZHh4?=
 =?iso-2022-jp?B?eCtyVitCeEloZEViUkxSNmFCdW14YTZxR1RMQitHaG1Cc3MxL0RwZGNa?=
 =?iso-2022-jp?B?dEVoejM0UHN5RzJra2dqRitsaG5LNjNGek9qWVVoVEx3WEN2M2dXTmxq?=
 =?iso-2022-jp?B?YzlZYXR4T1I0NEFKZUo1eFRIdkVpMWFXQy92Ny9tWStuOVNsci8wS0Fy?=
 =?iso-2022-jp?B?MXVJQzJRS3JGanJ6NnJBOGF0U1JUUkZHaUMwMm1rZHFFSlVhNXptVStF?=
 =?iso-2022-jp?B?WElWNWczNjRja1JUTldITStZajAzMU13bTNoSEhyTk9VRFIzWkFOaVNI?=
 =?iso-2022-jp?B?ZFhlamo0WUdjYVhTNHU2V09RaDJRM2s5Tm9oM1pPaldUejdTNE84d20x?=
 =?iso-2022-jp?B?T3RMMi9rUlZKRlhZeldUa1QxS2ZlWGxSYjNjRUFiM0U0YzM0TmpjamEv?=
 =?iso-2022-jp?B?a2RDa3I1ekpoVkFZNGRwbXlSTVJsKzFxK1NCNm9kWEthTTNZU3B6dFJw?=
 =?iso-2022-jp?B?TElITU1DMTdpT2dJam1PcDJqL3NkTkNRODNsT2NhVEx3YUZNY085T001?=
 =?iso-2022-jp?B?OUQxOFN6OURLaDFwTUFJMFc2NnlpOUpXSUpwTXVGUldJdmFiTkJXUlJh?=
 =?iso-2022-jp?B?eGtNTFh1NWNndHF3SkJpcStuQW5zc3Q2N05ha2dtQ2UvY3FlRUNnRE11?=
 =?iso-2022-jp?B?bjRkaWFEK3IxdzBwS3kzUGhPWDVmdUYvRk1TdDczMGt2VjBRYXJLWXhp?=
 =?iso-2022-jp?B?ZEd2SjhrQ0lsNERpTHl1ckUvd3lWRFlJSkpUUkVBZ1QxSzA4a1I3WnFr?=
 =?iso-2022-jp?B?R1JGTHdBNjVSRitXbm8wN29IVGRJaWFQZGVtWDBTUHVhcFRXTVloS3Rm?=
 =?iso-2022-jp?B?ODJ5TTQrUU5zRFdtMzBhU2h6YWU3T2VGRXlNTkhyWUJmcmxIR1lwUGFw?=
 =?iso-2022-jp?B?QUNtejIwSnc3eXZJZXQ3bEVOQW9aQzBjRmlIVWEzYldKZUp2aW4zRFFI?=
 =?iso-2022-jp?B?SDkzcEJ5NHoyalFGUGlGWWZCcDBNNElaMzRhVktqNjJhZGxhb2ZuVVVY?=
 =?iso-2022-jp?B?ZXp6QnV2NVZPVjdNQjVINDlHRlNlMHQwSkxzSGZFTmdKWjBIa1F2V21m?=
 =?iso-2022-jp?B?WHd1cmkva084bFBkRWwxaVAxQWJFaExsQkE9PQ==?=
Content-Type: text/plain; charset="iso-2022-jp"
Content-ID: <A263990B1F0AA340A33305BB220CD1D8@jpnprd01.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: nec.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB8389.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 756fb568-fa2f-434f-f6e8-08dc15a80aaa
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jan 2024 08:57:45.6933
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: e67df547-9d0d-4f4d-9161-51c6ed1f7d11
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 3sd8H26Pv2AM9tTMMVdBVtlKLnttnd5ROPsDsDtberAzq1I3Ox+gdwoGeoQXDgZFHl8y1K9hiGDFCDZh7ghwDw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB9825

Commit 78a509fba9c9 ("x86/boot: Ignore NMIs during very early boot") added
empty handler in early boot stage to avoid boot failure by spurious NMIs.

Add a diagnostic message in case we need to know whether early NMIs have
occurred and/or what happened to them.

Signed-off-by: Jun'ichi Nomura <junichi.nomura@nec.com>
Suggested-by: Borislav Petkov <bp@alien8.de>
Suggested-by: H. Peter Anvin <hpa@zytor.com>
Link: https://lore.kernel.org/lkml/20231130103339.GCZWhlA196uRklTMNF@fat_cr=
ate.local/
--
v2
  * Moved variable declaration and definition to the right place
    based on comments from Kirill.
    No functional changes.

diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compre=
ssed/ident_map_64.c
--- a/arch/x86/boot/compressed/ident_map_64.c
+++ b/arch/x86/boot/compressed/ident_map_64.c
@@ -390,4 +390,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned =
long error_code)
 void do_boot_nmi_trap(struct pt_regs *regs, unsigned long error_code)
 {
 	/* Empty handler to ignore NMI during early boot */
+	spurious_nmi_count++;
 }
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/mis=
c.c
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -52,6 +52,7 @@ struct port_io_ops pio_ops;
=20
 memptr free_mem_ptr;
 memptr free_mem_end_ptr;
+int spurious_nmi_count;
=20
 static char *vidmem;
 static int vidport;
@@ -493,6 +494,12 @@ asmlinkage __visible void *extract_kernel(void *rmode,=
 unsigned char *output)
 	/* Disable exception handling before booting the kernel */
 	cleanup_exception_handling();
=20
+	if (spurious_nmi_count) {
+		error_putstr("Spurious early NMI ignored. Number of NMIs: 0x");
+		error_puthex(spurious_nmi_count);
+		error_putstr("\n");
+	}
+
 	return output + entry_offset;
 }
=20
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/mis=
c.h
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -59,6 +59,7 @@ extern char _head[], _end[];
 /* misc.c */
 extern memptr free_mem_ptr;
 extern memptr free_mem_end_ptr;
+extern int spurious_nmi_count;
 void *malloc(int size);
 void free(void *where);
 void __putstr(const char *s);=