Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Xiaoming Ni <nixiaoming@huawei.com>
To: <mcgrof@kernel.org>, <keescook@chromium.org>,
	<yzaikin@google.com>, <adobriyan@gmail.com>, <mingo@kernel.org>,
	<nixiaoming@huawei.com>, <gpiccoli@canonical.com>, <rdna@fb.com>,
	<patrick.bellasi@arm.com>, <sfr@canb.auug.org.au>,
	<akpm@linux-foundation.org>, <mhocko@suse.com>,
	<penguin-kernel@i-love.sakura.ne.jp>, <vbabka@suse.cz>,
	<tglx@linutronix.de>, <peterz@infradead.org>,
	<Jisheng.Zhang@synaptics.com>, <khlebnikov@yandex-team.ru>,
	<bigeasy@linutronix.de>, <pmladek@suse.com>,
	<linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Cc: <wangle6@huawei.com>, <alex.huangjianhui@huawei.com>
Subject: [PATCH v4 1/4] sysctl: Add register_sysctl_init() interface
Date: Tue, 19 May 2020 11:31:08 +0800	[thread overview]
Message-ID: <1589859071-25898-2-git-send-email-nixiaoming@huawei.com> (raw)
In-Reply-To: <1589859071-25898-1-git-send-email-nixiaoming@huawei.com>

In order to eliminate the duplicate code for registering the sysctl
interface during the initialization of each feature, add the
register_sysctl_init() interface

Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
 include/linux/sysctl.h |  2 ++
 kernel/sysctl.c        | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 50bb7f3..857ba93 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -197,6 +197,8 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path,
 void unregister_sysctl_table(struct ctl_table_header * table);
 
 extern int sysctl_init(void);
+extern void register_sysctl_init(const char *path, struct ctl_table *table,
+				 const char *table_name);
 void do_sysctl_args(void);
 
 extern int pwrsw_enabled;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cc1fcba..8afd713 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -3358,6 +3358,25 @@ int __init sysctl_init(void)
 	kmemleak_not_leak(hdr);
 	return 0;
 }
+
+/*
+ * The sysctl interface is used to modify the interface value,
+ * but the feature interface has default values. Even if register_sysctl fails,
+ * the feature body function can also run. At the same time, malloc small
+ * fragment of memory during the system initialization phase, almost does
+ * not fail. Therefore, the function return is designed as void
+ */
+void __init register_sysctl_init(const char *path, struct ctl_table *table,
+				 const char *table_name)
+{
+	struct ctl_table_header *hdr = register_sysctl(path, table);
+
+	if (unlikely(!hdr)) {
+		pr_err("failed when register_sysctl %s to %s\n", table_name, path);
+		return;
+	}
+	kmemleak_not_leak(hdr);
+}
 #endif /* CONFIG_SYSCTL */
 /*
  * No sense putting this after each symbol definition, twice,
-- 
1.8.5.6


  reply	other threads:[~2020-05-19  3:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-19  3:31 [PATCH v4 0/4] cleaning up the sysctls table (hung_task watchdog) Xiaoming Ni
2020-05-19  3:31 ` Xiaoming Ni [this message]
2020-05-29  7:09   ` [PATCH v4 1/4] sysctl: Add register_sysctl_init() interface Luis Chamberlain
2020-05-29  7:27     ` Xiaoming Ni
2020-05-29  7:36       ` Luis Chamberlain
2020-05-29  8:33         ` Xiaoming Ni
2020-05-29 11:31           ` Luis Chamberlain
2020-05-19  3:31 ` [PATCH v4 2/4] sysctl: Move some boundary constants form sysctl.c to sysctl_vals Xiaoming Ni
2020-05-19  4:44   ` Tetsuo Handa
2020-05-20  1:14     ` Xiaoming Ni
2020-05-20  1:39       ` Luis Chamberlain
2020-05-19  3:31 ` [PATCH v4 3/4] hung_task: Move hung_task sysctl interface to hung_task.c Xiaoming Ni
2020-05-19  3:31 ` [PATCH v4 4/4] watchdog: move watchdog sysctl interface to watchdog.c Xiaoming Ni
2020-05-20  3:31 ` [PATCH v4 0/4] cleaning up the sysctls table (hung_task watchdog) Andrew Morton
2020-05-20  4:02   ` Xiaoming Ni
2020-05-20 13:08     ` Luis Chamberlain

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=1589859071-25898-2-git-send-email-nixiaoming@huawei.com \
    --to=nixiaoming@huawei.com \
    --cc=Jisheng.Zhang@synaptics.com \
    --cc=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=alex.huangjianhui@huawei.com \
    --cc=bigeasy@linutronix.de \
    --cc=gpiccoli@canonical.com \
    --cc=keescook@chromium.org \
    --cc=khlebnikov@yandex-team.ru \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=mhocko@suse.com \
    --cc=mingo@kernel.org \
    --cc=patrick.bellasi@arm.com \
    --cc=penguin-kernel@i-love.sakura.ne.jp \
    --cc=peterz@infradead.org \
    --cc=pmladek@suse.com \
    --cc=rdna@fb.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=vbabka@suse.cz \
    --cc=wangle6@huawei.com \
    --cc=yzaikin@google.com \
    --subject='Re: [PATCH v4 1/4] sysctl: Add register_sysctl_init() interface' \
    /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

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).