From: Christoph Egger Subject: [PATCH] xen34: fix crash Date: Fri, 17 Dec 2010 14:49:16 +0100 Message-ID: <201012171449.17668.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_dp2CNoea0qBLcSw" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Keir Fraser List-Id: xen-devel@lists.xenproject.org --Boundary-00=_dp2CNoea0qBLcSw Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, attached patch backports c/s 21774 to Xen 3.4-testing. ----------------------------------------------------------------------------------- mce: Replace BUG() with a console warning in the MCE handler. If the hardware reports corrected errors that we didn't see through the status MSRs, complain on the console but don't BUG() the machine. Signed-off-by: Tim Deegan ----------------------------------------------------------------------------------- Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_dp2CNoea0qBLcSw Content-Type: text/x-diff; charset="iso 8859-15"; name="xen34_mcefix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen34_mcefix.diff" Content-Description: xen34_mcefix.diff diff -r 14709d196e43 xen/arch/x86/cpu/mcheck/amd_nonfatal.c --- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Wed Jun 30 18:26:13 2010 +0100 +++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c Fri Dec 17 14:44:27 2010 +0100 @@ -155,14 +155,19 @@ static void mce_amd_work_fn(void *data) /* HW does not count *all* kinds of correctable errors. * Thus it is possible, that the polling routine finds an - * correctable error even if the HW reports nothing. - * However, the other way around is not possible (= BUG). - */ + * correctable error even if the HW reports nothing. */ if (counter > 0) { /* HW reported correctable errors, * the polling routine did not find... */ - BUG_ON(adjust == 0); + if (adjust == 0) { + printk("CPU counter reports %"PRIu32 + " correctable hardware error%s that %s" + " not reported by the status MSRs\n", + counter, + (counter == 1 ? "" : "s"), + (counter == 1 ? "was" : "were")); + } /* subtract 1 to not double count the error * from the polling service routine */ adjust += (counter - 1); --Boundary-00=_dp2CNoea0qBLcSw Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_dp2CNoea0qBLcSw--