From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Wed, 30 Sep 2015 13:26:53 +0200 From: Peter Zijlstra Subject: Re: [V4 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI Message-ID: <20150930112653.GF2881@worktop.programming.kicks-ass.net> References: <20150925112803.4258.94241.stgit@softrs> <20150925112805.4258.97380.stgit@softrs> <04EAB7311EE43145B2D3536183D1A8445499083F@GSjpTKYDCembx31.service.hitachi.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <04EAB7311EE43145B2D3536183D1A8445499083F@GSjpTKYDCembx31.service.hitachi.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: =?utf-8?B?5rKz5ZCI6Iux5a6PIC8gS0FXQUnvvIxISURFSElSTw==?= Cc: "x86@kernel.org" , Jonathan Corbet , "linux-doc@vger.kernel.org" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Michal Hocko , Ingo Molnar , Thomas Gleixner , "Eric W. Biederman" , "H. Peter Anvin" , =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= , Andrew Morton , Ingo Molnar , Vivek Goyal T24gRnJpLCBTZXAgMjUsIDIwMTUgYXQgMTI6MTM6NTVQTSArMDAwMCwg5rKz5ZCI6Iux5a6PIC8g S0FXQUnvvIxISURFSElSTyB3cm90ZToKPiBQZXRlciBzYWlkcyAtdGlwIHRyZWUgZG9lc24ndCBo YXZlIHBhbmljX29uX3VucmVjb3ZlcmVkX25taSBpbiB0aGUKPiBwcmV2aW9pdXMgZGlzY3Vzc2lv biwgYnV0IGl0IHN0aWxsIGV4aXN0cy4gIFNvLCBJIGRpZG4ndCBjaGFuZ2UKPiBhbnl0aGluZyBh Ym91dCBwYW5pY19vbl91bnJlY292ZXJlZF9ubWkuCj4gCgo+ID4gLS0tIGEvYXJjaC94ODYva2Vy bmVsL25taS5jCj4gPiArKysgYi9hcmNoL3g4Ni9rZXJuZWwvbm1pLmMKPiA+IEBAIC0yMzEsNyAr MjMxLDcgQEAgdm9pZCB1bnJlZ2lzdGVyX25taV9oYW5kbGVyKHVuc2lnbmVkIGludCB0eXBlLCBj b25zdCBjaGFyICpuYW1lKQo+ID4gICNlbmRpZgo+ID4gCj4gPiAgCWlmIChwYW5pY19vbl91bnJl Y292ZXJlZF9ubWkpCj4gPiAtCQlwYW5pYygiTk1JOiBOb3QgY29udGludWluZyIpOwo+ID4gKwkJ bm1pX3BhbmljKCJOTUk6IE5vdCBjb250aW51aW5nIik7Cj4gPiAKPiA+ICAJcHJfZW1lcmcoIkRh emVkIGFuZCBjb25mdXNlZCwgYnV0IHRyeWluZyB0byBjb250aW51ZVxuIik7Cj4gPiAKCkkgd2Fz IGxvb2tpbmcgYXQgdW5yZWdpc3Rlcl9ubWlfaGFuZGxlcigpIGJlY2F1c2UgdGhhdCdzIHRoZSBm dW5jdGlvbgp0aGUgZGlmZiBwb2ludHMgdG8uIFRoYXQgc3RpbGwgZG9lc24ndCBoYXZlIHBhbmlj X29uX3VucmVjb3ZlcmVkX25taS4KCkl0IGxvb2tzIGxpa2UgeW91ciBkaWZmIHRvb2wgaXMgJ2Jy b2tlbicgYW5kIGdlbmVyYXRlcyBub25zZW5zZSBmdW5jdGlvbgpkYXRhLgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka2V4ZWMgbWFpbGluZyBsaXN0Cmtl eGVjQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1h bi9saXN0aW5mby9rZXhlYwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933104AbbI3L1C (ORCPT ); Wed, 30 Sep 2015 07:27:02 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:40612 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932661AbbI3L07 (ORCPT ); Wed, 30 Sep 2015 07:26:59 -0400 Date: Wed, 30 Sep 2015 13:26:53 +0200 From: Peter Zijlstra To: =?utf-8?B?5rKz5ZCI6Iux5a6PIC8gS0FXQUnvvIxISURFSElSTw==?= Cc: Jonathan Corbet , Ingo Molnar , "Eric W. Biederman" , "H. Peter Anvin" , Andrew Morton , Thomas Gleixner , Vivek Goyal , "linux-doc@vger.kernel.org" , "x86@kernel.org" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Michal Hocko , Ingo Molnar , =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= Subject: Re: [V4 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI Message-ID: <20150930112653.GF2881@worktop.programming.kicks-ass.net> References: <20150925112803.4258.94241.stgit@softrs> <20150925112805.4258.97380.stgit@softrs> <04EAB7311EE43145B2D3536183D1A8445499083F@GSjpTKYDCembx31.service.hitachi.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <04EAB7311EE43145B2D3536183D1A8445499083F@GSjpTKYDCembx31.service.hitachi.net> User-Agent: Mutt/1.5.22.1 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 25, 2015 at 12:13:55PM +0000, 河合英宏 / KAWAI，HIDEHIRO wrote: > Peter saids -tip tree doesn't have panic_on_unrecovered_nmi in the > previoius discussion, but it still exists. So, I didn't change > anything about panic_on_unrecovered_nmi. > > > --- a/arch/x86/kernel/nmi.c > > +++ b/arch/x86/kernel/nmi.c > > @@ -231,7 +231,7 @@ void unregister_nmi_handler(unsigned int type, const char *name) > > #endif > > > > if (panic_on_unrecovered_nmi) > > - panic("NMI: Not continuing"); > > + nmi_panic("NMI: Not continuing"); > > > > pr_emerg("Dazed and confused, but trying to continue\n"); > > I was looking at unregister_nmi_handler() because that's the function the diff points to. That still doesn't have panic_on_unrecovered_nmi. It looks like your diff tool is 'broken' and generates nonsense function data.