From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933107AbbIYTRc (ORCPT ); Fri, 25 Sep 2015 15:17:32 -0400 Received: from mail-by2on0088.outbound.protection.outlook.com ([207.46.100.88]:27328 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932831AbbIYTR0 (ORCPT ); Fri, 25 Sep 2015 15:17:26 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NV8YWU-08-9FJ-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , CC: , , Aravind Gopalakrishnan Subject: [PATCH V2 2/3] RAS, mce_amd_inj: Add capability to trigger apic interrupts Date: Fri, 25 Sep 2015 09:20:50 -0500 Message-ID: <1443190851-2172-3-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1443190851-2172-1-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1443190851-2172-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(46102003)(62966003)(36756003)(50986999)(2201001)(106466001)(189998001)(87936001)(47776003)(19580395003)(76176999)(19580405001)(229853001)(50466002)(53416004)(48376002)(105586002)(101416001)(50226001)(5001770100001)(5001860100001)(5003600100002)(86362001)(68736005)(5001830100001)(77156002)(4001540100001)(77096005)(97736004)(64706001)(11100500001)(2950100001)(92566002)(5007970100001)(5003940100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR12MB0712;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0712;2:dqdfejfwm7Evvm3UPO8U1n6MTcD/nwHR8yg0x6AA3RmznGYSsxT2fnwSIJ7c2+tu85bA5YdAs97m7YJqMrrjH8mFN0WutT/ueYuyhiwq5qU+vCJmiD+crisTDsUhRwTJy5MfHQWiOzgVe/rqj7hzEYxBrGWLxYtMRckxbgTZvDE=;3:fetrz9d6F4JO9EfpK8Y509rxgczEs+Y81bPzbfD7hd9XPsOKCOLdY4qjx7bTqSiqXwGKI13IsgTsKm4vYbeblogq9dh3LfNzcHw1KSZr7ZX3lqOZFXbaFMGqf46z1TGTmY3cASND9NLTITOA2TN9gnGZ/En3XphDfZOcVudyjy58KCmxstQzyHjmAuyBCmasoZTReMuCdFkyGm1vgC82mCPUIS3aMDwsmDKPNvlLW9QPU/4xi9zG8cevCRGWkuSQ;25:iSDBYI4ms74PNOBgzQe6O/fM8DVCVpigG17RfW1Hq1lcLEVBBxVtZYgy0x02vJSgiG28Zbq9WCUQMVsSVJicOdr9q03f5HXdr2vu3HlxZHxhAJwzGlkN9TBVQHTNQLt4wf75tTIrr1HwgYz4gg1/+eUHJ0QDf2Bf3ZD+quSsFVdi+Pibpddww4ltEoyLruaINnl/Hno9OHyP2uDDlxFIwIPJdQgKDK+qXha5jmXgwS9Rz3UBQaRBemECn0pW/yb6daWiPmNX9JQZ/cbUWf5fBg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0712; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0712;20:spwWdHrXpMYtpl895/2x2H8cFIDI+R6Oqs3DwHCQcqWYJ51X2Xi3jjDGW4O1ThNbWv9sZgL85Av1YW0481Z96WjmCOvJItzjqCYbBc1d7W1rfLrtzWh4T7XwRQwYqtkbDMrpg2rehwPZNxrAKBLlE12w2M9FDXj2N/SHH5ehBidFrBR5OSJEeZWH9vtmoEgRRV8naTGa8RuX/+Y9XI1HER6HyIPGlqhRKJ616pc5HobbAsQT9Dm0S/FrI2ofYsbadlX8+sSZ5ONQSPlDXW0sce5zTY9/5J+TXbns960FXMTuVscqczgKqf1r45CEZSPrrWca1P7SXeOl4AcKICc2r4OL1f2I1UsU3WPhlMIPPLaVpahzLldX+jPIa4SJN36/lvffoBbxWVO+9Jx+GcLDSVxbmt6HGTlh+JRdBniRqeH3QpoiKt05PuxDioUkBkkEeZndelgNOGoGj8Faj6JIGkAvE7qLyXWkVDEFOFEAdmf4gkh6FzsRcCwoUpidgg8I;4:B/XwEuZYRE3fCojRKXmPqJwfed21XG2tKK+A3gLKAER7MFGpVvlhnlRFeA+2vV3oGRjSZ4i4Op/uwycgJLr5qdQ23VFHEzdaKyIAdArhnLcVKmK5d63tICmBiYuJVNRsvum1mwTl88Niyi81x9bQskn0rFFlsGaBHQZkRqZB8aSlEaggjHb1F+bl983jp3woshNUeiz9XlmGYiPMEeIyaJw4OAvSINY8u6a8lx1Zd0cJF8ip26Kb2dwJMqrHc7HgvRt2+TAaq7xQF8ZW/hhW4wRnFRmA5BsPo1+Lz7/VtS+1aSUjTAzOt43AqV1l4Lvftxm5nhXdbH7H+qte8D74U3xwmFmTRwG62bMkd6s5kJA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001);SRVR:BY2PR12MB0712;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0712; X-Forefront-PRVS: 07106EF9B9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR12MB0712;23:fuFyAiKrL9BfKHL6cbtZJ2GiJa3wMJo6BfQ57w3Ra?= =?us-ascii?Q?QuZAR7BD+Bv3jfam9N+Cyp/dz+LqfHLR9S/UzqlJTjfYFnzCkn1bS7f7atrR?= =?us-ascii?Q?mrKV9HugNlOQn0+QR3WPGCIDgijxst3itbxC3a+Go2y1979SjUBRaxjgxoe/?= =?us-ascii?Q?sd2yuxauaf+4Miy7p6OKtizPrpXG61K2M1XChkeng+2/Cg2/hwwhzRddzoai?= =?us-ascii?Q?YjC0Wvas7Evg3AxfFZZ9oaf3P1XnlJfSbQDHnzK4CIgwx3Ml/1283MNHXNK0?= =?us-ascii?Q?JWsFG17fjLxZVsef+43fGnxq2KORMzoyMLHcB1rt2At/ODWTPENfz5Q50lMp?= =?us-ascii?Q?Ly+nVxN32D9GXMLDxTU2tXbP2j9CgLE+hx+ygLdNIhc62+Lipfh7YIL+Ec1k?= =?us-ascii?Q?M2+6mM3tCOmISoakRZYkG52bINvz60sEuJrQu0VXjR0YM5sUSl0RdB7A1lWT?= =?us-ascii?Q?7PUjice9wh1YbP12TNFck95LaohPhvv0GfLczcTCoUjRjL5Yu0Le8WMvlwxK?= =?us-ascii?Q?cpdepXBROxdfgrHfFHSOARSON9MMyGfM1QTOzIiyxLjmivhUX99l2IGhZZiN?= =?us-ascii?Q?jC03j38e7Ix4Iggz8hbm2sbtDveSkW9RKoZx3u3kLqSE0avBiMlRcbPOyxDt?= =?us-ascii?Q?t8/5jzixcM6MvHkOuD2Im2M+6zbmhBO4W891k5gnrU0trhpfoDo47AaSndza?= =?us-ascii?Q?SIHqkBcT+6KyYNHeUA35cWl1WaXYNz8jItzPDLS+5+0Ob9mbcljo+nUkyekP?= =?us-ascii?Q?7bijZZuNXKJS4p/+F2AKhsvvvdyTAzcJ5eEugor6EoAxER6o+VjS3LXp41o8?= =?us-ascii?Q?a0O0TKHFfCPZLtJiFJAs2P09nP4hGOF5y/IDnVxo1aU9tcWBLGEQovBSwieb?= =?us-ascii?Q?JwOiqfi1aRRbUuLLeYpHjQhQRGS8A1h3BxmF6ogoyjZQ5zF8X2AWzDRvhtp1?= =?us-ascii?Q?NcabuOIY1ylPj/uCQqoeRT9XDd91Zr+YG95j8ThdiAPrMLmOQazOW4OF3nlZ?= =?us-ascii?Q?SidhOZe24m0ML/OG+JRVTpH5zOnja3YvO2KQ0CyicQ6nFfHQDvgJAahN9k3s?= =?us-ascii?Q?hg+Xx3mW5CeddJeZwUBF7mDNqhEsUJG8cUt7rVBUfDNXPpXFTIt6sXQ5SP3B?= =?us-ascii?Q?E3wnoay6qA=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0712;5:Yts+MeUeV85VWHb1elW4Sak+GfRF03980KjOAelFKhdQ0MWs7fRIICkicSZsNqFHOqZJG2ng3J867mLi3PAHR5xNZO1aqLPf6wsrnh0biVhOctcChV0NOhwouqrraChUIToh/3JahjYRCPtXSPOV1Q==;24:VuoECit1ngcax1X/xpoqVfu8/UvGGdCaUIwYxIcuWCuqDJn/o1gqEeditCp4W7kPTPAY/leaGusSR2/ftsKlXIECs/pK03RgdOsohb2b66I=;20:nLSO2dYylOkyuFl8Dapq2emZbWL7ZVZ+zTajYNtz7gKMEKMcqVOI2Z2E0gxv3evfeQwq4aht4hI7yF6d3F75qA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2015 19:17:23.6789 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0712 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With this extension to the flags attribute, deferred error interrupts and threshold interrupts can be triggered to test the apic interrupt handler functionality for these type of errors Update README section about the same too. Signed-off-by: Aravind Gopalakrishnan --- arch/x86/ras/mce_amd_inj.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c index 4fd8bb9..794ca1f 100644 --- a/arch/x86/ras/mce_amd_inj.c +++ b/arch/x86/ras/mce_amd_inj.c @@ -34,12 +34,16 @@ static u8 n_banks; enum injection_type { SW_INJ = 0, /* SW injection, simply decode the error */ HW_INJ, /* Trigger a #MC */ + DFR_INT_INJ, /* Trigger Deferred error interrupt */ + THR_INT_INJ, /* Trigger threshold interrupt */ N_INJ_TYPES, }; static const char * const flags_options[] = { [SW_INJ] = "sw", [HW_INJ] = "hw", + [DFR_INT_INJ] = "df", + [THR_INT_INJ] = "th", NULL }; @@ -182,6 +186,16 @@ static void trigger_mce(void *info) asm volatile("int $18"); } +static void trigger_dfr_int(void *info) +{ + asm volatile("int %0" :: "i" (DEFERRED_ERROR_VECTOR)); +} + +static void trigger_thr_int(void *info) +{ + asm volatile("int %0" :: "i" (THRESHOLD_APIC_VECTOR)); +} + static void do_inject(void) { u64 mcg_status = 0; @@ -202,6 +216,20 @@ static void do_inject(void) if (!(i_mce.status & MCI_STATUS_PCC)) mcg_status |= MCG_STATUS_RIPV; + if (inj_type == DFR_INT_INJ) { + /* + * Ensure necessary status bits for deferred errors: + * a. MCx_STATUS[Deferred] is set - + * This is to ensure the error will be handled by the + * interrupt handler + * b. unset MCx_STATUS[UC] + * As deferred errors are _not_ UC + */ + + i_mce.status |= MCI_STATUS_DEFERRED; + i_mce.status |= (i_mce.status & ~MCI_STATUS_UC); + } + get_online_cpus(); if (!cpu_online(cpu)) goto err; @@ -222,7 +250,16 @@ static void do_inject(void) toggle_hw_mce_inject(cpu, false); - smp_call_function_single(cpu, trigger_mce, NULL, 0); + switch (inj_type) { + case DFR_INT_INJ: + smp_call_function_single(cpu, trigger_dfr_int, NULL, 0); + break; + case THR_INT_INJ: + smp_call_function_single(cpu, trigger_thr_int, NULL, 0); + break; + default: + smp_call_function_single(cpu, trigger_mce, NULL, 0); + } err: put_online_cpus(); @@ -287,6 +324,11 @@ static const char readme_msg[] = "\t handle the error. Be warned: might cause system panic if MCi_STATUS[PCC] \n" "\t is set. Therefore, consider setting (debugfs_mountpoint)/mce/fake_panic \n" "\t before injecting.\n" +"\t - \"df\": Trigger APIC interrupt for Deferred error. Causes deferred \n" +"\t error APIC interrupt handler to handle the error if the feature is \n" +"\t is present in hardware. \n" +"\t - \"th\": Trigger APIC interrupt for Threshold errors. Causes threshold \n" +"\t APIC interrupt handler to handle the error. \n" "\n"; static ssize_t -- 2.4.0