From: tip-bot for Frederic Weisbecker <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, lcapitulino@redhat.com,
mingo@kernel.org, tglx@linutronix.de, cl@linux.com,
kernellwp@gmail.com, riel@redhat.com, paulmck@linux.vnet.ibm.com,
linux-kernel@vger.kernel.org, efault@gmx.de, hpa@zytor.com,
peterz@infradead.org, frederic@kernel.org, cmetcalf@mellanox.com
Subject: [tip:sched/core] watchdog: Use housekeeping_cpumask() instead of ad-hoc version
Date: Tue, 24 Oct 2017 07:49:42 -0700 [thread overview]
Message-ID: <tip-50e8101e1924460ad9349ba13782d64ce034a64f@git.kernel.org> (raw)
In-Reply-To: <1508850421-10058-3-git-send-email-frederic@kernel.org>
Commit-ID: 50e8101e1924460ad9349ba13782d64ce034a64f
Gitweb: https://git.kernel.org/tip/50e8101e1924460ad9349ba13782d64ce034a64f
Author: Frederic Weisbecker <frederic@kernel.org>
AuthorDate: Tue, 24 Oct 2017 15:06:51 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 24 Oct 2017 15:20:13 +0200
watchdog: Use housekeeping_cpumask() instead of ad-hoc version
While trying to disable the watchog on nohz_full CPUs, the watchdog
implements an ad-hoc version of housekeeping_cpumask(). Lets replace
those re-invented lines.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <kernellwp@gmail.com>
Link: http://lkml.kernel.org/r/1508850421-10058-3-git-send-email-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/watchdog.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index d71eee0..3ddce04 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -774,15 +774,10 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write,
void __init lockup_detector_init(void)
{
-#ifdef CONFIG_NO_HZ_FULL
- if (tick_nohz_full_enabled()) {
+ if (tick_nohz_full_enabled())
pr_info("Disabling watchdog on nohz_full cores by default\n");
- cpumask_copy(&watchdog_cpumask, housekeeping_mask);
- } else
- cpumask_copy(&watchdog_cpumask, cpu_possible_mask);
-#else
- cpumask_copy(&watchdog_cpumask, cpu_possible_mask);
-#endif
+
+ cpumask_copy(&watchdog_cpumask, housekeeping_cpumask());
if (!watchdog_nmi_probe())
nmi_watchdog_available = true;
next prev parent reply other threads:[~2017-10-24 14:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 13:06 [GIT PULL] Introduce housekeeping subsystem v5 Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 01/12] housekeeping: Move housekeeping related code to its own file Frederic Weisbecker
2017-10-24 13:35 ` Paul E. McKenney
2017-10-24 14:49 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 02/12] watchdog: Use housekeeping_cpumask() instead of ad-hoc version Frederic Weisbecker
2017-10-24 14:49 ` tip-bot for Frederic Weisbecker [this message]
2017-10-24 13:06 ` [PATCH 03/12] housekeeping: Provide a dynamic off-case to housekeeping_any_cpu() Frederic Weisbecker
2017-10-24 14:50 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 04/12] housekeeping: Make housekeeping cpumask private Frederic Weisbecker
2017-10-24 14:50 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 05/12] housekeeping: Use its own static key Frederic Weisbecker
2017-10-24 14:50 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 06/12] housekeeping: Rename is_housekeeping_cpu to housekeeping_cpu Frederic Weisbecker
2017-10-24 14:51 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 07/12] housekeeping: Move it under its own config, independant from NO_HZ Frederic Weisbecker
2017-10-24 14:51 ` [tip:sched/core] housekeeping: Move it under its own config, independent " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 08/12] housekeeping: Introduce housekeeping flags Frederic Weisbecker
2017-10-24 14:52 ` [tip:sched/core] " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 09/12] housekeeping: Handle nohz_full= parameter Frederic Weisbecker
2017-10-24 14:52 ` [tip:sched/core] housekeeping: Handle the " tip-bot for Frederic Weisbecker
2017-10-24 13:06 ` [PATCH 10/12] housekeeping: Move isolcpus to housekeeping Frederic Weisbecker
2017-10-24 13:07 ` [PATCH 11/12] housekeeping: Add basic isolcpus flags Frederic Weisbecker
2017-10-24 13:07 ` [PATCH 12/12] housekeeping: Document " Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-50e8101e1924460ad9349ba13782d64ce034a64f@git.kernel.org \
--to=tipbot@zytor.com \
--cc=cl@linux.com \
--cc=cmetcalf@mellanox.com \
--cc=efault@gmx.de \
--cc=frederic@kernel.org \
--cc=hpa@zytor.com \
--cc=kernellwp@gmail.com \
--cc=lcapitulino@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).