From nobody Sun Dec 14 06:40:14 2025 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 A0ADB3716D; Tue, 9 Jul 2024 14:33:54 +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=1720535636; cv=none; b=JtJteceAGImpIZYp8fEONEunB4eZKbFq99/+gFE/c/Se7xSRVbtMIFa+mWYxVjNTQ+CXIcksrXslwRXliWITGalBxoUCpFw8sRYVsHVvgrgP7MVYJl9gb1tBcrBQU7Sj3uAmZDnlL8MHgAQ/ytQVeRR3hTSGYT1sNrP0FnYgx6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535636; c=relaxed/simple; bh=d8UHbC86D5le7EhTyKfMWZTXd5alVS+oeTMGdeu7JY0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rOqVQZx//AB5YFswWsfho8g2eNuknn3JT5qMgb1l/ftDG5Ix0aJkOBpWw4Rj7iqcQGhptxcQOepHTnqTW7ChvCEMhtSVzZpLbgXUu5A+SEJjnO8oMz8awbyawyOcc/IzSjvZ78tdShWcAtlId80Si5mNuh75+MceYmt4FgUz5RI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=J8e+e+63; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="J8e+e+63" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535634; x=1752071634; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d8UHbC86D5le7EhTyKfMWZTXd5alVS+oeTMGdeu7JY0=; b=J8e+e+63802cv+ytCvqlbGrGp6QroEnt85Lo/W6YW44xxgKbnM6KAjdu tQGW0uj9V9zRu+ZxyMB96AMydUWEPZ11IcimNW9xqPpt/XiFXoI089wcE 7lTgT4Zv87X74HAiO1iA+z3iYQMd4U8oMixfY05hrhFfnq4dCY8Yq4zqN ZcTv0Wl9ISh3grv3J8mBzkZRcpCOBFbNwt3CrTtpOOMJ58s6ZkkcrmZ6B VQCJKcAXRBTEsWnua2aOKr7KdEJyjUdgSUdznntzSLEvO37U04BuvHaW7 /oewiDy9ON+O2Uq2EZ9CO2BrbIvJNNhQX++rDwhwMaxlVwM0N5DsW08Vx A==; X-CSE-ConnectionGUID: IY6cXwcrQGe5TB7KoR3Uwg== X-CSE-MsgGUID: CL7g3HfDTA2NW+wywCy3Mg== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331337" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331337" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:52 -0700 X-CSE-ConnectionGUID: WjBxYSdeSr+l1uueDFXWhg== X-CSE-MsgGUID: HdbKbu9yT+uxmYJRgU4guA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272060" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:52 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 01/11] x86/irq: Add enumeration of NMI source reporting CPU feature Date: Tue, 9 Jul 2024 07:38:56 -0700 Message-Id: <20240709143906.1040477-2-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" The lack of a mechanism to pinpoint the origins of Non-Maskable Interrupts (NMIs) necessitates that the NMI vector 2 handler consults each NMI source handler individually. This approach leads to inefficiencies, delays, and the occurrence of unnecessary NMIs, thereby also constraining the potential applications of NMIs. A new CPU feature, known as NMI source reporting, has been introduced as part of the Flexible Return and Event Delivery (FRED) spec. This feature enables the NMI vector 2 handler to directly obtain information about the NMI source from the FRED event data. The functionality of NMI source reporting is tied to the FRED. Although it is enumerated by a unique CPUID feature bit, it cannot be turned off independently once FRED is activated. Signed-off-by: Jacob Pan --- v3: Removed CONFIG_X86_NMI_SOURCE (Li Xin, HPA, Sohil) v2: Removed NMI source from static CPU ID dependency table (HPA) --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kernel/traps.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpuf= eatures.h index 3c7434329661..ec78d361e685 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -327,6 +327,7 @@ #define X86_FEATURE_FRED (12*32+17) /* Flexible Return and Event Delivery= */ #define X86_FEATURE_LKGS (12*32+18) /* "" Load "kernel" (userspace) GS */ #define X86_FEATURE_WRMSRNS (12*32+19) /* "" Non-serializing WRMSR */ +#define X86_FEATURE_NMI_SOURCE (12*32+20) /* NMI source reporting */ #define X86_FEATURE_AMX_FP16 (12*32+21) /* "" AMX fp16 Support */ #define X86_FEATURE_AVX_IFMA (12*32+23) /* "" Support for VPMAD= D52[H,L]UQ */ #define X86_FEATURE_LAM (12*32+26) /* Linear Address Masking */ diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 4fa0b17e5043..465f04e4a79f 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -1427,8 +1427,10 @@ early_param("fred", fred_setup); =20 void __init trap_init(void) { - if (cpu_feature_enabled(X86_FEATURE_FRED) && !enable_fred) + if (cpu_feature_enabled(X86_FEATURE_FRED) && !enable_fred) { setup_clear_cpu_cap(X86_FEATURE_FRED); + setup_clear_cpu_cap(X86_FEATURE_NMI_SOURCE); + } =20 /* Init cpu_entry_area before IST entries are set up */ setup_cpu_entry_areas(); --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 D033619B5A9; Tue, 9 Jul 2024 14:33:55 +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=1720535637; cv=none; b=Yq70+5c0QC2FySUSD1A4tcALY4BZvBzYBR5Ak0z8clKTND9/xjq/SBcurEW9aaUqXegvr97HkRbYI3JLSeLnNsP4PxuvPfEG7epCEibGDOb+8EV0mDYRFQEwwfYf5yBEkQHR0Q89Ai8waN87rhhQbAF1juzsIHYkvDlOR7Nc1k0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535637; c=relaxed/simple; bh=VS9ni2VwrfAqr4zrobW6sHYolEB4aH9bWQ+fNO4ooj4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tvk2l8FbwLxCsRCljfuyzDX5CTNeRp429rD2qXDNeXyO4GsW6amiyZ6B8mwsDvPbv40k+LrO/Oge+UmzZ8u5CRk8o7EVCR8pr6Yn4kS4gVBj9YRU6OdIbtEOcZVNgnRemV2Hr+KApTsQSM/qdl5QgEZMB7cSwPS/HvCG+C2CbJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=DjMOPV5I; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="DjMOPV5I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535635; x=1752071635; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VS9ni2VwrfAqr4zrobW6sHYolEB4aH9bWQ+fNO4ooj4=; b=DjMOPV5Ign/CRpfEvoEdMuMi7fuK538HxEuzR7rfFjfIoiyx5VEkNdhw 1P40bBxOVt1wgiseO8mxOHzy3l2YTcegl3S5G3FKK/r8x/aCqGzVMUrcA qfukB8LqP6WwuuFJVgVGLU4Vh0IhQZgev2SFvfHmuSwpz1V4UYCCqRFZK EJiudZQls0sZcLw8wurf9gGeLJ6SltvqgWNLELTL4md6KndtXjRo5vBU7 XImxR4JwMjxeBfitnOhvRHQphg5LFVvkpL4lVOtfZqB5x1G82Z6KZ1cjU bmSnXUmPibecffH2U5YPuyGvhuGN7JOmvBxG4b077eZMvwm2Bjp2hViXC A==; X-CSE-ConnectionGUID: r2tbDogIRPOBCh/REyc7Zw== X-CSE-MsgGUID: QazvpFSAQGCDm02TuSOIGw== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331346" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331346" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:53 -0700 X-CSE-ConnectionGUID: 9EyGfWPpTjmMZsmEwkf5Tg== X-CSE-MsgGUID: 1hlm4s3TQ0ufMJc3hKIW/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272081" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:53 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 02/11] x86/irq: Define NMI source vectors Date: Tue, 9 Jul 2024 07:38:57 -0700 Message-Id: <20240709143906.1040477-3-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" When NMI-source reporting is supported, each logical processor maintains a 16-bit NMI-source bitmap. It is up to the system software to assign NMI sources for their matching vector (bit position) in the bitmap. Notice that NMI source vector is in a different namespace than the IDT vectors. Though they share the same programming interface/field in the NMI originator. This initial allocation of the NMI sources are limited to local NMIs in that there is no external device NMI usage yet. Signed-off-by: Jacob Pan --- arch/x86/include/asm/irq_vectors.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_= vectors.h index 13aea8fc3d45..4f767c3940d6 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h @@ -105,6 +105,36 @@ =20 #define NR_VECTORS 256 =20 +/* + * NMI senders specify the NMI-source vector as an 8-bit integer in their + * vector field with NMI delivery mode. A local APIC receiving an NMI will + * set the corresponding bit in a 16-bit bitmask, which is accumulated unt= il + * the NMI is delivered. + * + * When a sender didn't specify an NMI-source vector the source vector will + * be 0, which will result in bit 0 of the bitmask being set. For out of + * bounds vectors >=3D 16, bit 0 will also be set. + * + * When bit 0 is set, system software must invoke all registered NMI handl= ers + * as if NMI-source reporting feature is not enabled. + * + * Vector 2 is reserved for matching IDT NMI vector where it may be hardco= ded + * by some external devices. + * + * The NMI-source vectors are sorted by descending priority with the excep= tions + * of 0 and 2. + */ +#define NMI_SOURCE_VEC_UNKNOWN 0 +#define NMI_SOURCE_VEC_IPI_REBOOT 1 /* Crash reboot */ +#define NMI_SOURCE_VEC_IDT_NMI 2 /* Match IDT NMI vector 2 */ +#define NMI_SOURCE_VEC_IPI_SMP_STOP 3 /* Panic stop CPU */ +#define NMI_SOURCE_VEC_IPI_BT 4 /* CPU backtrace */ +#define NMI_SOURCE_VEC_PMI 5 /* PerfMon counters */ +#define NMI_SOURCE_VEC_IPI_KGDB 6 /* KGDB */ +#define NMI_SOURCE_VEC_IPI_MCE 7 /* MCE injection */ +#define NMI_SOURCE_VEC_IPI_TEST 8 /* For remote and local IPIs */ +#define NR_NMI_SOURCE_VECTORS 9 + #ifdef CONFIG_X86_LOCAL_APIC #define FIRST_SYSTEM_VECTOR POSTED_MSI_NOTIFICATION_VECTOR #else --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 22F5119CCE1; Tue, 9 Jul 2024 14:33:55 +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=1720535638; cv=none; b=JGhtnw6NSibmOdGhAZIMJXJa1A6Ln6ZXCIWDCq2UMF1TF8moZU5CZAruOthKGp+2t3VrcdyJ6US93QQ6lcXbAvqP5i0FFt3cQCQV3xrJrICGo5Ims0kXSOU7O3zKEjAGSAO9KfW56OHXnyXK8XSwdrR3kd8AslbyC98lQVYcWx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535638; c=relaxed/simple; bh=AKQnRLnIj/MysjQXWgU9rZo1Vmzl4vUovXBOlODaRgc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=opap2AZVMI5TtToLdZpAFajCEJpZW3xFBd4W2TCc/1SNfRPb5vI+Rh2h7CvPaK1TsVQQeCc/QCpZjiIo9CYGk+BioTylPqqB7G37PCJM05Mm0gUr6frDD+ZzsE2t+LzNGXCdOVOx41HrE3btASVDvaNGcgpV02MqIt8OIc85dzU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kgjacNEy; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kgjacNEy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535636; x=1752071636; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AKQnRLnIj/MysjQXWgU9rZo1Vmzl4vUovXBOlODaRgc=; b=kgjacNEysB2aMdzdj8x0/KNstkz+JnuNJ2vu7llfZPQ+zESvDdACiGBH lFODIiDzN2E0CSDcrcnXTtcLBUQZuzPHQF/53f7K4iD06Uds0rjqJGjJq KaHoEY1kvAoAi0ZdmLCqNJnl9Qc/uPaxjC67y6VF1GWjI406eC3Q9EZ0j bsTi07S3d75iNvODHx0Gwk6IHwgciLXlcTNgpQ6/qzEcTZQWmeoLRVhnC CXRSsBBs0O+fAT6qX8OflMGYMuoPgVsom40NS8FNSf0m9+5DDLENj+a49 9GnjSDSv6cRNtgkdH81uL5nqwVK3/TC54JKHgDiNJhJ3rVrWvGK197NBl g==; X-CSE-ConnectionGUID: fTlIv+DATSS/O5mnoj17yQ== X-CSE-MsgGUID: 515wzMLoRAqejZeWD2Iz4Q== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331357" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331357" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:54 -0700 X-CSE-ConnectionGUID: U6BWXfk6T5K+QMw8TScXkg== X-CSE-MsgGUID: UljmqpUtTGC/lKxmV2/+1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272088" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:54 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 03/11] x86/irq: Extend NMI handler registration interface to include source Date: Tue, 9 Jul 2024 07:38:58 -0700 Message-Id: <20240709143906.1040477-4-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" Add a source vector argument to register_nmi_handler() such that designated NMI originators can leverage NMI source reporting feature. For those who do not use NMI-source reporting, 0 (unknown) is used as the source vector. NMI-source vectors (up to 16) are pre-defined. Signed-off-by: Jacob Pan --- v4: - Tweak commit message v3: - Move NMI source vector definitions to a separate patch (Sohil) v2:(address review comments from HPA, not including optimizations" - Reserve IDT NMI vector 2 in case of devices use hardcoded vector 2 - Sort NMI source vector by priority in descending order Signed-off-by: Jacob Pan --- arch/x86/events/amd/ibs.c | 2 +- arch/x86/events/core.c | 3 ++- arch/x86/include/asm/nmi.h | 4 +++- arch/x86/kernel/apic/hw_nmi.c | 2 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/cpu/mshyperv.c | 2 +- arch/x86/kernel/kgdb.c | 4 ++-- arch/x86/kernel/nmi.c | 22 ++++++++++++++++++++++ arch/x86/kernel/nmi_selftest.c | 5 +++-- arch/x86/kernel/reboot.c | 2 +- arch/x86/kernel/smp.c | 2 +- arch/x86/platform/uv/uv_nmi.c | 4 ++-- drivers/acpi/apei/ghes.c | 2 +- drivers/char/ipmi/ipmi_watchdog.c | 2 +- drivers/edac/igen6_edac.c | 2 +- drivers/watchdog/hpwdt.c | 6 +++--- 16 files changed, 46 insertions(+), 20 deletions(-) diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c index e91970b01d62..20989071f59a 100644 --- a/arch/x86/events/amd/ibs.c +++ b/arch/x86/events/amd/ibs.c @@ -1246,7 +1246,7 @@ static __init int perf_event_ibs_init(void) if (ret) goto err_op; =20 - ret =3D register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ib= s"); + ret =3D register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ib= s", 0); if (ret) goto err_nmi; =20 diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 5b0dd07b1ef1..1ef2201e48ac 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2100,7 +2100,8 @@ static int __init init_hw_perf_events(void) x86_pmu.intel_ctrl =3D (1 << x86_pmu.num_counters) - 1; =20 perf_events_lapic_init(); - register_nmi_handler(NMI_LOCAL, perf_event_nmi_handler, 0, "PMI"); + + register_nmi_handler(NMI_LOCAL, perf_event_nmi_handler, 0, "PMI", NMI_SOU= RCE_VEC_PMI); =20 unconstrained =3D (struct event_constraint) __EVENT_CONSTRAINT(0, (1ULL << x86_pmu.num_counters) - 1, diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h index 41a0ebb699ec..6fe26fea30eb 100644 --- a/arch/x86/include/asm/nmi.h +++ b/arch/x86/include/asm/nmi.h @@ -39,15 +39,17 @@ struct nmiaction { u64 max_duration; unsigned long flags; const char *name; + unsigned int source_vec; }; =20 -#define register_nmi_handler(t, fn, fg, n, init...) \ +#define register_nmi_handler(t, fn, fg, n, src, init...) \ ({ \ static struct nmiaction init fn##_na =3D { \ .list =3D LIST_HEAD_INIT(fn##_na.list), \ .handler =3D (fn), \ .name =3D (n), \ .flags =3D (fg), \ + .source_vec =3D (src), \ }; \ __register_nmi_handler((t), &fn##_na); \ }) diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 45af535c44a0..9f0125d3b8b0 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -54,7 +54,7 @@ NOKPROBE_SYMBOL(nmi_cpu_backtrace_handler); static int __init register_nmi_cpu_backtrace_handler(void) { register_nmi_handler(NMI_LOCAL, nmi_cpu_backtrace_handler, - 0, "arch_bt"); + 0, "arch_bt", NMI_SOURCE_VEC_IPI_BT); return 0; } early_initcall(register_nmi_cpu_backtrace_handler); diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inj= ect.c index 94953d749475..365a03f11d06 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -769,7 +769,7 @@ static int __init inject_init(void) =20 debugfs_init(); =20 - register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0, "mce_notify"); + register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0, "mce_notify", NMI_SO= URCE_VEC_IPI_MCE); mce_register_injector_chain(&inject_nb); =20 setup_inj_struct(&i_mce); diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index e0fd57a8ba84..2fb9408a8ba9 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -486,7 +486,7 @@ static void __init ms_hyperv_init_platform(void) } =20 register_nmi_handler(NMI_UNKNOWN, hv_nmi_unknown, NMI_FLAG_FIRST, - "hv_nmi_unknown"); + "hv_nmi_unknown", 0); #endif =20 #ifdef CONFIG_X86_IO_APIC diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 9c9faa1634fb..d167eb23cf13 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -603,12 +603,12 @@ int kgdb_arch_init(void) goto out; =20 retval =3D register_nmi_handler(NMI_LOCAL, kgdb_nmi_handler, - 0, "kgdb"); + 0, "kgdb", NMI_SOURCE_VEC_IPI_KGDB); if (retval) goto out1; =20 retval =3D register_nmi_handler(NMI_UNKNOWN, kgdb_nmi_handler, - 0, "kgdb"); + 0, "kgdb", 0); =20 if (retval) goto out2; diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index ed163c8c8604..5491b460f32b 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -86,6 +86,12 @@ static DEFINE_PER_CPU(struct nmi_stats, nmi_stats); =20 static int ignore_nmis __read_mostly; =20 +/* + * Contains all actions registered by originators with source vector, + * excluding UNKNOWN NMI-source vector 0. + */ +static struct nmiaction *nmiaction_src_table[NR_NMI_SOURCE_VECTORS - 1]; + int unknown_nmi_panic; /* * Prevent NMI reason port (0x61) being accessed simultaneously, can @@ -163,6 +169,12 @@ static int nmi_handle(unsigned int type, struct pt_reg= s *regs) } NOKPROBE_SYMBOL(nmi_handle); =20 +static inline bool use_nmi_source(unsigned int type, struct nmiaction *a) +{ + return (cpu_feature_enabled(X86_FEATURE_NMI_SOURCE) && + type =3D=3D NMI_LOCAL && a->source_vec); +} + int __register_nmi_handler(unsigned int type, struct nmiaction *action) { struct nmi_desc *desc =3D nmi_to_desc(type); @@ -173,6 +185,11 @@ int __register_nmi_handler(unsigned int type, struct n= miaction *action) =20 raw_spin_lock_irqsave(&desc->lock, flags); =20 + if (use_nmi_source(type, action)) { + rcu_assign_pointer(nmiaction_src_table[action->source_vec], action); + pr_info("NMI source %d registered for %s\n", action->source_vec, action-= >name); + } + /* * Indicate if there are multiple registrations on the * internal NMI handler call chains (SERR and IO_CHECK). @@ -210,6 +227,11 @@ void unregister_nmi_handler(unsigned int type, const c= har *name) if (!strcmp(n->name, name)) { WARN(in_nmi(), "Trying to free NMI (%s) from NMI context!\n", n->name); + if (use_nmi_source(type, n)) { + rcu_assign_pointer(nmiaction_src_table[n->source_vec], NULL); + pr_info("NMI source %d unregistered for %s\n", n->source_vec, n->name); + } + list_del_rcu(&n->list); found =3D n; break; diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c index e93a8545c74d..f014c8a66b0c 100644 --- a/arch/x86/kernel/nmi_selftest.c +++ b/arch/x86/kernel/nmi_selftest.c @@ -44,7 +44,7 @@ static void __init init_nmi_testsuite(void) { /* trap all the unknown NMIs we may generate */ register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk", - __initdata); + 0, __initdata); } =20 static void __init cleanup_nmi_testsuite(void) @@ -67,7 +67,8 @@ static void __init test_nmi_ipi(struct cpumask *mask) unsigned long timeout; =20 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback, - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) { + NMI_FLAG_FIRST, "nmi_selftest", NMI_SOURCE_VEC_IPI_TEST, + __initdata)) { nmi_fail =3D FAILURE; return; } diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f3130f762784..acc19c1d3b4f 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -910,7 +910,7 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1); /* Would it be better to replace the trap vector here? */ if (register_nmi_handler(NMI_LOCAL, crash_nmi_callback, - NMI_FLAG_FIRST, "crash")) + NMI_FLAG_FIRST, "crash", NMI_SOURCE_VEC_IPI_REBOOT)) return; /* Return what? */ /* * Ensure the new callback function is set before sending diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 18266cc3d98c..f27469e40141 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -143,7 +143,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_reboot) static int register_stop_handler(void) { return register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback, - NMI_FLAG_FIRST, "smp_stop"); + NMI_FLAG_FIRST, "smp_stop", NMI_SOURCE_VEC_IPI_SMP_STOP); } =20 static void native_stop_other_cpus(int wait) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 5c50e550ab63..473c34eb264c 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -1029,10 +1029,10 @@ static int uv_handle_nmi_ping(unsigned int reason, = struct pt_regs *regs) =20 static void uv_register_nmi_notifier(void) { - if (register_nmi_handler(NMI_UNKNOWN, uv_handle_nmi, 0, "uv")) + if (register_nmi_handler(NMI_UNKNOWN, uv_handle_nmi, 0, "uv", 0)) pr_warn("UV: NMI handler failed to register\n"); =20 - if (register_nmi_handler(NMI_LOCAL, uv_handle_nmi_ping, 0, "uvping")) + if (register_nmi_handler(NMI_LOCAL, uv_handle_nmi_ping, 0, "uvping", 0)) pr_warn("UV: PING NMI handler failed to register\n"); } =20 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 623cc0cb4a65..393dca95d2b3 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -1318,7 +1318,7 @@ static void ghes_nmi_add(struct ghes *ghes) { mutex_lock(&ghes_list_mutex); if (list_empty(&ghes_nmi)) - register_nmi_handler(NMI_LOCAL, ghes_notify_nmi, 0, "ghes"); + register_nmi_handler(NMI_LOCAL, ghes_notify_nmi, 0, "ghes", 0); list_add_rcu(&ghes->list, &ghes_nmi); mutex_unlock(&ghes_list_mutex); } diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_wat= chdog.c index 9a459257489f..61bb5dcade5a 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -1272,7 +1272,7 @@ static void check_parms(void) } if (do_nmi && !nmi_handler_registered) { rv =3D register_nmi_handler(NMI_UNKNOWN, ipmi_nmi, 0, - "ipmi"); + "ipmi", 0); if (rv) { pr_warn("Can't register nmi handler\n"); return; diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c index dbe9fe5f2ca6..891278245d8b 100644 --- a/drivers/edac/igen6_edac.c +++ b/drivers/edac/igen6_edac.c @@ -1321,7 +1321,7 @@ static int register_err_handler(void) } =20 rc =3D register_nmi_handler(NMI_SERR, ecclog_nmi_handler, - 0, IGEN6_NMI_NAME); + 0, IGEN6_NMI_NAME, 0); if (rc) { igen6_printk(KERN_ERR, "Failed to register NMI handler\n"); return rc; diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index ae30e394d176..5246706afcf6 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -242,13 +242,13 @@ static int hpwdt_init_nmi_decoding(struct pci_dev *de= v) /* * Only one function can register for NMI_UNKNOWN */ - retval =3D register_nmi_handler(NMI_UNKNOWN, hpwdt_pretimeout, 0, "hpwdt"= ); + retval =3D register_nmi_handler(NMI_UNKNOWN, hpwdt_pretimeout, 0, "hpwdt"= , 0); if (retval) goto error; - retval =3D register_nmi_handler(NMI_SERR, hpwdt_pretimeout, 0, "hpwdt"); + retval =3D register_nmi_handler(NMI_SERR, hpwdt_pretimeout, 0, "hpwdt", 0= ); if (retval) goto error1; - retval =3D register_nmi_handler(NMI_IO_CHECK, hpwdt_pretimeout, 0, "hpwdt= "); + retval =3D register_nmi_handler(NMI_IO_CHECK, hpwdt_pretimeout, 0, "hpwdt= ", 0); if (retval) goto error2; =20 --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 7D70519CCF0; Tue, 9 Jul 2024 14:33:56 +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=1720535638; cv=none; b=dKJDNdxVXdAf6LzFoZ90aEffVi/DncDTOZHiQW+mTCdRwUEAgOUY2NZhBBLvqQHpf5bCIB3UCGofT9LJdswPRDFyR6Szdzjmbw+qWnxwcpoA2DrH2uvbgPLD3XMMRwY3AQs9DCT05CFvp5KNfHEIKOtOWnPGzDzVVJutXQMiPUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535638; c=relaxed/simple; bh=OblXt4pwVEhCx1xGm8ZrsCUVLZmRk65ahm6MgN/kkjs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cUTTJaqPa48Xi7jGiSxUxAWkO17WNG6eK+oS/n8bjkoaOh4COGpSfta4HjIKlLnRhbBLgMYbcGOmcJ/wK372r3Wt2L9fLRkbhvEBNB62ALj82eIhhP/8RopAa3km15T5wDDAFZe2/SL6aVD53WRI30bNL+IYczAyF6kyVIPglHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=m4R7oyIt; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="m4R7oyIt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535636; x=1752071636; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OblXt4pwVEhCx1xGm8ZrsCUVLZmRk65ahm6MgN/kkjs=; b=m4R7oyItFrnz7j16jTU2mOtLjw40KpuAUA65Zql2GAlS1a/1+ldY1aHG 8MSsfJnlA63B5AMCJxV5iuos/gKsheZk6SmiFhiWv1JOzhlILy0TAeiH4 jncC5t083vHnaSZXKXFRqhZh6+ndXej9E0pC2OGAJ8wbKPi3j5EkIt2Fr TRH/cSerJzjyBennkOrzqbjT2uPiWR9arjarklmKXF6wZ0iwyLFruCPn+ ZZU0qk4Zsrt0LRZKgGz4i+fzULEpgZMz7BMaOR+Yk/JNT81kjRlNMgTKy tGgPgwU+ttFw/T5BFC05qQtDOlhxiR/v3MAZVk1cjeXqQgYzu0dvif074 g==; X-CSE-ConnectionGUID: Vhd3cyjwRZCY5BkBO57FDg== X-CSE-MsgGUID: EpcVevfcTy6nhf5df2JF6w== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331374" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331374" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:54 -0700 X-CSE-ConnectionGUID: 0roRgyCSSkmHdPryONEexg== X-CSE-MsgGUID: gTjWW+k6TVaWRolY+ro0HQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272095" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:54 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 04/11] x86/irq: Factor out common NMI handling code Date: Tue, 9 Jul 2024 07:38:59 -0700 Message-Id: <20240709143906.1040477-5-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" In preparation for handling NMIs with explicit source reporting, factor out common code for reuse. No functional change. Signed-off-by: Jacob Pan --- arch/x86/kernel/nmi.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 5491b460f32b..b96667eed106 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -135,6 +135,20 @@ static void nmi_check_duration(struct nmiaction *actio= n, u64 duration) action->handler, duration, decimal_msecs); } =20 +static inline int do_handle_nmi(struct nmiaction *a, struct pt_regs *regs,= unsigned int type) +{ + int thishandled; + u64 delta; + + delta =3D sched_clock(); + thishandled =3D a->handler(type, regs); + delta =3D sched_clock() - delta; + trace_nmi_handler(a->handler, (int)delta, thishandled); + nmi_check_duration(a, delta); + + return thishandled; +} + static int nmi_handle(unsigned int type, struct pt_regs *regs) { struct nmi_desc *desc =3D nmi_to_desc(type); @@ -149,18 +163,8 @@ static int nmi_handle(unsigned int type, struct pt_reg= s *regs) * can be latched at any given time. Walk the whole list * to handle those situations. */ - list_for_each_entry_rcu(a, &desc->head, list) { - int thishandled; - u64 delta; - - delta =3D sched_clock(); - thishandled =3D a->handler(type, regs); - handled +=3D thishandled; - delta =3D sched_clock() - delta; - trace_nmi_handler(a->handler, (int)delta, thishandled); - - nmi_check_duration(a, delta); - } + list_for_each_entry_rcu(a, &desc->head, list) + handled +=3D do_handle_nmi(a, regs, type); =20 rcu_read_unlock(); =20 --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 0A7E319CD1A; Tue, 9 Jul 2024 14:33:57 +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=1720535639; cv=none; b=rYy897h5iWqKSZfP4VAYG7sBILCtkClUmb+VIi7DFPiJZcOd1l4aRUP8FqyH//N3Xhh3BR7TC82BjFn/loms6VEB2D9HdLEg4pXjs04F0ZKE6RafWrhRrcR7nSUbsYUY1h/qzT//PqwJ2fSDjpoMt586Y4RK/WHN0scGzJ7o4Xk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535639; c=relaxed/simple; bh=iaJOBgXkMYqcjVwDy7NXFZoZ4Ju5ZpTja3j/JLXPjU4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rUuNQz+uHkFrM2dV991Avl2/t4VxXmiYVN+YpxLyq/xq3+Kuzut5zGsYX4XMdklMb0tUMsiEQMrBITPvmRdXIHAgeo7a9HniAx81DZZ2tPdZGa+oGBPZ59wFCR52hMlZ9hHli7XxgGB8u046sL02s8JAQneXOW2QDZwALWNr5qU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FBFSK/bx; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FBFSK/bx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535638; x=1752071638; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iaJOBgXkMYqcjVwDy7NXFZoZ4Ju5ZpTja3j/JLXPjU4=; b=FBFSK/bxw6ZCaGOfldw4pxfOV2ajMZtQMyX7l0dORCOt9iOQvTxRhX0f PQvmLSaVQlvdnKgg7iiDfBTFvUva+q9dgTuFTZ35WqUDAeCgQ6UlWz2PR yQ+KYPxTyAVhAl0+qyD5HQI7XYK+gvxMr5+1xMTUtbvcX3Lah6FC8qbN/ rwBCUf8o7foMYNMR7NrxlLnlQ0clEvCA+p6fUxoFz3MELn1ZQm2sYLUUL r/5Vnxcdslm9OBbE8/OIYwtnaH4ilRz+48Q08atHKzBdo75L1UYxwr0/i pNaLjfb8/PbxSq61Hs3CPXsW8y2uM4MaSjxrm5el7Zx2lR4PnIh57+VRG g==; X-CSE-ConnectionGUID: Yqc/3mHXTx2La2hoLhPO5Q== X-CSE-MsgGUID: CeRM5W9LRBGtlD/n+zhD2A== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331388" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331388" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:55 -0700 X-CSE-ConnectionGUID: V10aiNfrSaGuCPhre1xxew== X-CSE-MsgGUID: ZGSbm3xXTEi6F4ztQpQ2Ug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272100" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:55 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 05/11] x86/irq: Process nmi sources in NMI handler Date: Tue, 9 Jul 2024 07:39:00 -0700 Message-Id: <20240709143906.1040477-6-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" When NMI-source reporting is enabled, the vector 2 NMI handler can prioritize the handling of explicitly reported sources. If the source is unknown, it will continue with the existing processing flow, meaning all NMI handlers will be invoked. Signed-off-by: Jacob Pan --- v4: - Coding style changes (Li Xin) - Renamed handled_mask to partial_bitmap (Nikolay) v3: - Use a static flag to disable NMIs in case of HW failure - Optimize the case when unknown NMIs are mixed with known NMIs(HPA) v2: - Disable NMI source reporting once garbage data is given in FRED return stack. (HPA) process nmi Signed-off-by: Jacob Pan --- arch/x86/kernel/nmi.c | 83 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index b96667eed106..edb169289a1d 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -149,12 +149,89 @@ static inline int do_handle_nmi(struct nmiaction *a, = struct pt_regs *regs, unsig return thishandled; } =20 +static int nmi_handle_src(unsigned int type, struct pt_regs *regs, unsigne= d long *partial_bitmap) +{ + static bool nmi_source_disabled; + bool has_unknown_src =3D false; + unsigned long source_bitmap; + struct nmiaction *a; + int handled =3D 0; + int vec; + + if (!cpu_feature_enabled(X86_FEATURE_NMI_SOURCE) || type !=3D NMI_LOCAL |= | nmi_source_disabled) + return 0; + + source_bitmap =3D fred_event_data(regs); + if (unlikely(!source_bitmap)) { + pr_warn("Buggy hardware! Disable NMI-source handling.\n"); + nmi_source_disabled =3D true; + return 0; + } + + /* + * There is no guarantee that a valid NMI-source vector is always + * delivered, even when the originator specified one. It is software's + * responsibility to check all available NMI sources when bit 0 is set + * in the NMI-source reporting bitmap. I.e. we have to call every + * handler as if there is no NMI-source reporting feature enabled. + * + * In this case, handlers for the known NMI sources will be called + * first, followed by the remaining handlers, which are called + * during the subsequent polling code. + * + * Conversely, if non-zero vectors appear in the source bitmap, we + * can precisely identify the sources. Therefore, we only invoke the + * handlers for which the corresponding bits are set. + */ + if (unlikely(source_bitmap & BIT(NMI_SOURCE_VEC_UNKNOWN))) { + pr_warn_ratelimited("NMI received with unknown sources\n"); + has_unknown_src =3D true; + } + + rcu_read_lock(); + + /* Bit 0 is for unknown NMI sources, skip it. */ + vec =3D 1; + for_each_set_bit_from(vec, &source_bitmap, NR_NMI_SOURCE_VECTORS) { + a =3D rcu_dereference(nmiaction_src_table[vec]); + if (!a) { + pr_warn_ratelimited("NMI-source vector %d has no handler!", vec); + continue; + } + + handled +=3D do_handle_nmi(a, regs, type); + + /* + * Needs polling if the unknown source bit is set. + * partial_bitmap is used to tell the polling code which + * NMIs have already been handled based on explicit source + * thus can be skipped. + */ + if (has_unknown_src) + *partial_bitmap |=3D BIT(vec); + } + + rcu_read_unlock(); + + return handled; +} + static int nmi_handle(unsigned int type, struct pt_regs *regs) { struct nmi_desc *desc =3D nmi_to_desc(type); + unsigned long partial_bitmap =3D 0; struct nmiaction *a; int handled=3D0; =20 + /* + * Check if the NMI source handling is complete, otherwise polling is + * still required. partial_bitmap is non-zero if NMI source handling is + * partial due to unknown NMI sources. + */ + handled =3D nmi_handle_src(type, regs, &partial_bitmap); + if (handled && !partial_bitmap) + return handled; + rcu_read_lock(); =20 /* @@ -163,8 +240,12 @@ static int nmi_handle(unsigned int type, struct pt_reg= s *regs) * can be latched at any given time. Walk the whole list * to handle those situations. */ - list_for_each_entry_rcu(a, &desc->head, list) + list_for_each_entry_rcu(a, &desc->head, list) { + /* Skip NMIs handled earlier with source info */ + if (BIT(a->source_vec) & partial_bitmap) + continue; handled +=3D do_handle_nmi(a, regs, type); + } =20 rcu_read_unlock(); =20 --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 913E519D072; Tue, 9 Jul 2024 14:33:58 +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=1720535640; cv=none; b=ZdkSCgmjC35AKAXy2TroOUqWD5yRe3L4Er0QUNXFcIXJ1v+Xd+HHaPBDraCAkkkDRdT7lJoW0PyeS6xGzcemG80adMj6RaU/0BNe2DOLY80Y54y5+jtvRaqfWyFzkXqrw8e8mvSY14WY7BtVOhNJ2Qfay/Jcg8sFo6ZnH/SuR9M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535640; c=relaxed/simple; bh=aTowzf5ehH/lfdlLYW5qIknCqAoR8e51pYI18fJUPF8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V+dw7LQUXV2VCdr1mlE48R2cLHmxQFnOByOWrZkxMwRYAwybDwR/EwugfhaONCnsgoArYhpENCrfcRX+ZcuNNnuPallHlL1GcAHbSobaD22GiVxMgWI9wH7V/1SOqata57sBO2dcGJQ6DlEkVdRJmsIRbEF9yh3fF+0E3IJUpi8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=QZ/TPngI; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="QZ/TPngI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535638; x=1752071638; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aTowzf5ehH/lfdlLYW5qIknCqAoR8e51pYI18fJUPF8=; b=QZ/TPngIR5qcx8PG1D2OuOF+IjHaHQnp+DJ/LfCw8x9Wo9Q9BpHTunjX DICpbmg61RTD6GqjldvzYucF8OS5wI7qUlOzjA4U0PLqG76HktwjNBQuH wAeO2ahIcVrNPMBWgoRS35c/9gtAXR1q6iVQgemygL7RHcKakLXXYkY+e oiPCKf89391LflXX6AAhseUEanX1/MmMXqNnHNwcc7Csjsx4St9ZNLh5S g3Dtkux/rABWNAM2WDWahjSIrhQuvCCMK3DC2BqGyVW3t4PF7/u4J/mw8 B75JPQ3GDt+HLuArE8x7bV8VsINOaMHJ+Tby9K7KMlcCdysw+RLHIIvN7 g==; X-CSE-ConnectionGUID: eOsbuDsTRdqs4j9+RiD0TQ== X-CSE-MsgGUID: S8Rr+6G+S5iH7zTKJ+DNdw== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331402" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331402" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:56 -0700 X-CSE-ConnectionGUID: ojW9oLL1QO2vKM2ws2hRbw== X-CSE-MsgGUID: zLlgkRVZQ/yCxuLJnCw+DQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272108" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:55 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Zeng Guang , Jacob Pan Subject: [PATCH v4 06/11] KVM: VMX: Expand FRED kvm entry with event data Date: Tue, 9 Jul 2024 07:39:01 -0700 Message-Id: <20240709143906.1040477-7-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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: Zeng Guang According to FRED specification 10.6.2, VM exits triggered by events such as NMI, #DB, and #PF will have their event data stored in the exit-qualificati= on field. However, #DB and #PF are owned by the running guest, which is managed by KV= M. NMIs belong to the host, and the host NMI handler requires the event data stored in the VMCS for NMI-induced VM exits. This patch enhances the FRED KVM entry interface to include the event data derived from the exit qualification. Currently, it is used exclusively for NMI-source reporting Signed-off-by: Zeng Guang Signed-off-by: Jacob Pan --- arch/x86/entry/entry_64_fred.S | 2 +- arch/x86/include/asm/fred.h | 8 ++++---- arch/x86/kvm/vmx/vmx.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S index a02bc6f3d2e6..0d934a3fcaf8 100644 --- a/arch/x86/entry/entry_64_fred.S +++ b/arch/x86/entry/entry_64_fred.S @@ -92,7 +92,7 @@ SYM_FUNC_START(asm_fred_entry_from_kvm) * +--------+-----------------+ */ push $0 /* Reserved, must be 0 */ - push $0 /* Event data, 0 for IRQ/NMI */ + push %rsi /* Event data for IRQ/NMI */ push %rdi /* fred_ss handed in by the caller */ push %rbp pushf diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index e86c7ba32435..15f5d2eabd1d 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -63,14 +63,14 @@ static __always_inline unsigned long fred_event_data(st= ruct pt_regs *regs) =20 void asm_fred_entrypoint_user(void); void asm_fred_entrypoint_kernel(void); -void asm_fred_entry_from_kvm(struct fred_ss); +void asm_fred_entry_from_kvm(struct fred_ss, unsigned long edata); =20 __visible void fred_entry_from_user(struct pt_regs *regs); __visible void fred_entry_from_kernel(struct pt_regs *regs); __visible void __fred_entry_from_kvm(struct pt_regs *regs); =20 /* Can be called from noinstr code, thus __always_inline */ -static __always_inline void fred_entry_from_kvm(unsigned int type, unsigne= d int vector) +static __always_inline void fred_entry_from_kvm(unsigned int type, unsigne= d int vector, unsigned long edata) { struct fred_ss ss =3D { .ss =3D__KERNEL_DS, @@ -80,7 +80,7 @@ static __always_inline void fred_entry_from_kvm(unsigned = int type, unsigned int .lm =3D 1, }; =20 - asm_fred_entry_from_kvm(ss); + asm_fred_entry_from_kvm(ss, edata); } =20 void cpu_init_fred_exceptions(void); @@ -90,7 +90,7 @@ void fred_complete_exception_setup(void); static __always_inline unsigned long fred_event_data(struct pt_regs *regs)= { return 0; } static inline void cpu_init_fred_exceptions(void) { } static inline void fred_complete_exception_setup(void) { } -static __always_inline void fred_entry_from_kvm(unsigned int type, unsigne= d int vector) { } +static __always_inline void fred_entry_from_kvm(unsigned int type, unsigne= d int vector, unsigned long edata) { } #endif /* CONFIG_X86_FRED */ #endif /* !__ASSEMBLY__ */ =20 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index b3c83c06f826..4e7b36081b76 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7024,7 +7024,7 @@ static void handle_external_interrupt_irqoff(struct k= vm_vcpu *vcpu, =20 kvm_before_interrupt(vcpu, KVM_HANDLING_IRQ); if (cpu_feature_enabled(X86_FEATURE_FRED)) - fred_entry_from_kvm(EVENT_TYPE_EXTINT, vector); + fred_entry_from_kvm(EVENT_TYPE_EXTINT, vector, 0); else vmx_do_interrupt_irqoff(gate_offset((gate_desc *)host_idt_base + vector)= ); kvm_after_interrupt(vcpu); @@ -7332,7 +7332,7 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vc= pu *vcpu, is_nmi(vmx_get_intr_info(vcpu))) { kvm_before_interrupt(vcpu, KVM_HANDLING_NMI); if (cpu_feature_enabled(X86_FEATURE_FRED)) - fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR); + fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR, 0); else vmx_do_nmi_irqoff(); kvm_after_interrupt(vcpu); --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 1120519D084; Tue, 9 Jul 2024 14:33:59 +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=1720535640; cv=none; b=uLSkt9Cs5oAQt60SjyTDa87XRCTotEbKU+MTvYvkGmitOGe52TPWFky3UDN0z7RH2k8HxY5dzv0U/g4kXX+oEp8dQiP08VhlhT+xzmpILGGm6wDPz7RUbP446fGpb1vo8nBsAFuJ3hZli0Db1wfRsBx+OHdJ7w0WIKNCD+jqJCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535640; c=relaxed/simple; bh=vA7B3YKz0iafDXCOMUYAdqoOvW1WFIzYPt/YBAHyEEQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rINpVI9Q+IniXC2daJ3di2ZQh0JBVjfwZ6RhJDj9jrhxuQO8wpdgdvI0RIiljAlfdks+2rTNUmR+1+eJc9GP0QidLVnXSd06rDunyeaQe5xfVrEK4gIs/iPNkralhPCwOz/K9aSXov1j2tk98O7V0Az6ERk6OMoWIUw3bcEz6Mg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=SMBkgf66; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SMBkgf66" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535639; x=1752071639; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vA7B3YKz0iafDXCOMUYAdqoOvW1WFIzYPt/YBAHyEEQ=; b=SMBkgf665kKqNbiSiZcrnjOG/bLuOm27tHQP5Mo2O1Pz1EyvZqWVKMER bmT0ZEoBtuJsaF7ulKQjxKfCINKhU5j427GnZdV9o1tMpprzuv0g6mtk0 I5EvX2zblI1v7sym4TRsk3DUpYVGd8PLarDyZsT1HL4h1hqPnL3GEiQbx np+hX57qU7+tsTA/xK/oCIMFZnradl0ZhkPMtufFV38tVelhsMtg61Wgz qoA6xFV7ddTpG2JmNv1MQPBM06xnocQXknABuDs6kxGSyAxwR4UrVL6+N OHDh8FOiyKRI/9KG/y20arSQ1xvR1Kn4vtoyOSQB7KsCN0Bei4I5sTf4P Q==; X-CSE-ConnectionGUID: ICZSvdCqR7imlKcehRXR+Q== X-CSE-MsgGUID: VrCiNcF6SxmtqI1+dAH7SA== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331415" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331415" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:56 -0700 X-CSE-ConnectionGUID: 7VDwHScPRu+MrpWzXWFb8A== X-CSE-MsgGUID: ojYjyeCpTwiWQ6jpgXg6kA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272118" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:56 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Zeng Guang , Jacob Pan Subject: [PATCH v4 07/11] KVM: VMX: Handle NMI Source report in VM exit Date: Tue, 9 Jul 2024 07:39:02 -0700 Message-Id: <20240709143906.1040477-8-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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: Zeng Guang If the "NMI exiting" VM-execution control is 1, the value of the 16-bit NMI source vector is saved in the exit-qualification field in the VMCS when VM exits occur on CPUs that support NMI source. KVM that is aware of NMI-source reporting will push the bitmask of NMI sour= ce vectors as the exceptoin event data field on the stack for then entry of FR= ED exception. Subsequently, the host NMI exception handler is invoked which will process NMI source information in the event data. This operation is independent of vCPU FRED enabling status. Signed-off-by: Zeng Guang Signed-off-by: Jacob Pan --- arch/x86/kvm/vmx/vmx.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 4e7b36081b76..6719c598fa5f 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7331,10 +7331,15 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_= vcpu *vcpu, if ((u16)vmx->exit_reason.basic =3D=3D EXIT_REASON_EXCEPTION_NMI && is_nmi(vmx_get_intr_info(vcpu))) { kvm_before_interrupt(vcpu, KVM_HANDLING_NMI); - if (cpu_feature_enabled(X86_FEATURE_FRED)) - fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR, 0); - else + if (cpu_feature_enabled(X86_FEATURE_FRED)) { + unsigned long edata =3D 0; + + if (cpu_feature_enabled(X86_FEATURE_NMI_SOURCE)) + edata =3D vmx_get_exit_qual(vcpu); + fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR, edata); + } else { vmx_do_nmi_irqoff(); + } kvm_after_interrupt(vcpu); } =20 --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 E0A6E19D884; Tue, 9 Jul 2024 14:33:59 +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=1720535641; cv=none; b=FVeFGhXNpCuigAGkxIozgA9fneQyseutbjtFScSDjnB/fWkUo8AxAytsef/Cxfp1BEhuKo0fOwe2Aqpu0b4wgZ4eVmeOvcn5Vs0DAimlY2FPXSylpWisle0VbcrZbYEHhsuUb4GImf98wW/MigEs7X8ZLsO0BRkvamzrnOOUAtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535641; c=relaxed/simple; bh=fVwWPGOIyZnF65lF0GxG2vfceQ7LArmQ2GaF8OPDWsU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cuaojkQ/loYqUsaINyY9VinPGa0sWDoY0PVZIj/ypHZ/1yZstcvLx3j9hdyubUY+OOGcuon2q91f/9J2m0+4gvyM2YwlXKN9dwFuS9Fn8T0zI2GiR1OYIaZG0ZL7+nzRbK4/8HeTqbR1seiZpAglNScfhDCguj6kjho3rgg1USc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Vw3cHEOG; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Vw3cHEOG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535640; x=1752071640; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fVwWPGOIyZnF65lF0GxG2vfceQ7LArmQ2GaF8OPDWsU=; b=Vw3cHEOGZhwvy6xZ81nElYTCseUsRYRF7lHX6xW502YN1jrIqqIPdqFb /FqoaUfslPMtAL4LXVRbDsSZzeVn/o0v2ihAiYtRRFJORCinkkQnQ4xVs Zb1xG5cfHaXgZ7Q3QAOJ4uTJRLNZvosfz4I0+XnxBS9IewdLJSKjhLhca 5AXFBHYwXpmaSyq1WPDtMf1EhkvNeE7RaY9qoPr/5J9OFrqu3rBn/Yw3n DT1Ihdl5Q8dsweB9U0sVDAaYDRkVynZNDG/ojkbsghEnKbhIFtmiAKsxL EGk1IQaWb5vo3tvtM1ZAV24FH7znd5OaF1HDRSC1cBo0Ckbf6glymlX7i A==; X-CSE-ConnectionGUID: BblrbjtNSGS4aCJukKj1xQ== X-CSE-MsgGUID: YEyjB88TSRSug88STuA5qw== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331426" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331426" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:57 -0700 X-CSE-ConnectionGUID: eTkbNUk+SVWHCd8PCtA2BA== X-CSE-MsgGUID: OuI6WRNUQ3WSV94NRskYxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272134" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:57 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan , Zeng Guang Subject: [PATCH v4 08/11] perf/x86: Enable NMI source reporting for perfmon Date: Tue, 9 Jul 2024 07:39:03 -0700 Message-Id: <20240709143906.1040477-9-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" Program the designated NMI source vector into the performance monitoring interrupt (PMI) of the local vector table. PMI handler will be directly invoked when its NMI is generated. This avoids the latency of calling all NMI handlers blindly. Co-developed-by: Zeng Guang Signed-off-by: Zeng Guang Signed-off-by: Jacob Pan Reviewed-by: Kan Liang --- v4: Use a macro for programming PVTPC unconditionally (Kan) v3: Program NMI source vector in PVTPC unconditionally (HPA) v2: Fix a compile error apic_perfmon_ctr is undefined in i386 config --- arch/x86/events/core.c | 4 ++-- arch/x86/events/intel/core.c | 6 +++--- arch/x86/include/asm/apic.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 1ef2201e48ac..e69c52f9d662 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -1680,7 +1680,7 @@ int x86_pmu_handle_irq(struct pt_regs *regs) * This generic handler doesn't seem to have any issues where the * unmasking occurs so it was left at the top. */ - apic_write(APIC_LVTPC, APIC_DM_NMI); + apic_write(APIC_LVTPC, APIC_PERF_NMI); =20 for (idx =3D 0; idx < x86_pmu.num_counters; idx++) { if (!test_bit(idx, cpuc->active_mask)) @@ -1723,7 +1723,7 @@ void perf_events_lapic_init(void) /* * Always use NMI for PMU */ - apic_write(APIC_LVTPC, APIC_DM_NMI); + apic_write(APIC_LVTPC, APIC_PERF_NMI); } =20 static int diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 38c1b1f1deaa..e7e114616e24 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3093,7 +3093,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) * NMI handler. */ if (!late_ack && !mid_ack) - apic_write(APIC_LVTPC, APIC_DM_NMI); + apic_write(APIC_LVTPC, APIC_PERF_NMI); intel_bts_disable_local(); cpuc->enabled =3D 0; __intel_pmu_disable_all(true); @@ -3130,7 +3130,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) =20 done: if (mid_ack) - apic_write(APIC_LVTPC, APIC_DM_NMI); + apic_write(APIC_LVTPC, APIC_PERF_NMI); /* Only restore PMU state when it's active. See x86_pmu_disable(). */ cpuc->enabled =3D pmu_enabled; if (pmu_enabled) @@ -3143,7 +3143,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) * Haswell CPUs. */ if (late_ack) - apic_write(APIC_LVTPC, APIC_DM_NMI); + apic_write(APIC_LVTPC, APIC_PERF_NMI); return handled; } =20 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 9327eb00e96d..d284eff7849c 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -30,6 +30,8 @@ #define APIC_EXTNMI_ALL 1 #define APIC_EXTNMI_NONE 2 =20 +#define APIC_PERF_NMI (APIC_DM_NMI | NMI_SOURCE_VEC_PMI) + /* * Define the default level of output to be very little * This can be turned up by using apic=3Dverbose for more --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 8E7C919D8A0; Tue, 9 Jul 2024 14:34:00 +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=1720535642; cv=none; b=CA43lw7kaeOqUhMba67uF+y8lNrkRY9ObHNG0chUpvzbEI/SLt82/TiaYY1TA2v0HnzaDZwSVpwbfEP6ri53Z1u4tNcgEbYbN0j58o6XeNTXzILWr0ipyfLGnWB1khAa8wbZtqsnlKi2/hbMqRpcvx5/eE7HuRwgwquihkh0SDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535642; c=relaxed/simple; bh=Q6QW7Mym11UnH2/NujfWG5rt/LJO2rB7GqNyqlAaMIw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oXF276A4s4zhED5g9E+uEYKFU+RJxpiwRvdSAsAtAG0OcnU3A6v8fv421IXVSlAmlMeVuY5pqTfko1r0ldech9qyr38BKhK2TNOdoKPYH772QWJMRAhGaf47rfROo3R3ALWwCMnJQRWT6h9QeS+fxvr46NBLWzdvsklJunxQJP8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=XfnxvnPK; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="XfnxvnPK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535640; x=1752071640; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q6QW7Mym11UnH2/NujfWG5rt/LJO2rB7GqNyqlAaMIw=; b=XfnxvnPKruFeH2p87SWXhI/9mM0tt029vAd4mRp/yWy6mFFW71UaO2PQ CCbpvhRsxOTCmjKA1zec+OxmK04r5a+xGVHG7w37ZSdJpFhBgxoTELB5H Jo6LswOk1Dxt5nNLXyTORanANxcO37MLPRvPHfrs4huTd2URKJ/oSxaZx bBJX6y5Jm8pcEMcDqrjAfGHP+BFjXl6ivEvunOLTQSx1unYjOiRVhMFbm 1DPz99byLwTEHtTodSflbMnFOnsDMDN7S+v6et0tdJJl12ZVsCO+cvKGo KC1GC8uRukj6ElaXRm0x5Z0mYkO/D0UrvT8AS2NpO1JG4tZpiPsIc/vay g==; X-CSE-ConnectionGUID: AdPfx3b5SCy9BVtCU20lyA== X-CSE-MsgGUID: mYatI1ySQ8OZpG4HE0+k5A== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331443" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331443" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:58 -0700 X-CSE-ConnectionGUID: Ogb6bm/XRymwM71beSQ4NQ== X-CSE-MsgGUID: nuB77fl1RZuyVt0OVxt95g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272146" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:57 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 09/11] x86/irq: Enable NMI source on IPIs delivered as NMI Date: Tue, 9 Jul 2024 07:39:04 -0700 Message-Id: <20240709143906.1040477-10-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" Program designated NMI source vectors for all NMI delivered IPIs such that their handlers can be selectively invoked. Signed-off-by: Jacob Pan --- v4: Enhance comments, no functional changes (Li Xin) --- arch/x86/include/asm/irq_vectors.h | 10 ++++++++++ arch/x86/kernel/apic/hw_nmi.c | 3 ++- arch/x86/kernel/apic/ipi.c | 4 ++-- arch/x86/kernel/apic/local.h | 18 ++++++++++++------ arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/kgdb.c | 2 +- arch/x86/kernel/nmi_selftest.c | 2 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/kernel/smp.c | 2 +- 9 files changed, 31 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_= vectors.h index 4f767c3940d6..9b7241e7faa3 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h @@ -135,6 +135,16 @@ #define NMI_SOURCE_VEC_IPI_TEST 8 /* For remote and local IPIs */ #define NR_NMI_SOURCE_VECTORS 9 =20 +/* + * When programming the local APIC, IDT NMI vector and NMI-source vector + * are encoded in a single 32 bit variable. The top 16 bits contain + * the NMI-source vector and the bottom 16 bits contain NMI_VECTOR (2) + * The top 16 bits are always zero when NMI-source reporting feature + * is not enabled or the caller does not use NMI-source reporting. + */ +#define NMI_VECTOR_WITH_SOURCE(src) (NMI_VECTOR | (src << 16)) +#define NMI_SOURCE_VEC_MASK GENMASK(15, 0) + #ifdef CONFIG_X86_LOCAL_APIC #define FIRST_SYSTEM_VECTOR POSTED_MSI_NOTIFICATION_VECTOR #else diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 9f0125d3b8b0..f73ca95d961e 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include "local.h" =20 @@ -33,7 +34,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh) #ifdef arch_trigger_cpumask_backtrace static void nmi_raise_cpu_backtrace(cpumask_t *mask) { - __apic_send_IPI_mask(mask, NMI_VECTOR); + __apic_send_IPI_mask(mask, NMI_VECTOR_WITH_SOURCE(NMI_SOURCE_VEC_IPI_BT)); } =20 void arch_trigger_cpumask_backtrace(const cpumask_t *mask, int exclude_cpu) diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index 5da693d633b7..9d2b18e58758 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -157,7 +157,7 @@ static void __default_send_IPI_shortcut(unsigned int sh= ortcut, int vector) * issues where otherwise the system hangs when the panic CPU tries * to stop the others before launching the kdump kernel. */ - if (unlikely(vector =3D=3D NMI_VECTOR)) + if (unlikely(is_nmi_vector(vector))) apic_mem_wait_icr_idle_timeout(); else apic_mem_wait_icr_idle(); @@ -174,7 +174,7 @@ void __default_send_IPI_dest_field(unsigned int dest_ma= sk, int vector, unsigned int dest_mode) { /* See comment in __default_send_IPI_shortcut() */ - if (unlikely(vector =3D=3D NMI_VECTOR)) + if (unlikely(is_nmi_vector(vector))) apic_mem_wait_icr_idle_timeout(); else apic_mem_wait_icr_idle(); diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 842fe28496be..60e90b7bf058 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -12,6 +12,7 @@ =20 #include #include +#include =20 /* X2APIC */ void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int = dest); @@ -26,19 +27,24 @@ extern u32 x2apic_max_apicid; =20 DECLARE_STATIC_KEY_FALSE(apic_use_ipi_shorthand); =20 +static inline bool is_nmi_vector(int vector) +{ + return (vector & NMI_SOURCE_VEC_MASK) =3D=3D NMI_VECTOR; +} + static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, unsigned int dest) { unsigned int icr =3D shortcut | dest; =20 - switch (vector) { - default: - icr |=3D APIC_DM_FIXED | vector; - break; - case NMI_VECTOR: + if (is_nmi_vector(vector)) { icr |=3D APIC_DM_NMI; - break; + if (cpu_feature_enabled(X86_FEATURE_NMI_SOURCE)) + icr |=3D vector >> 16; + } else { + icr |=3D APIC_DM_FIXED | vector; } + return icr; } =20 diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inj= ect.c index 365a03f11d06..07bc6c29bd83 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -270,7 +270,7 @@ static void __maybe_unused raise_mce(struct mce *m) mce_irq_ipi, NULL, 0); preempt_enable(); } else if (m->inject_flags & MCJ_NMI_BROADCAST) - __apic_send_IPI_mask(mce_inject_cpumask, NMI_VECTOR); + __apic_send_IPI_mask(mce_inject_cpumask, NMI_VECTOR_WITH_SOURCE(NMI_SO= URCE_VEC_IPI_MCE)); } start =3D jiffies; while (!cpumask_empty(mce_inject_cpumask)) { diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index d167eb23cf13..02198cf9fe21 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -416,7 +416,7 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs) */ void kgdb_roundup_cpus(void) { - apic_send_IPI_allbutself(NMI_VECTOR); + apic_send_IPI_allbutself(NMI_VECTOR_WITH_SOURCE(NMI_SOURCE_VEC_IPI_KGDB)); } #endif =20 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c index f014c8a66b0c..5aa122d3368c 100644 --- a/arch/x86/kernel/nmi_selftest.c +++ b/arch/x86/kernel/nmi_selftest.c @@ -76,7 +76,7 @@ static void __init test_nmi_ipi(struct cpumask *mask) /* sync above data before sending NMI */ wmb(); =20 - __apic_send_IPI_mask(mask, NMI_VECTOR); + __apic_send_IPI_mask(mask, NMI_VECTOR_WITH_SOURCE(NMI_SOURCE_VEC_IPI_TEST= )); =20 /* Don't wait longer than a second */ timeout =3D USEC_PER_SEC; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index acc19c1d3b4f..fb63bc0d6a0f 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -918,7 +918,7 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) */ wmb(); =20 - apic_send_IPI_allbutself(NMI_VECTOR); + apic_send_IPI_allbutself(NMI_VECTOR_WITH_SOURCE(NMI_SOURCE_VEC_IPI_REBOOT= )); =20 /* Kick CPUs looping in NMI context. */ WRITE_ONCE(crash_ipi_issued, 1); diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index f27469e40141..b79e78762a73 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -217,7 +217,7 @@ static void native_stop_other_cpus(int wait) pr_emerg("Shutting down cpus with NMI\n"); =20 for_each_cpu(cpu, &cpus_stop_mask) - __apic_send_IPI(cpu, NMI_VECTOR); + __apic_send_IPI(cpu, NMI_VECTOR_WITH_SOURCE(NMI_SOURCE_VEC_IPI_SMP_STO= P)); } /* * Don't wait longer than 10 ms if the caller didn't --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 D876E19D8B5; Tue, 9 Jul 2024 14:34:00 +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=1720535642; cv=none; b=bU75+jVpaiZwezIBQnZ1YBS7uouiY3Y0RCVD4B3lI/2nnU5GXw9+qxsRYl5OHVSv8GUVS1O6cUf43q38gRkC47Qa5Khego2ZMdHAPIuE90WkvnRjqkSE1HWQUDyvf38GLN5dJLiMP3c7G9NZKmM4cKfFyZWVAEd4tq7j9nn1rHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535642; c=relaxed/simple; bh=7bjtdaFBJ2jzOfqirLp/q3lGk0kqaRFheeODQY+sV28=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LWn/slDMW2oXNfjC734cOs4N4xMmIhS3KqP3EDKMZztib11aD21E/t4EWheHVMsC2v3bFZ+Zy4aVAx9K+VGWHhI0kc3QPGKONyZ7rzdrxh0cP+SuRlAnInJoEeMpZxJfLllP/HESMlPkr5OLpLpcuqHEktFFYo2K938PnQIeMog= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VAVyhhkr; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VAVyhhkr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535641; x=1752071641; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7bjtdaFBJ2jzOfqirLp/q3lGk0kqaRFheeODQY+sV28=; b=VAVyhhkru9cC/2EEKElvc7mMav50aatUk90YNZXaCMfzWC+WiVORXnzl k+S9wxjd2Bq5FSvqaWDqd5pZ06U2EylnVZlpMPJFpfoRHPoYbO1Ctp5Hh 8q0e4lYdzL/uaTlo07QE1mRC1zT0scZ2nRfgh0A4GBxGYnnhqC4J21Tt4 zg+OwlW3Wd70tx/xstZiNpM6fvT0bIXrz5G8TafYoOgDQYxNMEZzeMa8t tRjcHsJvpoMp3XtIrTNjtlUqPyqZBIqOuwypxNgtFlZX1458EGRJ8OvGv 2g3gj7nxxAtwxi7HlYtkNCFhfLO6xS1GgP1KgS569qZW1r+YcWpHjsn2H Q==; X-CSE-ConnectionGUID: MMg6qS2JTN2RDK0CsEPedA== X-CSE-MsgGUID: CTkIP8YzSvShX0Sf+yWmQQ== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331450" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331450" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:58 -0700 X-CSE-ConnectionGUID: 3NplHUibSXatRqZf7acIIg== X-CSE-MsgGUID: /pEXfiAETpajXM6lu5VbQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272154" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:58 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan Subject: [PATCH v4 10/11] x86/irq: Move __prepare_ICR to x86 common header Date: Tue, 9 Jul 2024 07:39:05 -0700 Message-Id: <20240709143906.1040477-11-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" To reuse __prepare_ICR() outside APIC local code, move it to the x86 common header. e.g. It can be used by the KVM PV IPI code. Signed-off-by: Jacob Pan --- arch/x86/include/asm/apic.h | 21 +++++++++++++++++++++ arch/x86/kernel/apic/local.h | 22 ---------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index d284eff7849c..6c98c51dc1b7 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -477,6 +477,27 @@ static __always_inline bool apic_id_valid(u32 apic_id) return apic_id <=3D apic->max_apic_id; } =20 +static inline bool is_nmi_vector(int vector) +{ + return (vector & NMI_SOURCE_VEC_MASK) =3D=3D NMI_VECTOR; +} + +static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, + unsigned int dest) +{ + unsigned int icr =3D shortcut | dest; + + if (is_nmi_vector(vector)) { + icr |=3D APIC_DM_NMI; + if (cpu_feature_enabled(X86_FEATURE_NMI_SOURCE)) + icr |=3D vector >> 16; + } else { + icr |=3D APIC_DM_FIXED | vector; + } + + return icr; +} + #else /* CONFIG_X86_LOCAL_APIC */ =20 static inline u32 apic_read(u32 reg) { return 0; } diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 60e90b7bf058..8b1fe152cd2d 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -12,7 +12,6 @@ =20 #include #include -#include =20 /* X2APIC */ void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int = dest); @@ -27,27 +26,6 @@ extern u32 x2apic_max_apicid; =20 DECLARE_STATIC_KEY_FALSE(apic_use_ipi_shorthand); =20 -static inline bool is_nmi_vector(int vector) -{ - return (vector & NMI_SOURCE_VEC_MASK) =3D=3D NMI_VECTOR; -} - -static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, - unsigned int dest) -{ - unsigned int icr =3D shortcut | dest; - - if (is_nmi_vector(vector)) { - icr |=3D APIC_DM_NMI; - if (cpu_feature_enabled(X86_FEATURE_NMI_SOURCE)) - icr |=3D vector >> 16; - } else { - icr |=3D APIC_DM_FIXED | vector; - } - - return icr; -} - void default_init_apic_ldr(void); =20 void apic_mem_wait_icr_idle(void); --=20 2.25.1 From nobody Sun Dec 14 06:40:14 2025 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 B046919DF63; Tue, 9 Jul 2024 14:34:01 +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=1720535643; cv=none; b=BNcaT/f4v3+FWtX0W0gCKSpchajHXX8t988FChBT2ZuQPj1YKfdrGK/GsAwG+rVClOe3HShfnIVHQMEQLCC1w65pSveDJgOQ5MF4nesOzX9CAynXMYfFTSAxpzaAMckitNCdAxmW4ssHqISOE/98lpHGJ06KCQcKR4djh8PW/CU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535643; c=relaxed/simple; bh=Tp959kLWh7E8+Ab1i/2oDdDjkEuJ0nDV0QTzBULHnwo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sl2zPm1GrtiE/y6rYfwDaFdG6qPkN40Gz5pcg8SRsHViLRuNd39ODrAYu449m+QULu113blUl8tRnEUvM2x9aKEaLYG08C/fAvk559LStSzAPS5V0D/XGRncgtE+zkhD6Vyow65xLzjUvFaPJ6o88+TY2F7mZ+Tdhn4MprBk3Zc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=OlMBkMT9; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OlMBkMT9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720535641; x=1752071641; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tp959kLWh7E8+Ab1i/2oDdDjkEuJ0nDV0QTzBULHnwo=; b=OlMBkMT9oVT04CwwqMsRwolzsA3MUJSvcBeqm5hJjj7VTFG/A4Kp2yoE lb6Dlam3IiBwoYNbtDOuylvGjHDmOf+dDNzvIw+FhaZnuKdFEMgcvDfLU xaOf8yXdRGO2LxWI10Hj6vtofORoK7uPV0Kf8Q5xMgoQhtnLDAgm6rcH2 o/ejDQ7BwdRZttp5BgWi5A7tzYqSHeQzv2JZdWGa9d9wCFjFGRxWdEOPa AcXowZ75Wudy2Y7x6FWXt3EFYHjS95NcAZqdTBHiehKUA6XAROSZ6or5C K534YHkQqklJO+PMYQQF5uxZLPZqCVtXec287zGiEZj2d31hHHO0L8ZGD w==; X-CSE-ConnectionGUID: i3/WR36mRlmQFrYtGydv9Q== X-CSE-MsgGUID: oEpdJVPTSJeUb/zQWJFE1g== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="35331459" X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="35331459" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 07:33:59 -0700 X-CSE-ConnectionGUID: P7PL283ZR9CV8AX/OCk/JQ== X-CSE-MsgGUID: lnhgi5THQXmMN29WzGQJGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,195,1716274800"; d="scan'208";a="52272160" Received: from jacob-builder.jf.intel.com ([10.54.39.125]) by fmviesa005.fm.intel.com with ESMTP; 09 Jul 2024 07:33:59 -0700 From: Jacob Pan To: X86 Kernel , Sean Christopherson , LKML , Thomas Gleixner , Dave Hansen , "H. Peter Anvin" , "Ingo Molnar" , "Borislav Petkov" , "Xin Li" , linux-perf-users@vger.kernel.org, Peter Zijlstra Cc: Paolo Bonzini , Tony Luck , Andy Lutomirski , acme@kernel.org, kan.liang@linux.intel.com, Andi Kleen , Nikolay Borisov , "Mehta, Sohil" , Jacob Pan , Zeng Guang Subject: [PATCH v4 11/11] KVM: X86: Use common code for PV IPIs in linux guest Date: Tue, 9 Jul 2024 07:39:06 -0700 Message-Id: <20240709143906.1040477-12-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240709143906.1040477-1-jacob.jun.pan@linux.intel.com> References: <20240709143906.1040477-1-jacob.jun.pan@linux.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" The paravirtual APIC hooks in KVM, some of which are used for sending PV IPIs, can reuse common code for ICR preparation. This shared code also encompasses NMI-source reporting when in effect. Originally-by: Zeng Guang Signed-off-by: Jacob Pan --- v4: Refine comments, no functional change. --- arch/x86/kernel/kvm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 263f8aed4e2c..a45d60aa0302 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -516,15 +516,7 @@ static void __send_ipi_mask(const struct cpumask *mask= , int vector) =20 local_irq_save(flags); =20 - switch (vector) { - default: - icr =3D APIC_DM_FIXED | vector; - break; - case NMI_VECTOR: - icr =3D APIC_DM_NMI; - break; - } - + icr =3D __prepare_ICR(0, vector, 0); for_each_cpu(cpu, mask) { apic_id =3D per_cpu(x86_cpu_to_apicid, cpu); if (!ipi_bitmap) { --=20 2.25.1