lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drivers: hv: util: Fix a bug in the KVP code

Browse Source 
Add code to poll the channel since we process only one message
at a time and the host may not interrupt us. Also increase the
receive buffer size since some KVP messages are close to 8K bytes in size.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan
2014-07-07 16:34:25 -07:00
committed by Greg Kroah-Hartman
parent affb1aff30
commit 9bd2d0dfe4
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hv/hv_kvp.c
View File

@@ -127,6 +127,17 @@ kvp_work_func(struct work_struct *dummy)
kvp_respond_to_host(NULL, HV_E_FAIL); kvp_respond_to_host(NULL, HV_E_FAIL);
} }
static void poll_channel(struct vmbus_channel *channel)
{
if (channel->target_cpu != smp_processor_id())
smp_call_function_single(channel->target_cpu,
hv_kvp_onchannelcallback,
channel, true);
else
hv_kvp_onchannelcallback(channel);
}
static int kvp_handle_handshake(struct hv_kvp_msg *msg) static int kvp_handle_handshake(struct hv_kvp_msg *msg)
{ {
int ret = 1; int ret = 1;
@@ -155,7 +166,7 @@ static int kvp_handle_handshake(struct hv_kvp_msg *msg)
kvp_register(dm_reg_value); kvp_register(dm_reg_value);
kvp_transaction.active = false; kvp_transaction.active = false;
if (kvp_transaction.kvp_context) if (kvp_transaction.kvp_context)
hv_kvp_onchannelcallback(kvp_transaction.kvp_context); poll_channel(kvp_transaction.kvp_context);
} }
return ret; return ret;
} }
@@ -568,7 +579,7 @@ response_done:
vmbus_sendpacket(channel, recv_buffer, buf_len, req_id, vmbus_sendpacket(channel, recv_buffer, buf_len, req_id,
VM_PKT_DATA_INBAND, 0); VM_PKT_DATA_INBAND, 0);
poll_channel(channel);
} }
/* /*
@@ -603,7 +614,7 @@ void hv_kvp_onchannelcallback(void *context)
return; return;
} }
vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 2, &recvlen, vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 4, &recvlen,
&requestid); &requestid);
if (recvlen > 0) { if (recvlen > 0) {

2
drivers/hv/hv_util.c
View File

@@ -319,7 +319,7 @@ static int util_probe(struct hv_device *dev,
(struct hv_util_service *)dev_id->driver_data; (struct hv_util_service *)dev_id->driver_data;
int ret; int ret;
srv->recv_buffer = kmalloc(PAGE_SIZE * 2, GFP_KERNEL); srv->recv_buffer = kmalloc(PAGE_SIZE * 4, GFP_KERNEL);
if (!srv->recv_buffer) if (!srv->recv_buffer)
return -ENOMEM; return -ENOMEM;
if (srv->util_init) { if (srv->util_init) {