Received-SPF: pass (google.com: domain of linux-kernel+bounces-49159-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: =?iso-2022-jp?B?Tk9NVVJBIEpVTklDSEkoGyRCTG5CPCEhPV8wbBsoQik=?=
	<junichi.nomura@nec.com>
To: "x86@kernel.org" <x86@kernel.org>, "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>
CC: "hpa@zytor.com" <hpa@zytor.com>, "ardb@kernel.org" <ardb@kernel.org>,
	"david@redhat.com" <david@redhat.com>, "debarbos@redhat.com"
	<debarbos@redhat.com>, "dzickus@redhat.com" <dzickus@redhat.com>,
	"jlelli@redhat.com" <jlelli@redhat.com>,
	=?iso-2022-jp?B?Tk9NVVJBIEpVTklDSEkoGyRCTG5CPCEhPV8wbBsoQik=?=
	<junichi.nomura@nec.com>, "kirill.shutemov@linux.intel.com"
	<kirill.shutemov@linux.intel.com>, "lgoncalv@redhat.com"
	<lgoncalv@redhat.com>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, "nikunj@amd.com" <nikunj@amd.com>,
	"thomas.lendacky@amd.com" <thomas.lendacky@amd.com>
Subject: [PATCH 2/2] x86/boot: Add a message about ignored early NMIs
Thread-Topic: [PATCH 2/2] x86/boot: Add a message about ignored early NMIs
Thread-Index: AQHaVYsrpr7GWJLGak6aXYXtjEM3tQ==
Date: Fri, 2 Feb 2024 03:51:58 +0000
Message-ID: <20240202035052.17963-2-junichi.nomura@nec.com>
References: <20240202035052.17963-1-junichi.nomura@nec.com>
In-Reply-To: <20240202035052.17963-1-junichi.nomura@nec.com>
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?RlR2cHErN2JLaW41RHZOY3R3cGRzZzA4MWZuWndwNlgvS1R1bjdoUjMy?=
 =?iso-2022-jp?B?eW00ajZHY25UMXBMQ2xjRWpFTUVoQjJJcVk1VkxQVUE2QzB4eU1UN0U0?=
 =?iso-2022-jp?B?U3EzU3dzaFhRUGZNaGZGa0JhTXBuTVRCVFhIMXpVMFJRQlZQZHE2djRn?=
 =?iso-2022-jp?B?ZWF1MmJUOXpTVDl1TzVTZzFKdFdtTkJnUis5ZndOb0YwQWRXZk9NMFA5?=
 =?iso-2022-jp?B?Y1lvMDFFcEVKd2hyZVZrdVk4MnJDVE9PNnd2WE1nWnQ5cDhBbnFUTWto?=
 =?iso-2022-jp?B?VHQzdmxhU3dsWk0xcTRUV0gxSmxhUGx4SG52U2ZqdDZJeUNmMGlLN1lO?=
 =?iso-2022-jp?B?d0JoZkpBL3BnOFVSZGRtQ3hrY0dNdUY1UU9KcEZjRERVK3Ryd0FiTnN3?=
 =?iso-2022-jp?B?MWtJUlY0VnhOVWRyWTdlY0VKcVRWclAxNTJYZ1JQR0kvVDIvWFNQaGFr?=
 =?iso-2022-jp?B?YUFHSXN5OUJLbU1QY0kwWk5vZGxqeW5KdkZDdllZS09IdGZhZUFPVmdZ?=
 =?iso-2022-jp?B?anVmS1FLR3EyZFdMWTB1V3pVUVhxRDA1VlBYZjgrUWZadVc2SFZCL1dM?=
 =?iso-2022-jp?B?ZW1hM1RSUFVScG4vV1Mvd3JJL1dnaDg0L2RtQzkycERHKzhiR3NFcHpS?=
 =?iso-2022-jp?B?ZXg3dW1UVGtoWHRhekZJU0lvNE0yWFVzMDdZR3BhSHh5UllBV0ZRcDYr?=
 =?iso-2022-jp?B?YXFpTDNaY2d0d05YSG9mVEZueUxVczhIUnVOUjNIb0RNdHlmYVRrajhR?=
 =?iso-2022-jp?B?TDdCSngyZk1LU01qV2RMdEZRa1lZeEpVN1pIMjQ1WXFSc1psbTlibUhi?=
 =?iso-2022-jp?B?aDU3WVp1aVlnK2VuRVdrSHdlaW5aeFBtb0dFMUtKcnZYSnpKWlRJRUpv?=
 =?iso-2022-jp?B?Mjh1RnZ5dzFQNXVkMG9HVkZPaHY4Q1duL2pEaEs4Y3hOSVpiUWNlajdL?=
 =?iso-2022-jp?B?ZVd3K0ZOSWh3WDJxcURlUGpjOEY5aDA5N0J2SzhIOXNZK0F5MVhiY1dw?=
 =?iso-2022-jp?B?YlJMU2RncTRPdERYUFh4OThjMHNGOHVKeGYzOTZlV1A4SE80OUNIdTk2?=
 =?iso-2022-jp?B?V1ducVlPQVdsUTgzckV2REx6TkNvazdXcmJCRG5sdWNNWldzQkhnVHl0?=
 =?iso-2022-jp?B?WENBT2Nzd3VjTHJjQUg1Z1V1QWd5VU5QSndFVTlpNWpieGU3QU85RFNn?=
 =?iso-2022-jp?B?RnZoaVJyUUxxSStkV3pCOGozRTN2aUhOVG5uOVV5OVRsbTVSUWpPZFJp?=
 =?iso-2022-jp?B?MTJ0TWRtWmxKQW9XaU0vaTBjQkRvQVU1K083NWNWS3BTUkdYZVBac3g2?=
 =?iso-2022-jp?B?aXpONlp6VzZZQW1YejhINnJoZElCZG93RjBKbGJsdWhORURuY2tiT08w?=
 =?iso-2022-jp?B?cmVJNGRqNEZXWEVhT3FvempoNXRzR0o3RlN5VFh1K283cE5Sak82dDJG?=
 =?iso-2022-jp?B?eCtCWjFGRTVSdEtwNmVpd2tGUnhHWFZlc3daSmdRTlhydHVMZlZkS2FI?=
 =?iso-2022-jp?B?SHIwWFRLTzBiSkZCcHoyU3BmNTRkdnEyejlPMHlKTzhJNzhISDdlSUgr?=
 =?iso-2022-jp?B?YSthNktxd0cwcW9rZTJHYjhIRUczZ2dMT0k3RkYvaE9GZENGckhPYk1Y?=
 =?iso-2022-jp?B?S09LaEJLa2RQUklzNTFLM2s0am5WUmh0Yk1RVEEvTGNocU9kRTA2T1Yx?=
 =?iso-2022-jp?B?bUwvQ2ZOUVIya0dJcUo0OGJpY3FzS2xHa2luL05SMnloRU9YSGFGazND?=
 =?iso-2022-jp?B?ZFVydFI5b0NmMFhWWWNUNUN5R3ZwSHVnUWdpUVI3YW1naHNxVEl6Z2Ru?=
 =?iso-2022-jp?B?c1VWNnhGVGJ0WnhGaEdIRjlwaXJOSldOT204cUZkTnlvS3NXVG1lUlE2?=
 =?iso-2022-jp?B?V3Bxak56MjRtTDhhT2pGSDAxRHR4NTdKYWlidEtxSXJhWkdSVm0wMGUz?=
 =?iso-2022-jp?B?RUNKTFRkejJWSDdQdXMwTzlTd21pbnQvS2NFemlsdC8raWR4WFJrM1A2?=
 =?iso-2022-jp?B?YnhleEhvQmJvUXN1ZU8yT0JaMTNTWWtianVteWE0c25YaFp6MGNKZXNy?=
 =?iso-2022-jp?B?Ylg1a2wza3RDdnU4ejlNQ2xCcjdVTHlLM3g3akZiQzJkbG02cHU4WDFX?=
 =?iso-2022-jp?B?MXpzcmxiTkQzY21KanlTQzNjK2lzc3VJbHZnSnNtdWlscnQ5ZTY4azRa?=
 =?iso-2022-jp?B?YVptNjFKM1VMcXprbFBWZTlQalZaUnQ0Ym5IZGV1K2ZZQUpNSVZEYy9G?=
 =?iso-2022-jp?B?dktVdW5lK2MrZy9YN3hKcWQwYjR2VHJNUXkyZjgzR0tmK0k1MlFRZW5B?=
 =?iso-2022-jp?B?QWtraW9NNTg0SU5wTmN3OFV6ZUlYSTZZTlE9PQ==?=
Content-Type: text/plain; charset="iso-2022-jp"
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: 6e7ef16f-48bb-4fb9-a587-08dc23a24e2b
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2024 03:51:58.2669
 (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: HLBMSTtYGYQheOBPecpCMHr7lvDT2Kpzjx7NTOReskv2pa12CydL9BJEg+wmuT3yxzsozvELndgRErno3acYCw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS7PR01MB11820

Commit

  78a509fba9c9 ("x86/boot: Ignore NMIs during very early boot")

added an empty handler in early boot stage to avoid boot failure due to
spurious NMIs.

Add a diagnostic message to show when early NMIs have occurred and/or
what happened to them.

  [ bp: Touchups. ]

Suggested-by: Borislav Petkov <bp@alien8.de>
Suggested-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Jun'ichi Nomura <junichi.nomura@nec.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.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.
v3
  * Removed comment and updated message in the NMI handler.
  * Use error_putdec() helper.

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
@@ -389,5 +389,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned =
long error_code)
=20
 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 NMIs ignored: ");
+		error_putdec(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);=