UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: storvsc: remove unnecessary channel inbound lock 

In storvsc driver, inbound messages do not go through inbound lock.  The
only effect of this lock was is to provide a barrier for connect and
remove logic.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Stephen Hemminger 2017-05-18 09:18:12 -07:00 committed by Martin K. Petersen
parent ddccd9528d
commit 2371cd90ab
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hv/channel_mgmt.c
View File

@ -332,7 +332,6 @@ static struct vmbus_channel *alloc_channel(void)
if (!channel) if (!channel)
return NULL; return NULL;
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);

8
drivers/scsi/storvsc_drv.c
View File

@ -1206,13 +1206,13 @@ static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size,
static int storvsc_dev_remove(struct hv_device *device) static int storvsc_dev_remove(struct hv_device *device)
{ {
struct storvsc_device *stor_device; struct storvsc_device *stor_device;
unsigned long flags;
stor_device = hv_get_drvdata(device); stor_device = hv_get_drvdata(device);
spin_lock_irqsave(&device->channel->inbound_lock, flags);
stor_device->destroy = true; stor_device->destroy = true;
spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
/* Make sure flag is set before waiting */
wmb();
/* /*
* At this point, all outbound traffic should be disable. We * At this point, all outbound traffic should be disable. We
@ -1229,9 +1229,7 @@ static int storvsc_dev_remove(struct hv_device *device)
* we have drained - to drain the outgoing packets, we need to * we have drained - to drain the outgoing packets, we need to
* allow incoming packets. * allow incoming packets.
*/ */
spin_lock_irqsave(&device->channel->inbound_lock, flags);
hv_set_drvdata(device, NULL); hv_set_drvdata(device, NULL);
spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
/* Close the channel */ /* Close the channel */
vmbus_close(device->channel); vmbus_close(device->channel);

1
include/linux/hyperv.h
View File

@ -744,7 +744,6 @@ struct vmbus_channel {
u32 ringbuffer_pagecount; u32 ringbuffer_pagecount;
struct hv_ring_buffer_info outbound; /* send to parent */ struct hv_ring_buffer_info outbound; /* send to parent */
struct hv_ring_buffer_info inbound; /* receive from parent */ struct hv_ring_buffer_info inbound; /* receive from parent */
spinlock_t inbound_lock;
struct vmbus_close_msg close_msg; struct vmbus_close_msg close_msg;