IB/core: allow HCAs to create IB port sysfs files
PATCH v2 1/1 IB/core: allow HCAs to create IB port sysfs files
This patch adds a new function to sysfs.c so that HCAs can create files in /sys/class/infiniband/<hca>/ports/<N>/. There is no need for an unregister function since the kobject reference will go to zero when ib_unregister_device() is called.
---
Note that this patch replaces the earlier patch I sent which exported struct ib_port.
drivers/infiniband/core/sysfs.c | 19 +++++++++++++++++++ include/rdma/ib_verbs.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-)
drivers/infiniband/core/sysfs.c +19 -0
@@ -857,3 +857,22 @@ void ib_sysfs_cleanup(void) {class_unregister (&ib_class); } + +int ib_sysfs_create_port_files (struct ib_device *device, +int (*create)(struct ib_device *dev,u8 port_num, +struct kobject *kobj)) +{ +struct kobject *p; +struct ib_port *port; +int ret =0 ; + +list_for_each_entry (p, &device->port_list, entry) { + port = container_of(p, struct ib_port, kobj); + ret =create (device, port->port_num, &port->kobj); +if (ret) +break ; + } + +return ret; +} +EXPORT_SYMBOL (ib_sysfs_create_port_files);
include/rdma/ib_verbs.h +9 -0
@@ -1186,6 +1186,15 @@ static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len }/** +* ib_sysfs_create_port_files - iterate over port sysfs directories +* @device: the IB device +* @create: a function to create sysfs files in each port directory +*/ +int ib_sysfs_create_port_files (struct ib_device *device, +int (*create)(struct ib_device *dev,u8 port_num, +struct kobject *kobj)); + +/** * ib_modify_qp_is_ok - Check that the supplied attribute mask * contains all required attributes and no attributes not allowed for * the given QP state transition.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1258486848.992.407.camel-/[email protected]
Rather than have the device driver call a new function that then calls it back, how about if we just add a parameter to the ib_register_device() call that is the callback to add the sysfs stuff? This would let us avoid the race where the device is registered but not all the sysfs stuff is created yet.
- R.
Signature · 6 lines
Roland Dreier <[email protected]> || For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/index.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): adamxxdwtys.fsf-BjVyx320WGW9gfZ95n9DRSW4+XlvGpQz@public.gmane.org
Quoted 5 lines
Rather than have the device driver call a new function that then calls it back, how about if we just add a parameter to the
ib_register_device()call that is the callback to add the sysfs stuff? This would let us avoid the race where the device is registered but not all the sysfs stuff is created yet.
And as an improvement, maybe someday we could convert the existing per-device driver-specific sysfs stuff to a similar approach.
Signature · 6 lines
Roland Dreier <[email protected]> || For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/index.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Roland Dreier
Rather than have the device driver call a new function that then calls it back, how about if we just add a parameter to the
ib_register_device()call that is the callback to add the sysfs stuff? This would let us avoid the race where the device is registered but not all the sysfs stuff is created yet.- R.
I'm not sure this is any less of a race than what I proposed or the calls to device_create_file() that most IB device drivers make after calling ib_register_device().
Is the following what you would like to see?
Note that all the hw/*/ drivers have to be changed to call ib_register_device() with the new parameter.
drivers/infiniband/core/core_priv.h +1 -1
@@ -38,7 +38,7 @@#include <rdma/ib_verbs.h> -int ib_device_register_sysfs (struct ib_device *device); +int ib_device_register_sysfs (struct ib_device *device,sysfs_cb cb);void ib_device_unregister_sysfs (struct ib_device *device);int ib_sysfs_setup (void );
drivers/infiniband/core/device.c +2 -2
@@ -267,7 +267,7 @@ out:* callback for each device that is added. @device must be allocated * with ib_alloc_device(). */ -int ib_register_device (struct ib_device *device) +int ib_register_device (struct ib_device *device,sysfs_cb cb) {int ret;
@@ -296,7 +296,7 @@ int ib_register_device(struct ib_device *device) goto out; } - ret =ib_device_register_sysfs (device); + ret =ib_device_register_sysfs (device, cb);if (ret) {printk (KERN_WARNING "Couldn't register device %s with driver model\n" , device->name);
drivers/infiniband/core/sysfs.c +23 -1
@@ -754,7 +754,23 @@ static struct attribute_group iw_stats_group = { .attrs = iw_proto_stats_attrs, }; -int ib_device_register_sysfs (struct ib_device *device) +static int sysfs_create_port_files (struct ib_device *device,sysfs_cb cb) +{ +struct kobject *p; +struct ib_port *port; +int ret =0 ; + +list_for_each_entry (p, &device->port_list, entry) { + port = container_of(p, struct ib_port, kobj); + ret =cb (device, port->port_num, &port->kobj); +if (ret) +break ; + } + +return ret; +} + +int ib_device_register_sysfs (struct ib_device *device,sysfs_cb cb) {struct device *class_dev = &device->dev;int ret;
@@ -802,6 +818,12 @@ int ib_device_register_sysfs(struct ib_device *device) goto err_put; } +if (cb) { + ret =sysfs_create_port_files (device, cb); +if (ret) + goto err_put; + } +return 0 ; err_put:
include/rdma/ib_verbs.h +4 -1
@@ -1189,7 +1189,10 @@ struct ib_client {struct ib_device *ib_alloc_device (size_t size);void ib_dealloc_device (struct ib_device *device); -int ib_register_device (struct ib_device *device); +typedef int (*sysfs_cb )(struct ib_device *dev,u8 port_num, +struct kobject *kobj); + +int ib_register_device (struct ib_device *device,sysfs_cb cb);void ib_unregister_device (struct ib_device *device);int ib_register_client (struct ib_client *client);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html