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

Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl

Browse Source 
Since the hypervisor always uses 4K as its page size, the size of PFNs
used for gpadl should be HV_HYP_PAGE_SIZE rather than PAGE_SIZE, so
adjust this accordingly as the preparation for supporting 16K/64K page
size guests. No functional changes on x86, since PAGE_SIZE is always 4k
(equals to HV_HYP_PAGE_SIZE).

Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20200916034817.30282-2-boqun.feng@gmail.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
This commit is contained in:
Boqun Feng 2020-09-16 11:48:07 +08:00 committed by Wei Liu
parent 49971e6bad
commit a5dda201a0
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/hv/channel.c
View File

@ -22,9 +22,6 @@
#include "hyperv_vmbus.h" #include "hyperv_vmbus.h"
#define NUM_PAGES_SPANNED(addr, len) \
((PAGE_ALIGN(addr + len) >> PAGE_SHIFT) - (addr >> PAGE_SHIFT))
static unsigned long virt_to_hvpfn(void *addr) static unsigned long virt_to_hvpfn(void *addr)
{ {
phys_addr_t paddr; phys_addr_t paddr;
@ -35,7 +32,7 @@ static unsigned long virt_to_hvpfn(void *addr)
else else
paddr = __pa(addr); paddr = __pa(addr);
return paddr >> PAGE_SHIFT; return paddr >> HV_HYP_PAGE_SHIFT;
} }
/* /*
@ -330,7 +327,7 @@ 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 >> HV_HYP_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 -
@ -360,7 +357,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,
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] = virt_to_hvpfn( gpadl_header->range[0].pfn_array[i] = virt_to_hvpfn(
kbuffer + PAGE_SIZE * i); kbuffer + HV_HYP_PAGE_SIZE * i);
*msginfo = msgheader; *msginfo = msgheader;
pfnsum = pfncount; pfnsum = pfncount;
@ -412,7 +409,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,
*/ */
for (i = 0; i < pfncurr; i++) for (i = 0; i < pfncurr; i++)
gpadl_body->pfn[i] = virt_to_hvpfn( gpadl_body->pfn[i] = virt_to_hvpfn(
kbuffer + PAGE_SIZE * (pfnsum + i)); kbuffer + HV_HYP_PAGE_SIZE * (pfnsum + i));
/* add to msg header */ /* add to msg header */
list_add_tail(&msgbody->msglistentry, list_add_tail(&msgbody->msglistentry,
@ -441,7 +438,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,
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] = virt_to_hvpfn( gpadl_header->range[0].pfn_array[i] = virt_to_hvpfn(
kbuffer + PAGE_SIZE * i); kbuffer + HV_HYP_PAGE_SIZE * i);
*msginfo = msgheader; *msginfo = msgheader;
} }