lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <tip-b7a349819d4b9b5db64e523351e66a79a758eaa5@git.kernel.org> Date: Thu, 14 Sep 2017 03:41:57 -0700 From: tip-bot for Thomas Gleixner <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: tglx@...utronix.de, peterz@...radead.org, hpa@...or.com, dzickus@...hat.com, npiggin@...il.com, bp@...en8.de, cmetcalf@...lanox.com, mingo@...nel.org, torvalds@...ux-foundation.org, uobergfe@...hat.com, linux-kernel@...r.kernel.org, bigeasy@...utronix.de, akpm@...ux-foundation.org Subject: [tip:core/urgent] watchdog/core: Rework CPU hotplug locking Commit-ID: b7a349819d4b9b5db64e523351e66a79a758eaa5 Gitweb: http://git.kernel.org/tip/b7a349819d4b9b5db64e523351e66a79a758eaa5 Author: Thomas Gleixner <tglx@...utronix.de> AuthorDate: Tue, 12 Sep 2017 21:37:00 +0200 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Thu, 14 Sep 2017 11:41:04 +0200 watchdog/core: Rework CPU hotplug locking The watchdog proc interface causes extensive recursive locking of the CPU hotplug percpu rwsem, which is deadlock prone. Replace the get/put_online_cpus() pairs with cpu_hotplug_disable()/enable() calls for now. Later patches will remove that requirement completely. Reported-by: Borislav Petkov <bp@...en8.de> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Reviewed-by: Don Zickus <dzickus@...hat.com> Cc: Andrew Morton <akpm@...ux-foundation.org> Cc: Chris Metcalf <cmetcalf@...lanox.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Nicholas Piggin <npiggin@...il.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Sebastian Siewior <bigeasy@...utronix.de> Cc: Ulrich Obergfell <uobergfe@...hat.com> Link: http://lkml.kernel.org/r/20170912194146.568079057@linutronix.de Signed-off-by: Ingo Molnar <mingo@...nel.org> --- kernel/watchdog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index b2d4675..cd79f64 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -703,7 +703,7 @@ static int proc_watchdog_common(int which, struct ctl_table *table, int write, int err, old, new; int *watchdog_param = (int *)table->data; - get_online_cpus(); + cpu_hotplug_disable(); mutex_lock(&watchdog_proc_mutex); /* @@ -752,7 +752,7 @@ static int proc_watchdog_common(int which, struct ctl_table *table, int write, } out: mutex_unlock(&watchdog_proc_mutex); - put_online_cpus(); + cpu_hotplug_enable(); return err; } @@ -794,7 +794,7 @@ int proc_watchdog_thresh(struct ctl_table *table, int write, { int err, old, new; - get_online_cpus(); + cpu_hotplug_disable(); mutex_lock(&watchdog_proc_mutex); old = ACCESS_ONCE(watchdog_thresh); @@ -818,7 +818,7 @@ int proc_watchdog_thresh(struct ctl_table *table, int write, } out: mutex_unlock(&watchdog_proc_mutex); - put_online_cpus(); + cpu_hotplug_enable(); return err; } @@ -833,7 +833,7 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write, { int err; - get_online_cpus(); + cpu_hotplug_disable(); mutex_lock(&watchdog_proc_mutex); err = proc_do_large_bitmap(table, write, buffer, lenp, ppos); @@ -856,7 +856,7 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write, } mutex_unlock(&watchdog_proc_mutex); - put_online_cpus(); + cpu_hotplug_enable(); return err; }
Powered by blists - more mailing lists