From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965397AbdGTOF3 (ORCPT ); Thu, 20 Jul 2017 10:05:29 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:51775 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965379AbdGTOF2 (ORCPT ); Thu, 20 Jul 2017 10:05:28 -0400 Date: Thu, 20 Jul 2017 16:05:25 +0200 (CEST) From: Thomas Gleixner To: Ethan Barnes cc: "linux-kernel@vger.kernel.org" , "Srivatsa S. Bhat" , Paul McKenney , Ingo Molnar , Sebastian Siewior Subject: Re: [PATCH] cpu hotplug: Prevent Page Fault in cpuhp_remove_callbacks() In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 19 Jul 2017, Ethan Barnes wrote: > There is a page fault in cpu hotplug when removing the callbacks for the > last dynamic state. > The last dynamic state will not be removed, causing a page fault when > hotplug thinks the callbacks still exists and calls it. > > The problem is as follows: > - __cpuhp_remove_state() eventually calls cpuhp_store_callbacks() with > NULLs for most params. > - If state is the last state (i.e. CPUHP_AP_ONLINE_DYN or > CPUHP_BP_PREPARE_STATE) then cpuhp_store_callbacks() calls > cpuhp_reserve_state(), which returns the *next* available DYN state. > - The NULLs are stored in that *next* state (i.e. AP_ONLINE_DYN + 1 or > BP_PREPARE_DYN + 1) instead of in AP_ONLINE_DYN or BP_PREPARE_DYN. Thus, > the last state is never cleared. The callbacks now point to invalid memory. > - When the cpu is onlined again and/or offlined, then the invalid > callback is invoked, causing a page fault. Indeed. > The patch above solves this by detecting when a state is being removed, > and not calling cpuhp_reserve_state(). > > I have brought this up before, but hoping to get some traction on it > this time: > https://lkml.org/lkml/2017/7/5/574 Escaped my attention. > diff --git a/kernel/cpu.c b/kernel/cpu.c > index eee0331..f7fda16 100644 > --- a/kernel/cpu.c > +++ b/kernel/cpu.c > @@ -1252,7 +1252,8 @@ static int cpuhp_store_callbacks(enum cpuhp_state > state, const char *name, That patch is corrupted by your mail-client or mail-server or both. > struct cpuhp_step *sp; > int ret = 0; > > - if (state == CPUHP_AP_ONLINE_DYN || state == CPUHP_BP_PREPARE_DYN) { > + if (name && > + (state == CPUHP_AP_ONLINE_DYN || state == > CPUHP_BP_PREPARE_DYN)) { > ret = cpuhp_reserve_state(state); > if (ret < 0) > return ret; > Western Digital Corporation (and its subsidiaries) E-mail Confidentiality Notice & Disclaimer: > Can you please make sure that there is a blank line before that automatically inserted disclaimer? Thanks, tglx