iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drivers: hv: vmbus: rename channel work queues

Browse Source 
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 <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vitaly Kuznetsov 2015-02-27 11:25:52 -08:00 committed by Greg Kroah-Hartman
parent e513229b4c
commit bc63b6f634
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hv/channel_mgmt.c
View File

@ -139,19 +139,22 @@ EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp);
*/ */
static struct vmbus_channel *alloc_channel(void) static struct vmbus_channel *alloc_channel(void)
{ {
static atomic_t chan_num = ATOMIC_INIT(0);
struct vmbus_channel *channel; struct vmbus_channel *channel;
channel = kzalloc(sizeof(*channel), GFP_ATOMIC); channel = kzalloc(sizeof(*channel), GFP_ATOMIC);
if (!channel) if (!channel)
return NULL; return NULL;
channel->id = atomic_inc_return(&chan_num);
spin_lock_init(&channel->inbound_lock); spin_lock_init(&channel->inbound_lock);
spin_lock_init(&channel->lock); spin_lock_init(&channel->lock);
INIT_LIST_HEAD(&channel->sc_list); INIT_LIST_HEAD(&channel->sc_list);
INIT_LIST_HEAD(&channel->percpu_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) { if (!channel->controlwq) {
kfree(channel); kfree(channel);
return NULL; return NULL;

6
drivers/hv/vmbus_drv.c
View File

@ -875,10 +875,8 @@ int vmbus_device_register(struct hv_device *child_device_obj)
{ {
int ret = 0; int ret = 0;
static atomic_t device_num = ATOMIC_INIT(0); dev_set_name(&child_device_obj->device, "vmbus_%d",
child_device_obj->channel->id);
dev_set_name(&child_device_obj->device, "vmbus_0_%d",
atomic_inc_return(&device_num));
child_device_obj->device.bus = &hv_bus; child_device_obj->device.bus = &hv_bus;
child_device_obj->device.parent = &hv_acpi_dev->dev; child_device_obj->device.parent = &hv_acpi_dev->dev;

3
include/linux/hyperv.h
View File

@ -646,6 +646,9 @@ struct hv_input_signal_event_buffer {
}; };
struct vmbus_channel { struct vmbus_channel {
/* Unique channel id */
int id;
struct list_head listentry; struct list_head listentry;
struct hv_device *device_obj; struct hv_device *device_obj;