Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc63b6f6 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

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: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e513229b

drivers/hv/channel_mgmt.c

+4 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -875,10 +875,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
Original line number Diff line number Diff line
@@ -646,6 +646,9 @@ struct hv_input_signal_event_buffer { 
};



struct vmbus_channel {

	/* Unique channel id */

	int id;



	struct list_head listentry;



	struct hv_device *device_obj;