Skip to contentSkip to conversation

kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl.patch removed from -mm tree

merged [email protected] 1 participant 1 message Jun 8, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: kernel/hung_task convert hung_task_panic boot parameter to sysctl
has been removed from the -mm tree. Its filename was
kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Vlastimil Babka <[email protected]>
Subject: kernel/hung_task convert hung_task_panic boot parameter to sysctl

We can now handle sysctl parameters on kernel command line and have infrastructure to convert legacy command line options that duplicate sysctl to become a sysctl alias.

This patch converts the hung_task_panic parameter. Note that the sysctl handler is more strict and allows only 0 and 1, while the legacy parameter allowed any non-zero value. But there is little reason anyone would not be using 1.

Cc Alexey Dobriyan <[email protected]>
Cc Christian Brauner <[email protected]>
Cc David Rientjes <[email protected]>
Cc "Eric W . Biederman" <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc "Guilherme G . Piccoli" <[email protected]>
Cc Iurii Zaikin <[email protected]>
Cc Ivan Teterevkov <[email protected]>
Cc Luis Chamberlain <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

 Documentation/admin-guide/kernel-parameters.txt |    2 +-
 fs/proc/proc_sysctl.c                           |    1 +
 kernel/hung_task.c                              |   10 ----------
 3 files changed, 2 insertions(+), 11 deletions(-)
Documentation/admin-guide/kernel-parameters.txt renamed from Documentation/admin-guide/kernel-parameters.txt~kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl +1 -1
@@ -1515,7 +1515,7 @@
 			[KNL] Should the hung task detector generate panics.
 			Format: <integer>
 
-			A nonzero value instructs the kernel to panic when a
+			A value of 1 instructs the kernel to panic when a
 			hung task is detected. The default value is controlled
 			by the CONFIG_BOOTPARAM_HUNG_TASK_PANIC build-time
 			option. The value selected by this boot parameter can
fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl +1 -0
@@ -1721,6 +1721,7 @@ struct sysctl_alias {
  */
 static const struct sysctl_alias sysctl_aliases[] = {
 	{"numa_zonelist_order",		"vm.numa_zonelist_order" },
+	{"hung_task_panic",		"kernel.hung_task_panic" },
 	{ }
 };
 
kernel/hung_task.c renamed from kernel/hung_task.c~kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl +0 -9
@@ -63,16 +63,6 @@ static struct task_struct *watchdog_task
 unsigned int __read_mostly sysctl_hung_task_panic =
 				CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE;
 
-static int __init hung_task_panic_setup(char *str)
-{
-	int rc = kstrtouint(str, 0, &sysctl_hung_task_panic);
-
-	if (rc)
-		return rc;
-	return 1;
-}
-__setup("hung_task_panic=", hung_task_panic_setup);