From nobody Thu Apr 2 04:22:54 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADB9A365A12 for ; Tue, 31 Mar 2026 02:15:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774923330; cv=none; b=u2joBGJvhGFKK4sUuEKCBIXs/7ir2Hme24saudrkUaThMOiYhPNRRURfQskaJVbmJYCc68zUrgaM+M+AJbGFHJv0K2RewjxgxkC1J16nZZb/asFh3+6/eihfYjyaiT2B0fIOKfORm5SIRVvhLcmdrN6hB5USl3mUqC2aG6NpIxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774923330; c=relaxed/simple; bh=izHRzXJgV7CxACyoH4KHjGpZsKjWF7DOxEVlUNzWCvQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nwa//zVZ8tXH2xmLPwJZPwgEbhlvIf9Cww+sh881k3vNoC84t8O8ke9t2hum4gn5GPljlkjkebhO6OEKSeSLCiNzU8nKfKYfA0J/4BpijrGnmNN1R/MR1P0mealcMb6/chghiOC8zh9nuQdDWmWDQUCP4Fy01hIIn2rEge1aeOU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Xv+LKnDC; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Xv+LKnDC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774923330; x=1806459330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=izHRzXJgV7CxACyoH4KHjGpZsKjWF7DOxEVlUNzWCvQ=; b=Xv+LKnDC6NBOEiFold+6cg3DHOdo52xfepccxto4tKLOlsZN2ykqMrLd k5ydfY+yoC7xt9J1whMt4iArX5nvBzcbBe+5FbBdFwSBEvUtdZ8VQiB2q gi+49+XbWZWlaguftOElH2YV49gdMvSENu0sHEhqaec3ttDDJIbDMOdL0 5Z3g5TcqeV+E/fPP6N7OleZlvlA8PiQ4ddxldc+rF6x9th6z88AgTNmWU wmtNlCQJSGyuCmssJkgBT5hWFmn4VnbyaJFpwyN0DNHyAlM7Ei5S/Hgpu s5jTHhHZvqs+bXw2hdcuUj9kj4WXL2OiHW/UQA5tv0nlLH/Fji8QnZkGH A==; X-CSE-ConnectionGUID: 1lhNo2V0T8mra59k2Mlm/g== X-CSE-MsgGUID: 6pugh9uSQxaqQJ8J3S+86g== X-IronPort-AV: E=McAfee;i="6800,10657,11744"; a="93508158" X-IronPort-AV: E=Sophos;i="6.23,151,1770624000"; d="scan'208";a="93508158" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2026 19:07:52 -0700 X-CSE-ConnectionGUID: Qs7rGYSyTJapr48pwcQ7KQ== X-CSE-MsgGUID: ksu7KxOhRNq9wvixAMV8WQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,151,1770624000"; d="scan'208";a="221358707" Received: from chang-linux-3.sc.intel.com (HELO chang-linux-3) ([172.25.66.172]) by fmviesa006.fm.intel.com with ESMTP; 30 Mar 2026 19:07:47 -0700 From: "Chang S. Bae" To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, tglx@kernel.org, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, david.kaplan@amd.com, chang.seok.bae@intel.com Subject: [PATCH v2 07/11] x86/nmi: Support NMI stop-machine handler Date: Tue, 31 Mar 2026 01:42:45 +0000 Message-ID: <20260331014251.86353-8-chang.seok.bae@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331014251.86353-1-chang.seok.bae@intel.com> References: <20260331014251.86353-1-chang.seok.bae@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Kaplan Call the stop-machine handler from the NMI path in order to support the NMI stop-machine. Signed-off-by: David Kaplan Signed-off-by: Chang S. Bae --- V1 -> V2: Switch away from static key reference --- arch/x86/kernel/nmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 3d239ed12744..b7ea2907142c 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -24,6 +24,7 @@ #include #include #include +#include #include =20 #include @@ -382,6 +383,9 @@ static noinstr void default_do_nmi(struct pt_regs *regs) =20 instrumentation_begin(); =20 + if (stop_machine_nmi_handler()) + goto out; + if (microcode_nmi_handler_enabled() && microcode_nmi_handler()) goto out; =20 --=20 2.51.0