<!DOCTYPE html>
<!-- BaNnErBlUrFlE-BoDy-start -->
<!-- Preheader Text : BEGIN -->
<div style="display:none !important;display:none;visibility:hidden;mso-hide:all;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;opacity:0;overflow:hidden;">
Add a MODULE_SYSCTL_TABLE call into register_net_sysctl{_sz}() for existing callers to automatically use it. Add optional 'template arguments' to support a dynamic table/path defined at run-time based on a 'template' available at build-time. </div>
<!-- Preheader Text : END -->
<!-- Email Banner : BEGIN -->
<div style="display:none !important;display:none;visibility:hidden;mso-hide:all;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;opacity:0;overflow:hidden;"></div>
<!-- Email Banner : END -->
<!-- BaNnErBlUrFlE-BoDy-end -->
<html>
<head><!-- BaNnErBlUrFlE-HeAdEr-start -->
<style>
#pfptBanner42l8khh { all: revert !important; display: block !important;
visibility: visible !important; opacity: 1 !important;
background-color: #c2d4d4 !important;
max-width: none !important; max-height: none !important }
.pfptPrimaryButton42l8khh:hover, .pfptPrimaryButton42l8khh:focus {
background-color: #a2b1b1 !important; }
.pfptPrimaryButton42l8khh:active {
background-color: #828e8e !important; }
html:root, html:root>body { all: revert !important; display: block !important;
visibility: visible !important; opacity: 1 !important; }
</style>
<!-- BaNnErBlUrFlE-HeAdEr-end -->
</head><body><pre style="font-family: sans-serif; font-size: 100%; white-space: pre-wrap; word-wrap: break-word">Add a MODULE_SYSCTL_TABLE call into register_net_sysctl{_sz}() for existing
callers to automatically use it.
Add optional 'template arguments' to support a dynamic table/path defined
at run-time based on a 'template' available at build-time.
Split the update of callers with template arguments into separate commits,
disabling the macro for now.
Signed-off-by: Mauricio Faria de Oliveira <mfo@igalia.com>
---
include/linux/sysctl.h | 3 +++
include/net/net_namespace.h | 47 +++++++++++++++++++++++++++++++++++++++------
net/sysctl_net.c | 10 +++++-----
3 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index b808fbc1d964f453db8e354825fd8800db1eecd3..7241dbf7eb81ce9f906e33645d03944671c5e6f1 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -309,6 +309,9 @@ struct ctl_table_root {
*
* Define the macro SYSCTL_MODULE_ALIASES_DISABLE to disable this.
*/
+
+#define SYSCTL_MODULE_ALIASES_DISABLE
+
#if defined(CONFIG_SYSCTL_MODULE_ALIASES) && defined(MODULE) && \
!defined(SYSCTL_MODULE_ALIASES_DISABLE)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index e5ee673b9fcf846aefcc309d4cca1a8fc870aae2..c38ea2de35fe85c7ab8f1153a5c5681880b84840 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -520,17 +520,52 @@ void unregister_pernet_device(struct pernet_operations *);
struct ctl_table;
-#define register_net_sysctl(net, path, table) \
- register_net_sysctl_sz(net, path, table, ARRAY_SIZE(table))
+/*
+ * The register_net_sysctl{_sz}() wrappers for MODULE_SYSCTL_TABLE
+ * automatically create symbols in sysctl registration sites.
+ *
+ * See register_sysctl() and MODULE_SYSCTL_TABLE() in <linux/sysctl.h>
+ * for information about template arguments and options for the macro.
+ *
+ * Usage:
+ * - register_net_sysctl(net, path, table);
+ * - register_net_sysctl(net, path, table, table_tmpl);
+ * - register_net_sysctl(net, path, table, table_tmpl, path_tmpl);
+ * - register_net_sysctl_sz(net, path, table, size);
+ * - register_net_sysctl_sz(net, path, table, size, table_tmpl);
+ * - register_net_sysctl_sz(net, path, table, size, table_tmpl, path_tmpl);
+ */
+#define _register_net_sysctl_sz(net, path, table, size, table_tmpl, path_tmpl) \
+({ \
+ MODULE_SYSCTL_TABLE(path_tmpl, table_tmpl); \
+ __register_net_sysctl_sz(net, path, table, size); \
+})
+
+#define register_net_sysctl_sz(net, path, table, size, tmpl_args...) \
+ _register_net_sysctl_sz(net, path, table, size, \
+ __sysctl_table_tmpl_or_default(table, \
+ ## tmpl_args), \
+ __sysctl_path_tmpl_or_default(path, \
+ ## tmpl_args))
+#define register_net_sysctl(net, path, table, tmpl_args...) \
+ register_net_sysctl_sz(net, path, table, \
+ __sysctl_table_array_size(table, ## tmpl_args), \
+ ## tmpl_args)
+
+/* Helper macro for optional template arguments */
+#define __sysctl_table_array_size(table, tmpl_args...) \
+ ARRAY_SIZE(__sysctl_table_tmpl_or_default(table, ## tmpl_args))
+
#ifdef CONFIG_SYSCTL
int net_sysctl_init(void);
-struct ctl_table_header *register_net_sysctl_sz(struct net *net, const char *path,
- const struct ctl_table *table,
- size_t table_size);
+struct ctl_table_header *__register_net_sysctl_sz(struct net *net,
+ const char *path,
+ const struct ctl_table *table,
+ size_t table_size);
void unregister_net_sysctl_table(struct ctl_table_header *header);
#else
static inline int net_sysctl_init(void) { return 0; }
-static inline struct ctl_table_header *register_net_sysctl_sz(struct net *net,
+static inline struct ctl_table_header *__register_net_sysctl_sz(struct net *net,
const char *path, const struct ctl_table *table, size_t table_size)
{
return NULL;
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index e190a639eef2f6929c4aed85ad625aaf8a6ebd6a..e003210e0917760b707dae1e738c50d7c3969deb 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -160,10 +160,10 @@ static int ensure_safe_net_sysctl(struct net *net, const char *path,
return 0;
}
-struct ctl_table_header *register_net_sysctl_sz(struct net *net,
- const char *path,
- const struct ctl_table *table,
- size_t table_size)
+struct ctl_table_header *__register_net_sysctl_sz(struct net *net,
+ const char *path,
+ const struct ctl_table *table,
+ size_t table_size)
{
if (!net_eq(net, &init_net))
if (ensure_safe_net_sysctl(net, path, table, table_size))
@@ -171,7 +171,7 @@ struct ctl_table_header *register_net_sysctl_sz(struct net *net,
return __register_sysctl_table(&net->sysctls, path, table, table_size);
}
-EXPORT_SYMBOL_GPL(register_net_sysctl_sz);
+EXPORT_SYMBOL_GPL(__register_net_sysctl_sz);
void unregister_net_sysctl_table(struct ctl_table_header *header)
{
--
2.47.3
</pre></body></html>