2022-04-07 21:12:42

by Liao Hua

Subject: [PATCH sysctl-next v3] latencytop: move sysctl to its own file

From: liaohua <[email protected]>

This moves latencytop sysctl to kernel/latencytop.c

Signed-off-by: liaohua <[email protected]>

------
v3:
Base the patch on the latest sysctl-next and resubmit.

v2: https://lore.kernel.org/lkml/[email protected]/
Move latencytop sysctl to its own file base based on sysctl-next.

v1: https://lore.kernel.org/lkml/[email protected]/
Move latencytop sysctl to its own file base based on linux master.
---
include/linux/latencytop.h | 3 ---
kernel/latencytop.c | 41 +++++++++++++++++++++++++++++------------
kernel/sysctl.c | 10 ----------
3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/include/linux/latencytop.h b/include/linux/latencytop.h
index abe3d95f795b..84f1053cf2a8 100644
--- a/include/linux/latencytop.h
+++ b/include/linux/latencytop.h
@@ -38,9 +38,6 @@ account_scheduler_latency(struct task_struct *task, int usecs, int inter)

void clear_tsk_latency_tracing(struct task_struct *p);

-int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
- size_t *lenp, loff_t *ppos);
-
#else

static inline void
diff --git a/kernel/latencytop.c b/kernel/latencytop.c
index 166d7bf49666..76166df011a4 100644
--- a/kernel/latencytop.c
+++ b/kernel/latencytop.c
@@ -55,6 +55,7 @@
#include <linux/sched/stat.h>
#include <linux/list.h>
#include <linux/stacktrace.h>
+#include <linux/sysctl.h>

static DEFINE_RAW_SPINLOCK(latency_lock);

@@ -63,6 +64,31 @@ static struct latency_record latency_record[MAXLR];

int latencytop_enabled;

+#ifdef CONFIG_SYSCTL
+static int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
+ size_t *lenp, loff_t *ppos)
+{
+ int err;
+
+ err = proc_dointvec(table, write, buffer, lenp, ppos);
+ if (latencytop_enabled)
+ force_schedstat_enabled();
+
+ return err;
+}
+
+static struct ctl_table latencytop_sysctl[] = {
+ {
+ .procname = "latencytop",
+ .data = &latencytop_enabled,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = sysctl_latencytop,
+ },
+ {}
+};
+#endif
+
void clear_tsk_latency_tracing(struct task_struct *p)
{
unsigned long flags;
@@ -266,18 +292,9 @@ static const struct proc_ops lstats_proc_ops = {
static int __init init_lstats_procfs(void)
{
proc_create("latency_stats", 0644, NULL, &lstats_proc_ops);
+#ifdef CONFIG_SYSCTL
+ register_sysctl_init("kernel", latencytop_sysctl);
+#endif
return 0;
}
-
-int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
- size_t *lenp, loff_t *ppos)
-{
- int err;
-
- err = proc_dointvec(table, write, buffer, lenp, ppos);
- if (latencytop_enabled)
- force_schedstat_enabled();
-
- return err;
-}
device_initcall(init_lstats_procfs);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 21172d3dad6e..2db637ca91c9 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -65,7 +65,6 @@
#include <linux/bpf.h>
#include <linux/mount.h>
#include <linux/userfaultfd_k.h>
-#include <linux/latencytop.h>
#include <linux/pid.h>

#include "../lib/kstrtox.h"
@@ -1685,15 +1684,6 @@ static struct ctl_table kern_table[] = {
.extra2 = SYSCTL_ONE,
},
#endif
-#ifdef CONFIG_LATENCYTOP
- {
- .procname = "latencytop",
- .data = &latencytop_enabled,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = sysctl_latencytop,
- },
-#endif
{
.procname = "print-fatal-signals",
.data = &print_fatal_signals,
--
2.12.3

2022-04-16 00:55:16

by Luis Chamberlain

Subject: Re: [PATCH sysctl-next v3] latencytop: move sysctl to its own file

On Thu, Apr 07, 2022 at 03:29:48PM +0800, Liao Hua wrote:
> From: liaohua <[email protected]>
>
> This moves latencytop sysctl to kernel/latencytop.c
>
> Signed-off-by: liaohua <[email protected]>

Thanks! Queued onto sysctl-testing.

Luis