Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: Add support for physically discontinuous receive buffer

Browse Source 
This will allow us to use bigger receive buffer, and prevent allocation failure
due to fragmented memory.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haiyang Zhang 2014-01-27 15:03:42 -08:00 committed by David S. Miller
parent 731073b9c9
commit b679ef73ed
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hv/channel.c
View File

@ -209,7 +209,6 @@ static int create_gpadl_header(void *kbuffer, u32 size,
{ {
int i; int i;
int pagecount; int pagecount;
unsigned long long pfn;
struct vmbus_channel_gpadl_header *gpadl_header; struct vmbus_channel_gpadl_header *gpadl_header;
struct vmbus_channel_gpadl_body *gpadl_body; struct vmbus_channel_gpadl_body *gpadl_body;
struct vmbus_channel_msginfo *msgheader; struct vmbus_channel_msginfo *msgheader;
@ -219,7 +218,6 @@ static int create_gpadl_header(void *kbuffer, u32 size,
int pfnsum, pfncount, pfnleft, pfncurr, pfnsize; int pfnsum, pfncount, pfnleft, pfncurr, pfnsize;
pagecount = size >> PAGE_SHIFT; pagecount = size >> PAGE_SHIFT;
pfn = virt_to_phys(kbuffer) >> PAGE_SHIFT;
/* do we need a gpadl body msg */ /* do we need a gpadl body msg */
pfnsize = MAX_SIZE_CHANNEL_MESSAGE - pfnsize = MAX_SIZE_CHANNEL_MESSAGE -
@ -248,7 +246,8 @@ static int create_gpadl_header(void *kbuffer, u32 size,
gpadl_header->range[0].byte_offset = 0; gpadl_header->range[0].byte_offset = 0;
gpadl_header->range[0].byte_count = size; gpadl_header->range[0].byte_count = size;
for (i = 0; i < pfncount; i++) for (i = 0; i < pfncount; i++)
gpadl_header->range[0].pfn_array[i] = pfn+i; gpadl_header->range[0].pfn_array[i] = slow_virt_to_phys(
kbuffer + PAGE_SIZE * i) >> PAGE_SHIFT;
*msginfo = msgheader; *msginfo = msgheader;
*messagecount = 1; *messagecount = 1;
@ -301,7 +300,9 @@ static int create_gpadl_header(void *kbuffer, u32 size,
* so the hypervisor gurantees that this is ok. * so the hypervisor gurantees that this is ok.
*/ */
for (i = 0; i < pfncurr; i++) for (i = 0; i < pfncurr; i++)
gpadl_body->pfn[i] = pfn + pfnsum + i; gpadl_body->pfn[i] = slow_virt_to_phys(
kbuffer + PAGE_SIZE * (pfnsum + i)) >>
PAGE_SHIFT;
/* add to msg header */ /* add to msg header */
list_add_tail(&msgbody->msglistentry, list_add_tail(&msgbody->msglistentry,
@ -327,7 +328,8 @@ static int create_gpadl_header(void *kbuffer, u32 size,
gpadl_header->range[0].byte_offset = 0; gpadl_header->range[0].byte_offset = 0;
gpadl_header->range[0].byte_count = size; gpadl_header->range[0].byte_count = size;
for (i = 0; i < pagecount; i++) for (i = 0; i < pagecount; i++)
gpadl_header->range[0].pfn_array[i] = pfn+i; gpadl_header->range[0].pfn_array[i] = slow_virt_to_phys(
kbuffer + PAGE_SIZE * i) >> PAGE_SHIFT;
*msginfo = msgheader; *msginfo = msgheader;
*messagecount = 1; *messagecount = 1;
@ -344,7 +346,7 @@ nomem:
* vmbus_establish_gpadl - Estabish a GPADL for the specified buffer * vmbus_establish_gpadl - Estabish a GPADL for the specified buffer
* *
* @channel: a channel * @channel: a channel
* @kbuffer: from kmalloc * @kbuffer: from kmalloc or vmalloc
* @size: page-size multiple * @size: page-size multiple
* @gpadl_handle: some funky thing * @gpadl_handle: some funky thing
*/ */

2
drivers/net/hyperv/hyperv_net.h
View File

@ -462,7 +462,7 @@ struct nvsp_message {
#define NETVSC_MTU 65536 #define NETVSC_MTU 65536
#define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*2) /* 2MB */ #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */
#define NETVSC_RECEIVE_BUFFER_ID 0xcafe #define NETVSC_RECEIVE_BUFFER_ID 0xcafe

7
drivers/net/hyperv/netvsc.c
View File

@ -136,8 +136,7 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
if (net_device->recv_buf) { if (net_device->recv_buf) {
/* Free up the receive buffer */ /* Free up the receive buffer */
free_pages((unsigned long)net_device->recv_buf, vfree(net_device->recv_buf);
get_order(net_device->recv_buf_size));
net_device->recv_buf = NULL; net_device->recv_buf = NULL;
} }
@ -163,9 +162,7 @@ static int netvsc_init_recv_buf(struct hv_device *device)
return -ENODEV; return -ENODEV;
ndev = net_device->ndev; ndev = net_device->ndev;
net_device->recv_buf = net_device->recv_buf = vzalloc(net_device->recv_buf_size);
(void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,
get_order(net_device->recv_buf_size));
if (!net_device->recv_buf) { if (!net_device->recv_buf) {
netdev_err(ndev, "unable to allocate receive " netdev_err(ndev, "unable to allocate receive "
"buffer of size %d\n", net_device->recv_buf_size); "buffer of size %d\n", net_device->recv_buf_size);