Drivers: hv: vmbus: rename channel work queues
PATCH 1/1 Drivers: hv: vmbus: rename channel work queues
All channel work queues are named 'hv_vmbus_ctl', this makes them indistinguishable in ps output and makes it hard to link to the corresponding vmbus device. Rename them to hv_vmbus_ctl/N and make vmbus device names match, e.g. now vmbus_1 device is served by hv_vmbus_ctl/1 work queue.
Signed-off-by Vitaly Kuznetsov <[email protected]>
--- drivers/hv/channel_mgmt.c | 5 ++++- drivers/hv/vmbus_drv.c | 6 ++---- include/linux/hyperv.h | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-)
drivers/hv/channel_mgmt.c +4 -1
@@ -139,19 +139,22 @@ EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp);*/ static struct vmbus_channel *alloc_channel (void ) { +static atomic_t chan_num =ATOMIC_INIT (0 );struct vmbus_channel *channel; channel =kzalloc (sizeof (*channel),GFP_ATOMIC );if (!channel)return NULL ; + channel->id =atomic_inc_return (&chan_num);spin_lock_init (&channel->inbound_lock);spin_lock_init (&channel->lock);INIT_LIST_HEAD (&channel->sc_list);INIT_LIST_HEAD (&channel->percpu_list); - channel->controlwq =create_workqueue ("hv_vmbus_ctl" ); + channel->controlwq =alloc_workqueue ("hv_vmbus_ctl/%d" ,WQ_MEM_RECLAIM , +1 , channel->id);if (!channel->controlwq) {kfree (channel);return NULL ;
drivers/hv/vmbus_drv.c +2 -4
@@ -811,10 +811,8 @@ int vmbus_device_register(struct hv_device *child_device_obj) {int ret =0 ; -static atomic_t device_num =ATOMIC_INIT (0 ); - -dev_set_name (&child_device_obj->device,"vmbus_0_%d" , -atomic_inc_return (&device_num)); +dev_set_name (&child_device_obj->device,"vmbus_%d" , + child_device_obj->channel->id); child_device_obj->device.bus = &hv_bus; child_device_obj->device.parent = &hv_acpi_dev->dev;
include/linux/hyperv.h +3 -0
@@ -634,6 +634,9 @@ struct hv_input_signal_event_buffer { };struct vmbus_channel { +/* Unique channel id */ +int id; +struct list_head listentry;struct hv_device *device_obj;
Signature · 1 line
1.9.3