Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 02:05:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

module: sysfs: Add notes attributes through attribute_group

Browse Source 
A kobject is meant to manage the lifecycle of some resource.
However the module sysfs code only creates a kobject to get a
"notes" subdirectory in sysfs.
This can be achieved easier and cheaper by using a sysfs group.
Switch the notes attribute code to such a group, similar to how the
section allocation in the same file already works.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20241227-sysfs-const-bin_attr-module-v2-5-e267275f0f37@weissschuh.net
Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
This commit is contained in:
Thomas Weißschuh 2024-12-27 14:23:24 +01:00 committed by Petr Pavlu
parent 75b519abc9
commit fc15d675bc
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
kernel/module/sysfs.c
View File

@ -138,20 +138,13 @@ static void remove_sect_attrs(struct module *mod)
*/ */
struct module_notes_attrs { struct module_notes_attrs {
struct kobject *dir; struct attribute_group grp;
unsigned int notes; struct bin_attribute attrs[];
struct bin_attribute attrs[] __counted_by(notes);
}; };
static void free_notes_attrs(struct module_notes_attrs *notes_attrs, static void free_notes_attrs(struct module_notes_attrs *notes_attrs)
unsigned int i)
{ {
if (notes_attrs->dir) { kfree(notes_attrs->grp.bin_attrs);
while (i-- > 0)
sysfs_remove_bin_file(notes_attrs->dir,
&notes_attrs->attrs[i]);
kobject_put(notes_attrs->dir);
}
kfree(notes_attrs); kfree(notes_attrs);
} }
@ -159,6 +152,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
{ {
unsigned int notes, loaded, i; unsigned int notes, loaded, i;
struct module_notes_attrs *notes_attrs; struct module_notes_attrs *notes_attrs;
struct bin_attribute **gattr;
struct bin_attribute *nattr; struct bin_attribute *nattr;
int ret; int ret;
@ -177,7 +171,15 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
if (!notes_attrs) if (!notes_attrs)
return -ENOMEM; return -ENOMEM;
notes_attrs->notes = notes; gattr = kcalloc(notes + 1, sizeof(*gattr), GFP_KERNEL);
if (!gattr) {
kfree(notes_attrs);
return -ENOMEM;
}
notes_attrs->grp.name = "notes";
notes_attrs->grp.bin_attrs = gattr;
nattr = &notes_attrs->attrs[0]; nattr = &notes_attrs->attrs[0];
for (loaded = i = 0; i < info->hdr->e_shnum; ++i) { for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {
if (sect_empty(&info->sechdrs[i])) if (sect_empty(&info->sechdrs[i]))
@ -189,35 +191,35 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
nattr->size = info->sechdrs[i].sh_size; nattr->size = info->sechdrs[i].sh_size;
nattr->private = (void *)info->sechdrs[i].sh_addr; nattr->private = (void *)info->sechdrs[i].sh_addr;
nattr->read = sysfs_bin_attr_simple_read; nattr->read = sysfs_bin_attr_simple_read;
++nattr; *(gattr++) = nattr++;
} }
++loaded; ++loaded;
} }
notes_attrs->dir = kobject_create_and_add("notes", &mod->mkobj.kobj); ret = sysfs_create_group(&mod->mkobj.kobj, &notes_attrs->grp);
if (!notes_attrs->dir) { if (ret)
ret = -ENOMEM;
goto out; goto out;
}
for (i = 0; i < notes; ++i) {
ret = sysfs_create_bin_file(notes_attrs->dir, &notes_attrs->attrs[i]);
if (ret)
goto out;
}
mod->notes_attrs = notes_attrs; mod->notes_attrs = notes_attrs;
return 0; return 0;
out: out:
free_notes_attrs(notes_attrs, i); free_notes_attrs(notes_attrs);
return ret; return ret;
} }
static void remove_notes_attrs(struct module *mod) static void remove_notes_attrs(struct module *mod)
{ {
if (mod->notes_attrs) if (mod->notes_attrs) {
free_notes_attrs(mod->notes_attrs, mod->notes_attrs->notes); sysfs_remove_group(&mod->mkobj.kobj,
&mod->notes_attrs->grp);
/*
* We are positive that no one is using any notes attrs
* at this point. Deallocate immediately.
*/
free_notes_attrs(mod->notes_attrs);
mod->notes_attrs = NULL;
}
} }
#else /* !CONFIG_KALLSYMS */ #else /* !CONFIG_KALLSYMS */