Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-28 16:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sysctl: Remove check for sentinel element in ctl_table arrays

Browse Source 
Use ARRAY_SIZE exclusively by removing the check to ->procname in the
stopping criteria of the loops traversing ctl_table arrays. This commit
finalizes the removal of the sentinel elements at the end of ctl_table
arrays which reduces the build time size and run time memory bloat by
~64 bytes per sentinel (further information Link :
https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/)

Remove the entry->procname evaluation from the for loop stopping
criteria in sysctl and sysctl_net.

Signed-off-by: Joel Granados <j.granados@samsung.com>
This commit is contained in:
Joel Granados 2024-06-04 08:29:21 +02:00
parent e2a6c472de
commit d7a76ec871
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/proc_sysctl.c
View File

@ -21,7 +21,7 @@
#define list_for_each_table_entry(entry, header) \ #define list_for_each_table_entry(entry, header) \
entry = header->ctl_table; \ entry = header->ctl_table; \
for (size_t i = 0 ; i < header->ctl_table_size && entry->procname; ++i, entry++) for (size_t i = 0 ; i < header->ctl_table_size; ++i, entry++)
static const struct dentry_operations proc_sys_dentry_operations; static const struct dentry_operations proc_sys_dentry_operations;
static const struct file_operations proc_sys_file_operations; static const struct file_operations proc_sys_file_operations;

11
net/sysctl_net.c
View File

@ -127,7 +127,7 @@ static void ensure_safe_net_sysctl(struct net *net, const char *path,
pr_debug("Registering net sysctl (net %p): %s\n", net, path); pr_debug("Registering net sysctl (net %p): %s\n", net, path);
ent = table; ent = table;
for (size_t i = 0; i < table_size && ent->procname; ent++, i++) { for (size_t i = 0; i < table_size; ent++, i++) {
unsigned long addr; unsigned long addr;
const char *where; const char *where;
@ -165,17 +165,10 @@ struct ctl_table_header *register_net_sysctl_sz(struct net *net,
struct ctl_table *table, struct ctl_table *table,
size_t table_size) size_t table_size)
{ {
int count;
struct ctl_table *entry;
if (!net_eq(net, &init_net)) if (!net_eq(net, &init_net))
ensure_safe_net_sysctl(net, path, table, table_size); ensure_safe_net_sysctl(net, path, table, table_size);
entry = table; return __register_sysctl_table(&net->sysctls, path, table, table_size);
for (count = 0 ; count < table_size && entry->procname; entry++, count++)
;
return __register_sysctl_table(&net->sysctls, path, table, count);
} }
EXPORT_SYMBOL_GPL(register_net_sysctl_sz); EXPORT_SYMBOL_GPL(register_net_sysctl_sz);