along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/config.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/err.h>
+#include <linux/slab.h>
#if 0
#define DEBUGP printk
#define DEBUGP(fmt, a...)
#endif
-static inline int dash2underscore(char c)
+static inline char dash2underscore(char c)
{
if (c == '-')
return '_';
static char *next_arg(char *args, char **param, char **val)
{
unsigned int i, equals = 0;
- int in_quote = 0;
+ int in_quote = 0, quoted = 0;
+ char *next;
- /* Chew any extra spaces */
- while (*args == ' ') args++;
+ if (*args == '"') {
+ args++;
+ in_quote = 1;
+ quoted = 1;
+ }
for (i = 0; args[i]; i++) {
if (args[i] == ' ' && !in_quote)
if (args[i-1] == '"')
args[i-1] = '\0';
}
+ if (quoted && args[i-1] == '"')
+ args[i-1] = '\0';
}
if (args[i]) {
args[i] = '\0';
- return args + i + 1;
+ next = args + i + 1;
} else
- return args + i;
+ next = args + i;
+
+ /* Chew up trailing spaces. */
+ while (*next == ' ')
+ next++;
+ return next;
}
/* Args looks like "foo=bar,bar2 baz=fuz wiz". */
DEBUGP("Parsing ARGS: %s\n", args);
+ /* Chew leading spaces */
+ while (*args == ' ')
+ args++;
+
while (*args) {
int ret;
+ int irq_was_disabled;
args = next_arg(args, ¶m, &val);
+ irq_was_disabled = irqs_disabled();
ret = parse_one(param, val, params, num, unknown);
+ if (irq_was_disabled && !irqs_disabled()) {
+ printk(KERN_WARNING "parse_args(): option '%s' enabled "
+ "irq's!\n", param);
+ }
switch (ret) {
case -ENOENT:
printk(KERN_ERR "%s: Unknown parameter `%s'\n",
}
/* We cheat here and temporarily mangle the string. */
-int param_array(const char *name,
- const char *val,
- unsigned int min, unsigned int max,
- void *elem, int elemsize,
- int (*set)(const char *, struct kernel_param *kp),
- int *num)
+static int param_array(const char *name,
+ const char *val,
+ unsigned int min, unsigned int max,
+ void *elem, int elemsize,
+ int (*set)(const char *, struct kernel_param *kp),
+ int *num)
{
int ret;
struct kernel_param kp;
int param_array_set(const char *val, struct kernel_param *kp)
{
struct kparam_array *arr = kp->arg;
+ unsigned int temp_num;
return param_array(kp->name, val, 1, arr->max, arr->elem,
- arr->elemsize, arr->set, arr->num ?: &arr->max);
+ arr->elemsize, arr->set, arr->num ?: &temp_num);
}
int param_array_get(char *buffer, struct kernel_param *kp)
struct param_attribute
{
- struct attribute attr;
+ struct module_attribute mattr;
struct kernel_param *param;
};
-struct param_kobject
+struct module_param_attrs
{
- struct kobject kobj;
-
- unsigned int num_attributes;
- struct param_attribute attr[0];
+ struct attribute_group grp;
+ struct param_attribute attrs[0];
};
-#define to_param_attr(n) container_of(n, struct param_attribute, attr);
+#define to_param_attr(n) container_of(n, struct param_attribute, mattr);
-static ssize_t param_attr_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
+static ssize_t param_attr_show(struct module_attribute *mattr,
+ struct module *mod, char *buf)
{
int count;
- struct param_attribute *attribute = to_param_attr(attr);
+ struct param_attribute *attribute = to_param_attr(mattr);
if (!attribute->param->get)
return -EPERM;
}
/* sysfs always hands a nul-terminated string in buf. We rely on that. */
-static ssize_t param_attr_store(struct kobject *kobj,
- struct attribute *attr,
+static ssize_t param_attr_store(struct module_attribute *mattr,
+ struct module *owner,
const char *buf, size_t len)
{
int err;
- struct param_attribute *attribute = to_param_attr(attr);
+ struct param_attribute *attribute = to_param_attr(mattr);
if (!attribute->param->set)
return -EPERM;
return err;
}
-
-static struct sysfs_ops param_sysfs_ops = {
- .show = param_attr_show,
- .store = param_attr_store,
-};
-
-static void param_kobj_release(struct kobject *kobj)
-{
- kfree(container_of(kobj, struct param_kobject, kobj));
-}
-
-static struct kobj_type param_ktype = {
- .sysfs_ops = ¶m_sysfs_ops,
- .release = ¶m_kobj_release,
-};
-
-static struct kset param_kset = {
- .subsys = &module_subsys,
- .ktype = ¶m_ktype,
-};
-
#ifdef CONFIG_MODULES
#define __modinit
#else
#define __modinit __init
#endif
-/*
- * param_add_attribute - actually adds an parameter to sysfs
- * @mod: owner of parameter
- * @pk: param_kobject the attribute shall be assigned to.
- * One per module, one per KBUILD_MODNAME.
- * @kp: kernel_param to be added
- * @skip: offset where the parameter name start in kp->name.
- * Needed for built-in modules
- *
- * Fill in data into appropriate &pk->attr[], and create sysfs file.
- */
-static __modinit int param_add_attribute(struct module *mod,
- struct param_kobject *pk,
- struct kernel_param *kp,
- unsigned int skip)
-{
- struct param_attribute *a;
- int err;
-
- a = &pk->attr[pk->num_attributes];
- a->attr.name = (char *) &kp->name[skip];
- a->attr.owner = mod;
- a->attr.mode = kp->perm;
- a->param = kp;
- err = sysfs_create_file(&pk->kobj, &a->attr);
- if (!err)
- pk->num_attributes++;
- return err;
-}
-
-/*
- * param_sysfs_remove - remove sysfs support for one module or KBUILD_MODNAME
- * @pk: struct param_kobject which is to be removed
- *
- * Called when an error in registration occurs or a module is removed
- * from the system.
- */
-static __modinit void param_sysfs_remove(struct param_kobject *pk)
-{
- unsigned int i;
- for (i = 0; i < pk->num_attributes; i++)
- sysfs_remove_file(&pk->kobj,&pk->attr[i].attr);
-
- /* Calls param_kobj_release */
- kobject_unregister(&pk->kobj);
-}
-
-
/*
* param_sysfs_setup - setup sysfs support for one module or KBUILD_MODNAME
* @mk: struct module_kobject (contains parent kobject)
* in sysfs. A pointer to the param_kobject is returned on success,
* NULL if there's no parameter to export, or other ERR_PTR(err).
*/
-static __modinit struct param_kobject *
+static __modinit struct module_param_attrs *
param_sysfs_setup(struct module_kobject *mk,
struct kernel_param *kparam,
unsigned int num_params,
unsigned int name_skip)
{
- struct param_kobject *pk;
+ struct module_param_attrs *mp;
unsigned int valid_attrs = 0;
- unsigned int i;
+ unsigned int i, size[2];
+ struct param_attribute *pattr;
+ struct attribute **gattr;
int err;
for (i=0; i<num_params; i++) {
if (!valid_attrs)
return NULL;
- pk = kmalloc(sizeof(struct param_kobject)
- + sizeof(struct param_attribute) * valid_attrs,
- GFP_KERNEL);
- if (!pk)
- return ERR_PTR(-ENOMEM);
- memset(pk, 0, sizeof(struct param_kobject)
- + sizeof(struct param_attribute) * valid_attrs);
+ size[0] = ALIGN(sizeof(*mp) +
+ valid_attrs * sizeof(mp->attrs[0]),
+ sizeof(mp->grp.attrs[0]));
+ size[1] = (valid_attrs + 1) * sizeof(mp->grp.attrs[0]);
- err = kobject_set_name(&pk->kobj, "parameters");
- if (err)
- goto out;
+ mp = kmalloc(size[0] + size[1], GFP_KERNEL);
+ if (!mp)
+ return ERR_PTR(-ENOMEM);
- pk->kobj.kset = ¶m_kset;
- pk->kobj.parent = &mk->kobj;
- err = kobject_register(&pk->kobj);
- if (err)
- goto out;
+ mp->grp.name = "parameters";
+ mp->grp.attrs = (void *)mp + size[0];
+ pattr = &mp->attrs[0];
+ gattr = &mp->grp.attrs[0];
for (i = 0; i < num_params; i++) {
- if (kparam[i].perm) {
- err = param_add_attribute(mk->mod, pk,
- &kparam[i], name_skip);
- if (err)
- goto out_unreg;
+ struct kernel_param *kp = &kparam[i];
+ if (kp->perm) {
+ pattr->param = kp;
+ pattr->mattr.show = param_attr_show;
+ pattr->mattr.store = param_attr_store;
+ pattr->mattr.attr.name = (char *)&kp->name[name_skip];
+ pattr->mattr.attr.owner = mk->mod;
+ pattr->mattr.attr.mode = kp->perm;
+ *(gattr++) = &(pattr++)->mattr.attr;
}
}
+ *gattr = NULL;
- return pk;
-
-out_unreg:
- param_sysfs_remove(pk);
- return ERR_PTR(err);
-
-out:
- kfree(pk);
- return ERR_PTR(err);
+ if ((err = sysfs_create_group(&mk->kobj, &mp->grp))) {
+ kfree(mp);
+ return ERR_PTR(err);
+ }
+ return mp;
}
struct kernel_param *kparam,
unsigned int num_params)
{
- struct param_kobject *pk;
+ struct module_param_attrs *mp;
- pk = param_sysfs_setup(mod->mkobj, kparam, num_params, 0);
- if (IS_ERR(pk))
- return PTR_ERR(pk);
+ mp = param_sysfs_setup(&mod->mkobj, kparam, num_params, 0);
+ if (IS_ERR(mp))
+ return PTR_ERR(mp);
- mod->params_kobject = pk;
+ mod->param_attrs = mp;
return 0;
}
*/
void module_param_sysfs_remove(struct module *mod)
{
- if (mod->params_kobject) {
- param_sysfs_remove(mod->params_kobject);
- mod->params_kobject = NULL;
+ if (mod->param_attrs) {
+ sysfs_remove_group(&mod->mkobj.kobj,
+ &mod->param_attrs->grp);
+ /* We are positive that no one is using any param
+ * attrs at this point. Deallocate immediately. */
+ kfree(mod->param_attrs);
+ mod->param_attrs = NULL;
}
}
#endif
unsigned int name_skip)
{
struct module_kobject *mk;
+ int ret;
- mk = kmalloc(sizeof(struct module_kobject), GFP_KERNEL);
- memset(mk, 0, sizeof(struct module_kobject));
+ mk = kzalloc(sizeof(struct module_kobject), GFP_KERNEL);
+ BUG_ON(!mk);
mk->mod = THIS_MODULE;
kobj_set_kset_s(mk, module_subsys);
kobject_set_name(&mk->kobj, name);
- kobject_register(&mk->kobj);
+ ret = kobject_register(&mk->kobj);
+ BUG_ON(ret < 0);
/* no need to keep the kobject if no parameter is exported */
- if (!param_sysfs_setup(mk, kparam, num_params, name_skip))
+ if (!param_sysfs_setup(mk, kparam, num_params, name_skip)) {
kobject_unregister(&mk->kobj);
+ kfree(mk);
+ }
}
/*
/* module-related sysfs stuff */
-#ifdef CONFIG_MODULES
+#ifdef CONFIG_SYSFS
#define to_module_attr(n) container_of(n, struct module_attribute, attr);
#define to_module_kobject(n) container_of(n, struct module_kobject, kobj);
mk = to_module_kobject(kobj);
if (!attribute->show)
- return -EPERM;
+ return -EIO;
+
+ ret = attribute->show(attribute, mk->mod, buf);
+
+ return ret;
+}
- if (!try_module_get(mk->mod))
- return -ENODEV;
+static ssize_t module_attr_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buf, size_t len)
+{
+ struct module_attribute *attribute;
+ struct module_kobject *mk;
+ int ret;
+
+ attribute = to_module_attr(attr);
+ mk = to_module_kobject(kobj);
- ret = attribute->show(mk->mod, buf);
+ if (!attribute->store)
+ return -EIO;
- module_put(mk->mod);
+ ret = attribute->store(attribute, mk->mod, buf, len);
return ret;
}
static struct sysfs_ops module_sysfs_ops = {
.show = module_attr_show,
- .store = NULL,
+ .store = module_attr_store,
};
#else
};
#endif
-static void module_kobj_release(struct kobject *kobj)
-{
- kfree(container_of(kobj, struct module_kobject, kobj));
-}
-
static struct kobj_type module_ktype = {
.sysfs_ops = &module_sysfs_ops,
- .release = &module_kobj_release,
};
decl_subsys(module, &module_ktype, NULL);
*/
static int __init param_sysfs_init(void)
{
- subsystem_register(&module_subsys);
- kobject_set_name(¶m_kset.kobj, "parameters");
- kset_init(¶m_kset);
+ int ret;
+
+ ret = subsystem_register(&module_subsys);
+ if (ret < 0) {
+ printk(KERN_WARNING "%s (%d): subsystem_register error: %d\n",
+ __FILE__, __LINE__, ret);
+ return ret;
+ }
param_sysfs_builtin();
return 0;
}
-__initcall(param_sysfs_init);
+subsys_initcall(param_sysfs_init);
EXPORT_SYMBOL(param_set_byte);
EXPORT_SYMBOL(param_get_byte);
git://git.onelab.eu / linux-2.6.git / blobdiff