kobject_uevent() question
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 7 lines · Greg KH
Quoted 6 lines · Mauricio Lin
Hi Greg,
It is working now. The failure was in the
kobject_uevent()function. As the kset of my kobject was not set properly, thekobject_uevent()function just returned void.
Quoted 8 lines
Quoted 2 lines
I wonder why the
kobjec_uevent()does not return an integer to indicate if the operation was completed with success or not.Feel free to send patches fixing this issue :)
thanks,
Something like this ?
-aneesh
include/linux/kobject.h +4 -4
@@ -265,8 +265,8 @@ extern int __must_check subsys_create_file(struct subsystem * , struct subsys_attribute *);#if defined(CONFIG_HOTPLUG ) -void kobject_uevent (struct kobject *kobj,enum kobject_action action); -void kobject_uevent_env (struct kobject *kobj,enum kobject_action action, +int kobject_uevent (struct kobject *kobj,enum kobject_action action); +int kobject_uevent_env (struct kobject *kobj,enum kobject_action action,char *envp[]); int add_uevent_var(char **envp, int num_envp, int *cur_index,
@@ -274,8 +274,8 @@ int add_uevent_var(char **envp, int num_envp, int *cur_index, const char *format, ...) __attribute__((format (printf, 7, 8)));#else -static inline void kobject_uevent (struct kobject *kobj,enum kobject_action action) { } -static inline void kobject_uevent_env (struct kobject *kobj, +static inline int kobject_uevent (struct kobject *kobj,enum kobject_action action) { } +static inline int kobject_uevent_env (struct kobject *kobj,enum kobject_action action,char *envp[]) { }
lib/kobject_uevent.c +24 -14
@@ -64,7 +64,7 @@ static char *action_to_string(enum kobject_action action)* @kobj: struct kobject that the action is happening to * @envp_ext: pointer to environmental data */ -void kobject_uevent_env (struct kobject *kobj,enum kobject_action action, +int kobject_uevent_env (struct kobject *kobj,enum kobject_action action,char *envp_ext[]) {char **envp;
@@ -79,14 +79,16 @@ void kobject_uevent_env(struct kobject *kobj, enum kobject_action action,u64 seq;char *seq_buff;int i =0 ; -int retval; +int retval =0 ;int j;pr_debug ("%s\n" , __FUNCTION__); action_string =action_to_string (action); -if (!action_string) -return ; +if (!action_string) { +pr_debug ("kobject attempted to send uevent without action_string!\n" ); +return -EINVAL ; + }/* search the kset we belong to */ top_kobj = kobj;
@@ -95,31 +97,39 @@ void kobject_uevent_env(struct kobject *kobj, enum kobject_action action, top_kobj = top_kobj->parent; }while (!top_kobj->kset && top_kobj->parent); } -if (!top_kobj->kset) -return ; +if (!top_kobj->kset) { +pr_debug ("kobject attempted to send uevent without kset!\n" ); +return -EINVAL ; + } kset = top_kobj->kset; uevent_ops = kset->uevent_ops;/* skip the event, if the filter returns zero. */ if (uevent_ops && uevent_ops->filter) -if (!uevent_ops->filter (kset, kobj)) -return ; +if (!uevent_ops->filter (kset, kobj)) { +pr_debug ("kobject filter function caused the event to drop!\n" ); +return 0 ; + }/* environment index */ envp =kzalloc (NUM_ENVP *sizeof (char *),GFP_KERNEL );if (!envp) -return ; +return -ENOMEM ;/* environment values */ buffer =kmalloc (BUFFER_SIZE ,GFP_KERNEL ); -if (!buffer) +if (!buffer) { + retval = -ENOMEM ; goto exit; + }/* complete object path */ devpath =kobject_get_path (kobj,GFP_KERNEL ); -if (!devpath) +if (!devpath) { + retval = -ENOENT ; goto exit; + }/* originating subsystem */ if (uevent_ops && uevent_ops->name)
@@ -204,7 +214,7 @@ exit:kfree (devpath);kfree (buffer);kfree (envp); -return ; +return retval; }EXPORT_SYMBOL_GPL (kobject_uevent_env);
@@ -215,9 +225,9 @@ EXPORT_SYMBOL_GPL(kobject_uevent_env);* @action: action that is happening (usually KOBJ_ADD and KOBJ_REMOVE) * @kobj: struct kobject that the action is happening to */ -void kobject_uevent (struct kobject *kobj,enum kobject_action action) +int kobject_uevent (struct kobject *kobj,enum kobject_action action) { -kobject_uevent_env (kobj, action,NULL ); +return kobject_uevent_env (kobj, action,NULL ); }EXPORT_SYMBOL_GPL (kobject_uevent);
Hi Aneesh,
I have posted a patch for that as well. You can check it at
http://lkml.org/lkml/2006/11/30/315.
BR,
Mauricio Lin.
Quoted 23 lines · Aneesh Kumar K.V
Quoted 7 lines · Greg KH
Quoted 6 lines · Mauricio Lin
Hi Greg,
It is working now. The failure was in the
kobject_uevent()function. As the kset of my kobject was not set properly, thekobject_uevent()function just returned void.Quoted 8 lines
Quoted 2 lines
I wonder why the
kobjec_uevent()does not return an integer to indicate if the operation was completed with success or not.Feel free to send patches fixing this issue :)
thanks,
Something like this ?
-aneesh
Quoted 5 lines · Mauricio Lin
Hi Aneesh,
I have posted a patch for that as well. You can check it at
http://lkml.org/lkml/2006/11/30/315.
Changes i posted was with respect to a latest kernel and also had some more failure case properly returning error. So i picked my diff added the commit message and function documentation from your diff. I have posted a new diff with sign-off. Let me know what you think.
-aneesh