Hyper-V: Support PAGE_SIZE larger than 4K
Subsystems (7)
v3 cover Hyper-V: Support PAGE_SIZE larger than 4K
This patchset add the necessary changes to support guests whose page size is larger than 4K. And the main architecture which we develop this for is ARM64 (also it's the architecture that I use to test this feature). Now as the patchset has been deeply reviewed, I change it from "RFC" to "PATCH", and also add ARM64 people Cced for broader insights (although the code is arch-independent).
Previous version:
v1: https://lore.kernel.org/lkml/[email protected]/
v2: https://lore.kernel.org/lkml/[email protected]
Changes since v2:
* Use a simpler and straight-forwards method to set up the payload
array for storvsc thanks to the inspiration from Michael Kelley.
* Some typo fixes as per suggestion from Michael Kelley.
* Fixes compiler warnings due to the different types of two
operands for max().
Hyper-V always uses 4K as the page size and expects the same page size when communicating with guests. That is, all the "pfn"s in the hypervisor-guest communication protocol are the page numbers in the unit of HV_HYP_PAGE_SIZE rather than PAGE_SIZE. To support guests with larger page size, we need to convert between these two page sizes correctly in the hypervisor-guest communication, which is basically what this patchset does.
In this conversion, one challenge is how to handle the ringbuffer. A ringbuffer has two parts: a header and a data part, both of which want to be PAGE_SIZE aligned in the guest, because we use the "double mapping" trick to map the data part twice in the guest virtual address space for faster wrap-around and ease to process data in place. However, the Hyper-V hypervisor always treats the ringbuffer headers as 4k pages. To overcome this gap, we enlarge the hv_ring_buffer structure to be always PAGE_SIZE aligned, and introduce the gpadl type concept to allow vmbus_establish_gpadl() to handle ringbuffer cases specially. Note that gpadl type is only meaningful to the guest, there is no such concept in Hyper-V hypervisor.
This patchset consists of 11 patches:
Patch 1~4: Introduce the types of gpadl, so that we can handle
ringbuffer when PAGE_SIZE != HV_HYP_PAGE_SIZE, and also fix a few places where we should use HV_HYP_PAGE_SIZE other than PAGE_SIZE.
Patch 5~6: Add a few helper functions to help calculate the hvpfn (page
number in the unit of HV_HYP_PAGE_SIZE) and other related data. So that we can use them in the code of drivers.
Patch 7~11: Use the helpers and change the driver code accordingly to
make net/input/util/storage driver work with PAGE_SIZE != HV_HYP_PAGE_SIZE
I've done some tests with PAGE_SIZE=64k and PAGE_SIZE=16k configurations on ARM64 guests (with Michael's patchset[1] for ARM64 Hyper-V guest support), everything worked fine ;-) (I could observe an error caused by unaligned firmware data, but it's better to have it fixed in the Hyper-V). I also have done a build and boot test on x86, everything worked well.
Looking forwards to comments and suggestions!
Regards,
Boqun
[1]: https://lore.kernel.org/lkml/[email protected]/
Boqun Feng (11):
Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl
Drivers: hv: vmbus: Move __vmbus_open()
Drivers: hv: vmbus: Introduce types of GPADL
Drivers: hv: Use HV_HYP_PAGE in hv_synic_enable_regs()
Drivers: hv: vmbus: Move virt_to_hvpfn() to hyperv header
hv: hyperv.h: Introduce some hvpfn helper functions
hv_netvsc: Use HV_HYP_PAGE_SIZE for Hyper-V communication
Input: hyperv-keyboard: Make ringbuffer at least take two pages
HID: hyperv: Make ringbuffer at least take two pages
Driver: hv: util: Make ringbuffer at least take two pages
scsi: storvsc: Support PAGE_SIZE larger than 4K
drivers/hid/hid-hyperv.c | 4 +- drivers/hv/channel.c | 461 ++++++++++++++++---------- drivers/hv/hv.c | 4 +- drivers/hv/hv_util.c | 16 +- drivers/input/serio/hyperv-keyboard.c | 4 +- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 46 +-- drivers/net/hyperv/rndis_filter.c | 13 +- drivers/scsi/storvsc_drv.c | 54 ++- include/linux/hyperv.h | 64 +++- 10 files changed, 441 insertions(+), 227 deletions(-)
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/11 Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl
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).
--- drivers/hv/channel.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/hv/channel.c +5 -8
@@ -22,9 +22,6 @@#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) {phys_addr_t paddr;
@@ -35,7 +32,7 @@ static unsigned long virt_to_hvpfn(void *addr)else 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; - pagecount = size >>PAGE_SHIFT ; + pagecount = size >>HV_HYP_PAGE_SHIFT ;/* do we need a gpadl body msg */ 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;for (i =0 ; i < pfncount; i++) gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( - kbuffer +PAGE_SIZE * i); + kbuffer +HV_HYP_PAGE_SIZE * i); *msginfo = msgheader; pfnsum = pfncount;
@@ -412,7 +409,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,*/ for (i =0 ; i < pfncurr; i++) gpadl_body->pfn[i] =virt_to_hvpfn ( - kbuffer +PAGE_SIZE * (pfnsum + i)); + kbuffer +HV_HYP_PAGE_SIZE * (pfnsum + i));/* add to msg header */ 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;for (i =0 ; i < pagecount; i++) gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( - kbuffer +PAGE_SIZE * i); + kbuffer +HV_HYP_PAGE_SIZE * i); *msginfo = msgheader; }
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 01/11] Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 7 lines
Since the hypervisor always uses 4K as its page size, the size of PFNs used for gpadl should be
HV_HYP_PAGE_SIZErather thanPAGE_SIZE, so adjust this accordingly as the preparation for supporting 16K/64K page size guests. No functional changes on x86, sincePAGE_SIZEis always 4k (equals toHV_HYP_PAGE_SIZE).
Quoted 5 lines
Signed-off-by Boqun Feng <[email protected]>--- drivers/hv/channel.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
PATCH v3 2/11 Drivers: hv: vmbus: Move __vmbus_open()
In reply to Boqun FengPure function movement, no functional changes. The move is made, because in a later change, __vmbus_open() will rely on some static functions afterwards, so we separate the move and the modification of __vmbus_open() in two patches to make it easy to review.
--- drivers/hv/channel.c | 309 ++++++++++++++++++++++--------------------- 1 file changed, 155 insertions(+), 154 deletions(-)
drivers/hv/channel.c +155 -154
@@ -109,160 +109,6 @@ int vmbus_alloc_ring(struct vmbus_channel *newchannel, }EXPORT_SYMBOL_GPL (vmbus_alloc_ring); -static int __vmbus_open (struct vmbus_channel *newchannel, -void *userdata,u32 userdatalen, -void (*onchannelcallback)(void *context),void *context) -{ -struct vmbus_channel_open_channel *open_msg; -struct vmbus_channel_msginfo *open_info =NULL ; -struct page *page = newchannel->ringbuffer_page; -u32 send_pages, recv_pages; -unsigned long flags; -int err; - -if (userdatalen >MAX_USER_DEFINED_BYTES ) -return -EINVAL ; - - send_pages = newchannel->ringbuffer_send_offset; - recv_pages = newchannel->ringbuffer_pagecount - send_pages; - -if (newchannel->state !=CHANNEL_OPEN_STATE ) -return -EINVAL ; - - newchannel->state =CHANNEL_OPENING_STATE ; - newchannel->onchannel_callback = onchannelcallback; - newchannel->channel_callback_context = context; - - err =hv_ringbuffer_init (&newchannel->outbound, page, send_pages); -if (err) - goto error_clean_ring; - - err =hv_ringbuffer_init (&newchannel->inbound, - &page[send_pages], recv_pages); -if (err) - goto error_clean_ring; - -/* Establish the gpadl for the ring buffer */ - newchannel->ringbuffer_gpadlhandle =0 ; - - err =vmbus_establish_gpadl (newchannel, -page_address (newchannel->ringbuffer_page), - (send_pages + recv_pages) <<PAGE_SHIFT , - &newchannel->ringbuffer_gpadlhandle); -if (err) - goto error_clean_ring; - -/* Create and init the channel open message */ - open_info =kmalloc (sizeof (*open_info) + -sizeof (struct vmbus_channel_open_channel ), -GFP_KERNEL ); -if (!open_info) { - err = -ENOMEM ; - goto error_free_gpadl; - } - -init_completion (&open_info->waitevent); - open_info->waiting_channel = newchannel; - - open_msg = (struct vmbus_channel_open_channel *)open_info->msg; - open_msg->header.msgtype =CHANNELMSG_OPENCHANNEL ; - open_msg->openid = newchannel->offermsg.child_relid; - open_msg->child_relid = newchannel->offermsg.child_relid; - open_msg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle; - open_msg->downstream_ringbuffer_pageoffset = newchannel->ringbuffer_send_offset; - open_msg->target_vp =hv_cpu_number_to_vp_number (newchannel->target_cpu); - -if (userdatalen) -memcpy (open_msg->userdata, userdata, userdatalen); - -spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); -list_add_tail (&open_info->msglistentry, - &vmbus_connection.chn_msg_list); -spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); - -if (newchannel->rescind) { - err = -ENODEV ; - goto error_free_info; - } - - err =vmbus_post_msg (open_msg, -sizeof (struct vmbus_channel_open_channel ), true); - -trace_vmbus_open (open_msg, err); - -if (err !=0 ) - goto error_clean_msglist; - -wait_for_completion (&open_info->waitevent); - -spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); -list_del (&open_info->msglistentry); -spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); - -if (newchannel->rescind) { - err = -ENODEV ; - goto error_free_info; - } - -if (open_info->response.open_result.status) { - err = -EAGAIN ; - goto error_free_info; - } - - newchannel->state =CHANNEL_OPENED_STATE ; -kfree (open_info); -return 0 ; - -error_clean_msglist: -spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); -list_del (&open_info->msglistentry); -spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); -error_free_info: -kfree (open_info); -error_free_gpadl: -vmbus_teardown_gpadl (newchannel, newchannel->ringbuffer_gpadlhandle); - newchannel->ringbuffer_gpadlhandle =0 ; -error_clean_ring: -hv_ringbuffer_cleanup (&newchannel->outbound); -hv_ringbuffer_cleanup (&newchannel->inbound); - newchannel->state =CHANNEL_OPEN_STATE ; -return err; -} - -/* -* vmbus_connect_ring - Open the channel but reuse ring buffer -*/ -int vmbus_connect_ring (struct vmbus_channel *newchannel, -void (*onchannelcallback)(void *context),void *context) -{ -return __vmbus_open (newchannel,NULL ,0 , onchannelcallback, context); -} -EXPORT_SYMBOL_GPL (vmbus_connect_ring); - -/* -* vmbus_open - Open the specified channel. -*/ -int vmbus_open (struct vmbus_channel *newchannel, -u32 send_ringbuffer_size,u32 recv_ringbuffer_size, -void *userdata,u32 userdatalen, -void (*onchannelcallback)(void *context),void *context) -{ -int err; - - err =vmbus_alloc_ring (newchannel, send_ringbuffer_size, - recv_ringbuffer_size); -if (err) -return err; - - err =__vmbus_open (newchannel, userdata, userdatalen, - onchannelcallback, context); -if (err) -vmbus_free_ring (newchannel); - -return err; -} -EXPORT_SYMBOL_GPL (vmbus_open); -/* Used for Hyper-V Socket: a guest client's connect() to the host */ int vmbus_send_tl_connect_request (const guid_t *shv_guest_servie_id,const guid_t *shv_host_servie_id)
@@ -556,6 +402,161 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, }EXPORT_SYMBOL_GPL (vmbus_establish_gpadl); +static int __vmbus_open (struct vmbus_channel *newchannel, +void *userdata,u32 userdatalen, +void (*onchannelcallback)(void *context),void *context) +{ +struct vmbus_channel_open_channel *open_msg; +struct vmbus_channel_msginfo *open_info =NULL ; +struct page *page = newchannel->ringbuffer_page; +u32 send_pages, recv_pages; +unsigned long flags; +int err; + +if (userdatalen >MAX_USER_DEFINED_BYTES ) +return -EINVAL ; + + send_pages = newchannel->ringbuffer_send_offset; + recv_pages = newchannel->ringbuffer_pagecount - send_pages; + +if (newchannel->state !=CHANNEL_OPEN_STATE ) +return -EINVAL ; + + newchannel->state =CHANNEL_OPENING_STATE ; + newchannel->onchannel_callback = onchannelcallback; + newchannel->channel_callback_context = context; + + err =hv_ringbuffer_init (&newchannel->outbound, page, send_pages); +if (err) + goto error_clean_ring; + + err =hv_ringbuffer_init (&newchannel->inbound, + &page[send_pages], recv_pages); +if (err) + goto error_clean_ring; + +/* Establish the gpadl for the ring buffer */ + newchannel->ringbuffer_gpadlhandle =0 ; + + err =vmbus_establish_gpadl (newchannel, +page_address (newchannel->ringbuffer_page), + (send_pages + recv_pages) <<PAGE_SHIFT , + &newchannel->ringbuffer_gpadlhandle); +if (err) + goto error_clean_ring; + +/* Create and init the channel open message */ + open_info =kmalloc (sizeof (*open_info) + +sizeof (struct vmbus_channel_open_channel ), +GFP_KERNEL ); +if (!open_info) { + err = -ENOMEM ; + goto error_free_gpadl; + } + +init_completion (&open_info->waitevent); + open_info->waiting_channel = newchannel; + + open_msg = (struct vmbus_channel_open_channel *)open_info->msg; + open_msg->header.msgtype =CHANNELMSG_OPENCHANNEL ; + open_msg->openid = newchannel->offermsg.child_relid; + open_msg->child_relid = newchannel->offermsg.child_relid; + open_msg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle; + open_msg->downstream_ringbuffer_pageoffset = newchannel->ringbuffer_send_offset; + open_msg->target_vp =hv_cpu_number_to_vp_number (newchannel->target_cpu); + +if (userdatalen) +memcpy (open_msg->userdata, userdata, userdatalen); + +spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); +list_add_tail (&open_info->msglistentry, + &vmbus_connection.chn_msg_list); +spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); + +if (newchannel->rescind) { + err = -ENODEV ; + goto error_free_info; + } + + err =vmbus_post_msg (open_msg, +sizeof (struct vmbus_channel_open_channel ), true); + +trace_vmbus_open (open_msg, err); + +if (err !=0 ) + goto error_clean_msglist; + +wait_for_completion (&open_info->waitevent); + +spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); +list_del (&open_info->msglistentry); +spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); + +if (newchannel->rescind) { + err = -ENODEV ; + goto error_free_info; + } + +if (open_info->response.open_result.status) { + err = -EAGAIN ; + goto error_free_info; + } + + newchannel->state =CHANNEL_OPENED_STATE ; +kfree (open_info); +return 0 ; + +error_clean_msglist: +spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); +list_del (&open_info->msglistentry); +spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); +error_free_info: +kfree (open_info); +error_free_gpadl: +vmbus_teardown_gpadl (newchannel, newchannel->ringbuffer_gpadlhandle); + newchannel->ringbuffer_gpadlhandle =0 ; +error_clean_ring: +hv_ringbuffer_cleanup (&newchannel->outbound); +hv_ringbuffer_cleanup (&newchannel->inbound); + newchannel->state =CHANNEL_OPEN_STATE ; +return err; +} + +/* +* vmbus_connect_ring - Open the channel but reuse ring buffer +*/ +int vmbus_connect_ring (struct vmbus_channel *newchannel, +void (*onchannelcallback)(void *context),void *context) +{ +return __vmbus_open (newchannel,NULL ,0 , onchannelcallback, context); +} +EXPORT_SYMBOL_GPL (vmbus_connect_ring); + +/* +* vmbus_open - Open the specified channel. +*/ +int vmbus_open (struct vmbus_channel *newchannel, +u32 send_ringbuffer_size,u32 recv_ringbuffer_size, +void *userdata,u32 userdatalen, +void (*onchannelcallback)(void *context),void *context) +{ +int err; + + err =vmbus_alloc_ring (newchannel, send_ringbuffer_size, + recv_ringbuffer_size); +if (err) +return err; + + err =__vmbus_open (newchannel, userdata, userdatalen, + onchannelcallback, context); +if (err) +vmbus_free_ring (newchannel); + +return err; +} +EXPORT_SYMBOL_GPL (vmbus_open); + +/* * vmbus_teardown_gpadl -Teardown the specified GPADL handle */
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 02/11] Drivers: hv: vmbus: Move __vmbus_open()
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 6 lines
Pure function movement, no functional changes. The move is made, because in a later change,
__vmbus_open()will rely on some static functions afterwards, so we separate the move and the modification of__vmbus_open()in two patches to make it easy to review.
Quoted 6 lines
Signed-off-by Boqun Feng <[email protected]>Reviewed-by Wei Liu <[email protected]>--- drivers/hv/channel.c | 309 ++++++++++++++++++++++--------------------- 1 file changed, 155 insertions(+), 154 deletions(-)
PATCH v3 3/11 Drivers: hv: vmbus: Introduce types of GPADL
In reply to Boqun FengThis patch introduces two types of GPADL: HV_GPADL_{BUFFER, RING}. The types of GPADL are purely the concept in the guest, IOW the hypervisor treat them as the same.
The reason of introducing the types for GPADL is to support guests whose page size is not 4k (the page size of Hyper-V hypervisor). In these guests, both the headers and the data parts of the ringbuffers need to be aligned to the PAGE_SIZE, because 1) some of the ringbuffers will be mapped into userspace and 2) we use "double mapping" mechanism to support fast wrap-around, and "double mapping" relies on ringbuffers being page-aligned. However, the Hyper-V hypervisor only uses 4k (HV_HYP_PAGE_SIZE) headers. Our solution to this is that we always make the headers of ringbuffers take one guest page and when GPADL is established between the guest and hypervisor, the only first 4k of header is used. To handle this special case, we need the types of GPADL to differ different guest memory usage for GPADL.
Type enum is introduced along with several general interfaces to describe the differences between normal buffer GPADL and ringbuffer GPADL.
--- drivers/hv/channel.c | 160 +++++++++++++++++++++++++++++++++++------ include/linux/hyperv.h | 44 +++++++++++- 2 files changed, 183 insertions(+), 21 deletions(-)
drivers/hv/channel.c +140 -20
@@ -35,6 +35,99 @@ static unsigned long virt_to_hvpfn(void *addr)return paddr >>HV_HYP_PAGE_SHIFT ; } +/* +* hv_gpadl_size - Return the real size of a gpadl, the size that Hyper-V uses +* +* For BUFFER gpadl, Hyper-V uses the exact same size as the guest does. +* +* For RING gpadl, in each ring, the guest uses one PAGE_SIZE as the header +* (because of the alignment requirement), however, the hypervisor only +* uses the first HV_HYP_PAGE_SIZE as the header, therefore leaving a +* (PAGE_SIZE - HV_HYP_PAGE_SIZE) gap. And since there are two rings in a +* ringbuffer, the total size for a RING gpadl that Hyper-V uses is the +* total size that the guest uses minus twice of the gap size. +*/ +static inline u32 hv_gpadl_size (enum hv_gpadl_type type,u32 size) +{ +switch (type) { +case HV_GPADL_BUFFER : +return size; +case HV_GPADL_RING : +/* The size of a ringbuffer must be page-aligned */ +BUG_ON (size %PAGE_SIZE ); +/* +* Two things to notice here: +* 1) We're processing two ring buffers as a unit +* 2) We're skipping any space larger than HV_HYP_PAGE_SIZE in +* the first guest-size page of each of the two ring buffers. +* So we effectively subtract out two guest-size pages, and add +* back two Hyper-V size pages. +*/ +return size -2 * (PAGE_SIZE -HV_HYP_PAGE_SIZE ); + } +BUG (); +return 0 ; +} + +/* +* hv_ring_gpadl_send_hvpgoffset - Calculate the send offset (in unit of +* HV_HYP_PAGE) in a ring gpadl based on the +* offset in the guest +* +* @offset: the offset (in bytes) where the send ringbuffer starts in the +* virtual address space of the guest +*/ +static inline u32 hv_ring_gpadl_send_hvpgoffset (u32 offset) +{ + +/* +* For RING gpadl, in each ring, the guest uses one PAGE_SIZE as the +* header (because of the alignment requirement), however, the +* hypervisor only uses the first HV_HYP_PAGE_SIZE as the header, +* therefore leaving a (PAGE_SIZE - HV_HYP_PAGE_SIZE) gap. +* +* And to calculate the effective send offset in gpadl, we need to +* substract this gap. +*/ +return (offset - (PAGE_SIZE -HV_HYP_PAGE_SIZE )) >>HV_HYP_PAGE_SHIFT ; +} + +/* +* hv_gpadl_hvpfn - Return the Hyper-V page PFN of the @i th Hyper-V page in +* the gpadl +* +* @type: the type of the gpadl +* @kbuffer: the pointer to the gpadl in the guest +* @size: the total size (in bytes) of the gpadl +* @send_offset: the offset (in bytes) where the send ringbuffer starts in the +* virtual address space of the guest +* @i: the index +*/ +static inline u64 hv_gpadl_hvpfn (enum hv_gpadl_type type,void *kbuffer, +u32 size,u32 send_offset,int i) +{ +int send_idx =hv_ring_gpadl_send_hvpgoffset (send_offset); +unsigned long delta =0UL ; + +switch (type) { +case HV_GPADL_BUFFER : +break ; +case HV_GPADL_RING : +if (i ==0 ) + delta =0 ; +else if (i <= send_idx) + delta =PAGE_SIZE -HV_HYP_PAGE_SIZE ; +else + delta =2 * (PAGE_SIZE -HV_HYP_PAGE_SIZE ); +break ; +default : +BUG (); +break ; + } + +return virt_to_hvpfn (kbuffer + delta + (HV_HYP_PAGE_SIZE * i)); +} +/* * vmbus_setevent- Trigger an event notification on the specified * channel.
@@ -160,7 +253,8 @@ EXPORT_SYMBOL_GPL(vmbus_send_modifychannel);/* * create_gpadl_header - Creates a gpadl for the specified buffer */ -static int create_gpadl_header (void *kbuffer,u32 size, +static int create_gpadl_header (enum hv_gpadl_type type,void *kbuffer, +u32 size,u32 send_offset,struct vmbus_channel_msginfo **msginfo) {int i;
@@ -173,7 +267,7 @@ static int create_gpadl_header(void *kbuffer, u32 size,int pfnsum, pfncount, pfnleft, pfncurr, pfnsize; - pagecount = size >>HV_HYP_PAGE_SHIFT ; + pagecount =hv_gpadl_size (type, size) >>HV_HYP_PAGE_SHIFT ;/* do we need a gpadl body msg */ pfnsize = MAX_SIZE_CHANNEL_MESSAGE -
@@ -200,10 +294,10 @@ static int create_gpadl_header(void *kbuffer, u32 size, gpadl_header->range_buflen =sizeof (struct gpa_range ) + pagecount *sizeof (u64); gpadl_header->range[0 ].byte_offset =0 ; - gpadl_header->range[0 ].byte_count = size; + gpadl_header->range[0 ].byte_count =hv_gpadl_size (type, size);for (i =0 ; i < pfncount; i++) - gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( - kbuffer +HV_HYP_PAGE_SIZE * i); + gpadl_header->range[0 ].pfn_array[i] =hv_gpadl_hvpfn ( + type, kbuffer, size, send_offset, i); *msginfo = msgheader; pfnsum = pfncount;
@@ -254,8 +348,8 @@ static int create_gpadl_header(void *kbuffer, u32 size,* so the hypervisor guarantees that this is ok. */ for (i =0 ; i < pfncurr; i++) - gpadl_body->pfn[i] =virt_to_hvpfn ( - kbuffer +HV_HYP_PAGE_SIZE * (pfnsum + i)); + gpadl_body->pfn[i] =hv_gpadl_hvpfn (type, + kbuffer, size, send_offset, pfnsum + i);/* add to msg header */ list_add_tail(&msgbody->msglistentry,
@@ -281,10 +375,10 @@ static int create_gpadl_header(void *kbuffer, u32 size, gpadl_header->range_buflen =sizeof (struct gpa_range ) + pagecount *sizeof (u64); gpadl_header->range[0 ].byte_offset =0 ; - gpadl_header->range[0 ].byte_count = size; + gpadl_header->range[0 ].byte_count =hv_gpadl_size (type, size);for (i =0 ; i < pagecount; i++) - gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( - kbuffer +HV_HYP_PAGE_SIZE * i); + gpadl_header->range[0 ].pfn_array[i] =hv_gpadl_hvpfn ( + type, kbuffer, size, send_offset, i); *msginfo = msgheader; }
@@ -297,15 +391,20 @@ static int create_gpadl_header(void *kbuffer, u32 size, }/* -* vmbus_establish_gpadl - Establish a GPADL for the specified buffer +* __vmbus_establish_gpadl - Establish a GPADL for a buffer or ringbuffer * * @channel: a channel +* @type: the type of the corresponding GPADL, only meaningful for the guest. * @kbuffer: from kmalloc or vmalloc * @size: page-size multiple +* @send_offset: the offset (in bytes) where the send ring buffer starts, +* should be 0 for BUFFER type gpadl * @gpadl_handle: some funky thing */ -int vmbus_establish_gpadl (struct vmbus_channel *channel,void *kbuffer, -u32 size,u32 *gpadl_handle) +static int __vmbus_establish_gpadl (struct vmbus_channel *channel, +enum hv_gpadl_type type,void *kbuffer, +u32 size,u32 send_offset, +u32 *gpadl_handle) {struct vmbus_channel_gpadl_header *gpadlmsg;struct vmbus_channel_gpadl_body *gpadl_body;
@@ -319,7 +418,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, next_gpadl_handle = (atomic_inc_return (&vmbus_connection.next_gpadl_handle) -1 ); - ret =create_gpadl_header (kbuffer, size, &msginfo); + ret =create_gpadl_header (type, kbuffer, size, send_offset, &msginfo);if (ret)return ret;
@@ -400,6 +499,21 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,kfree (msginfo);return ret; } + +/* +* vmbus_establish_gpadl - Establish a GPADL for the specified buffer +* +* @channel: a channel +* @kbuffer: from kmalloc or vmalloc +* @size: page-size multiple +* @gpadl_handle: some funky thing +*/ +int vmbus_establish_gpadl (struct vmbus_channel *channel,void *kbuffer, +u32 size,u32 *gpadl_handle) +{ +return __vmbus_establish_gpadl (channel,HV_GPADL_BUFFER , kbuffer, size, +0U , gpadl_handle); +}EXPORT_SYMBOL_GPL (vmbus_establish_gpadl); static int __vmbus_open(struct vmbus_channel *newchannel,
@@ -438,10 +552,11 @@ static int __vmbus_open(struct vmbus_channel *newchannel,/* Establish the gpadl for the ring buffer */ newchannel->ringbuffer_gpadlhandle =0 ; - err =vmbus_establish_gpadl (newchannel, -page_address (newchannel->ringbuffer_page), - (send_pages + recv_pages) <<PAGE_SHIFT , - &newchannel->ringbuffer_gpadlhandle); + err =__vmbus_establish_gpadl (newchannel,HV_GPADL_RING , +page_address (newchannel->ringbuffer_page), + (send_pages + recv_pages) <<PAGE_SHIFT , + newchannel->ringbuffer_send_offset <<PAGE_SHIFT , + &newchannel->ringbuffer_gpadlhandle);if (err) goto error_clean_ring;
@@ -462,7 +577,13 @@ static int __vmbus_open(struct vmbus_channel *newchannel, open_msg->openid = newchannel->offermsg.child_relid; open_msg->child_relid = newchannel->offermsg.child_relid; open_msg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle; - open_msg->downstream_ringbuffer_pageoffset = newchannel->ringbuffer_send_offset; +/* +* The unit of ->downstream_ringbuffer_pageoffset is HV_HYP_PAGE and +* the unit of ->ringbuffer_send_offset (i.e. send_pages) is PAGE, so +* here we calculate it into HV_HYP_PAGE. +*/ + open_msg->downstream_ringbuffer_pageoffset = +hv_ring_gpadl_send_hvpgoffset (send_pages <<PAGE_SHIFT ); open_msg->target_vp =hv_cpu_number_to_vp_number (newchannel->target_cpu);if (userdatalen)
@@ -556,7 +677,6 @@ int vmbus_open(struct vmbus_channel *newchannel, }EXPORT_SYMBOL_GPL (vmbus_open); -/* * vmbus_teardown_gpadl -Teardown the specified GPADL handle */
include/linux/hyperv.h +43 -1
56 lines not on this page · raw message
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 03/11] Drivers: hv: vmbus: Introduce types of GPADL
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 22 lines
This patch introduces two types of GPADL: HV_GPADL_{BUFFER, RING}. The types of GPADL are purely the concept in the guest, IOW the hypervisor treat them as the same.
The reason of introducing the types for GPADL is to support guests whose page size is not 4k (the page size of Hyper-V hypervisor). In these guests, both the headers and the data parts of the ringbuffers need to be aligned to the
PAGE_SIZE, because 1) some of the ringbuffers will be mapped into userspace and 2) we use "double mapping" mechanism to support fast wrap-around, and "double mapping" relies on ringbuffers being page-aligned. However, the Hyper-V hypervisor only uses 4k (HV_HYP_PAGE_SIZE) headers. Our solution to this is that we always make the headers of ringbuffers take one guest page and when GPADL is established between the guest and hypervisor, the only first 4k of header is used. To handle this special case, we need the types of GPADL to differ different guest memory usage for GPADL.Type enum is introduced along with several general interfaces to describe the differences between normal buffer GPADL and ringbuffer GPADL.
Quoted 6 lines
Signed-off-by Boqun Feng <[email protected]>--- drivers/hv/channel.c | 160 +++++++++++++++++++++++++++++++++++------ include/linux/hyperv.h | 44 +++++++++++- 2 files changed, 183 insertions(+), 21 deletions(-)
PATCH v3 4/11 Drivers: hv: Use HV_HYP_PAGE in hv_synic_enable_regs()
In reply to Boqun FengBoth the base_*_gpa should use the guest page number in Hyper-V page, so use HV_HYP_PAGE instead of PAGE.
--- drivers/hv/hv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hv/hv.c +2 -2
@@ -165,7 +165,7 @@ void hv_synic_enable_regs(unsigned int cpu)hv_get_simp (simp.as_uint64); simp.simp_enabled =1 ; simp.base_simp_gpa =virt_to_phys (hv_cpu->synic_message_page) - >>PAGE_SHIFT ; + >>HV_HYP_PAGE_SHIFT ;hv_set_simp (simp.as_uint64);
@@ -173,7 +173,7 @@ void hv_synic_enable_regs(unsigned int cpu)hv_get_siefp (siefp.as_uint64); siefp.siefp_enabled =1 ; siefp.base_siefp_gpa =virt_to_phys (hv_cpu->synic_event_page) - >>PAGE_SHIFT ; + >>HV_HYP_PAGE_SHIFT ;hv_set_siefp (siefp.as_uint64);
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 04/11] Drivers: hv: Use HV_HYP_PAGE in hv_synic_enable_regs()
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 9 lines
Both the base_*_gpa should use the guest page number in Hyper-V page, so use
HV_HYP_PAGEinstead of PAGE.Signed-off-by Boqun Feng <[email protected]>--- drivers/hv/hv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v3 5/11 Drivers: hv: vmbus: Move virt_to_hvpfn() to hyperv header
In reply to Boqun FengThere will be more places other than vmbus where we need to calculate the Hyper-V page PFN from a virtual address, so move virt_to_hvpfn() to hyperv generic header.
--- drivers/hv/channel.c | 13 ------------- include/linux/hyperv.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-)
drivers/hv/channel.c +0 -13
@@ -22,19 +22,6 @@#include "hyperv_vmbus.h" -static unsigned long virt_to_hvpfn (void *addr) -{ -phys_addr_t paddr; - -if (is_vmalloc_addr (addr)) - paddr =page_to_phys (vmalloc_to_page (addr)) + -offset_in_page (addr); -else - paddr =__pa (addr); - -return paddr >>HV_HYP_PAGE_SHIFT ; -} -/* * hv_gpadl_size - Return the real size of a gpadl, the size that Hyper-V uses *
include/linux/hyperv.h +15 -0
@@ -14,6 +14,7 @@#include <uapi/linux/hyperv.h> +#include <linux/mm.h> #include <linux/types.h> #include <linux/scatterlist.h> #include <linux/list.h>
@@ -23,6 +24,7 @@#include <linux/mod_devicetable.h> #include <linux/interrupt.h> #include <linux/reciprocal_div.h> +#include <asm/hyperv-tlfs.h> #define MAX_PAGE_BUFFER_COUNT 32#define MAX_MULTIPAGE_BUFFER_COUNT 32/* 128K */
@@ -1672,4 +1674,17 @@ struct hyperv_pci_block_ops {extern struct hyperv_pci_block_ops hvpci_block_ops; +static inline unsigned long virt_to_hvpfn (void *addr) +{ +phys_addr_t paddr; + +if (is_vmalloc_addr (addr)) + paddr =page_to_phys (vmalloc_to_page (addr)) + +offset_in_page (addr); +else + paddr =__pa (addr); + +return paddr >>HV_HYP_PAGE_SHIFT ; +} +#endif /* _HYPERV_H */
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 05/11] Drivers: hv: vmbus: Move virt_to_hvpfn() to hyperv header
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 11 lines
There will be more places other than vmbus where we need to calculate the Hyper-V page PFN from a virtual address, so move
virt_to_hvpfn()to hyperv generic header.Signed-off-by Boqun Feng <[email protected]>--- drivers/hv/channel.c | 13 ------------- include/linux/hyperv.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-)
PATCH v3 6/11 hv: hyperv.h: Introduce some hvpfn helper functions
In reply to Boqun FengWhen a guest communicate with the hypervisor, it must use HV_HYP_PAGE to calculate PFN, so introduce a few hvpfn helper functions as the counterpart of the page helper functions. This is the preparation for supporting guest whose PAGE_SIZE is not 4k.
--- include/linux/hyperv.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/hyperv.h +5 -0
@@ -1687,4 +1687,9 @@ static inline unsigned long virt_to_hvpfn(void *addr) return paddr >> HV_HYP_PAGE_SHIFT; } +#define NR_HV_HYP_PAGES_IN_PAGE (PAGE_SIZE / HV_HYP_PAGE_SIZE) +#define offset_in_hvpage (ptr) ((unsigned long)(ptr) & ~HV_HYP_PAGE_MASK) +#define HVPFN_UP (x) (((x) + HV_HYP_PAGE_SIZE-1) >> HV_HYP_PAGE_SHIFT) +#define page_to_hvpfn (page) (page_to_pfn(page) * NR_HV_HYP_PAGES_IN_PAGE) +#endif /* _HYPERV_H */
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 06/11] hv: hyperv.h: Introduce some hvpfn helper functions
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 11 lines
When a guest communicate with the hypervisor, it must use
HV_HYP_PAGEto calculate PFN, so introduce a few hvpfn helper functions as the counterpart of the page helper functions. This is the preparation for supporting guest whosePAGE_SIZEis not 4k.Signed-off-by Boqun Feng <[email protected]>--- include/linux/hyperv.h | 5 +++++ 1 file changed, 5 insertions(+)
PATCH v3 7/11 hv_netvsc: Use HV_HYP_PAGE_SIZE for Hyper-V communication
In reply to Boqun FengWhen communicating with Hyper-V, HV_HYP_PAGE_SIZE should be used since that's the page size used by Hyper-V and Hyper-V expects all page-related data using the unit of HY_HYP_PAGE_SIZE, for example, the "pfn" in hv_page_buffer is actually the HV_HYP_PAGE (i.e. the Hyper-V page) number.
In order to support guest whose page size is not 4k, we need to make hv_netvsc always use HV_HYP_PAGE_SIZE for Hyper-V communication.
--- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 46 +++++++++++++++---------------- drivers/net/hyperv/rndis_filter.c | 13 ++++----- 3 files changed, 30 insertions(+), 31 deletions(-)
drivers/net/hyperv/netvsc.c +1 -1
@@ -794,7 +794,7 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, }for (i =0 ; i < page_count; i++) { -char *src =phys_to_virt (pb[i].pfn <<PAGE_SHIFT ); +char *src =phys_to_virt (pb[i].pfn <<HV_HYP_PAGE_SHIFT );u32 offset = pb[i].offset;u32 len = pb[i].len;
drivers/net/hyperv/netvsc_drv.c +23 -23
98 lines not on this page · raw message
drivers/net/hyperv/rndis_filter.c +6 -7
@@ -25,7 +25,7 @@static void rndis_set_multicast (struct work_struct *w); -#define RNDIS_EXT_LEN PAGE_SIZE +#define RNDIS_EXT_LEN HV_HYP_PAGE_SIZEstruct rndis_request {struct list_head list_ent;struct completion wait_event;
@@ -215,18 +215,17 @@ static int rndis_filter_send_request(struct rndis_device *dev, packet->page_buf_cnt =1 ; pb[0 ].pfn =virt_to_phys (&req->request_msg) >> -PAGE_SHIFT ; +HV_HYP_PAGE_SHIFT ; pb[0 ].len = req->request_msg.msg_len; - pb[0 ].offset = - (unsigned long )&req->request_msg & (PAGE_SIZE -1 ); + pb[0 ].offset =offset_in_hvpage (&req->request_msg);/* Add one page_buf when request_msg crossing page boundary */ -if (pb[0 ].offset + pb[0 ].len >PAGE_SIZE ) { +if (pb[0 ].offset + pb[0 ].len >HV_HYP_PAGE_SIZE ) { packet->page_buf_cnt++; - pb[0 ].len =PAGE_SIZE - + pb[0 ].len =HV_HYP_PAGE_SIZE - pb[0 ].offset; pb[1 ].pfn =virt_to_phys ((void *)&req->request_msg - + pb[0 ].len) >>PAGE_SHIFT ; + + pb[0 ].len) >>HV_HYP_PAGE_SHIFT ; pb[1 ].offset =0 ; pb[1 ].len = req->request_msg.msg_len - pb[0 ].len;
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 07/11] hv_netvsc: Use HV_HYP_PAGE_SIZE for Hyper-V communication
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 10 lines
When communicating with Hyper-V,
HV_HYP_PAGE_SIZEshould be used since that's the page size used by Hyper-V and Hyper-V expects all page-related data using the unit ofHY_HYP_PAGE_SIZE, for example, the "pfn" inhv_page_bufferis actually theHV_HYP_PAGE(i.e. the Hyper-V page) number.In order to support guest whose page size is not 4k, we need to make
hv_netvscalways useHV_HYP_PAGE_SIZEfor Hyper-V communication.
Quoted 7 lines
Signed-off-by Boqun Feng <[email protected]>--- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 46 +++++++++++++++---------------- drivers/net/hyperv/rndis_filter.c | 13 ++++----- 3 files changed, 30 insertions(+), 31 deletions(-)
PATCH v3 8/11 Input: hyperv-keyboard: Make ringbuffer at least take two pages
In reply to Boqun FengWhen PAGE_SIZE > HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 * PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).
So make sure the ringbuffer sizes to be at least 2 * PAGE_SIZE when using vmbus_open() to establish the vmbus connection.
--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/serio/hyperv-keyboard.c +2 -2
@@ -75,8 +75,8 @@ struct synth_kbd_keystroke {#define HK_MAXIMUM_MESSAGE_SIZE 256 -#define KBD_VSC_SEND_RING_BUFFER_SIZE (40 * 1024) -#define KBD_VSC_RECV_RING_BUFFER_SIZE (40 * 1024) +#define KBD_VSC_SEND_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE)) +#define KBD_VSC_RECV_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE))#define XTKBD_EMUL0 0xe0#define XTKBD_EMUL1 0xe1
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 5 lines
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).
Quoted 8 lines
So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Re: [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages
Quoted 10 lines · Michael Kelley
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 8 lines
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Boqun Feng <[email protected]>--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Reviewed-by Michael Kelley <[email protected]>
Please feel free to merge with the rest of the patches through whatever tree they will go in.
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages
In reply to Boqun FengQuoted 17 lines · Boqun Feng
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/input/serio/hyperv-keyboard.c +0
-0
drivers/input/serio/hyperv-keyboard.c struct synth_kbd_keystroke { · line 80
Quoted 8 lines
drivers/input/serio/hyperv-keyboard.c +2
-2@@ -75,8 +75,8 @@ struct synth_kbd_keystroke {#define HK_MAXIMUM_MESSAGE_SIZE 256 -#define KBD_VSC_SEND_RING_BUFFER_SIZE (40 * 1024) -#define KBD_VSC_RECV_RING_BUFFER_SIZE (40 * 1024) +#define KBD_VSC_SEND_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE)) +#define KBD_VSC_RECV_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE))
Hmm.. just realized there is a problem here, if PAGE_SIZE = 16k, then 40 * 1024 > 2 * PAGE_SIZE, however in the ring buffer size should also be page aligned, otherwise vmbus_open() will fail.
I plan to modify this as
in linux/hyperv.h:
#define VMBUS_RING_SIZE(payload_sz) PAGE_ALIGN(sizeof(struct hv_ring_buffer) + (playload_sz))
and here:
#define KBD_VSC_SEND_RING_BUFFER_SIZE VMBUS_RING_SIZE(36 * 1024) #define KBD_VSC_RECV_RING_BUFFER_SIZE VMBUS_RING_SIZE(36 * 1024)
and the similar change for patch #9.
Thoughts?
Regards,
Boqun
Quoted 5 lines
drivers/input/serio/hyperv-keyboard.c +0
-0#define XTKBD_EMUL0 0xe0#define XTKBD_EMUL1 0xe1Signature · 1 line
2.28.0
Wei Liu
maintainerRe: [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages
Quoted 35 lines · Boqun Feng
Quoted 17 lines · Boqun Feng
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/input/serio/hyperv-keyboard.c +0
-0drivers/input/serio/hyperv-keyboard.c struct synth_kbd_keystroke { · line 80
Quoted 8 lines
drivers/input/serio/hyperv-keyboard.c +2
-2@@ -75,8 +75,8 @@ struct synth_kbd_keystroke {#define HK_MAXIMUM_MESSAGE_SIZE 256 -#define KBD_VSC_SEND_RING_BUFFER_SIZE (40 * 1024) -#define KBD_VSC_RECV_RING_BUFFER_SIZE (40 * 1024) +#define KBD_VSC_SEND_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE)) +#define KBD_VSC_RECV_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE))Hmm.. just realized there is a problem here, if
PAGE_SIZE= 16k, then 40 * 1024 > 2 *PAGE_SIZE, however in the ring buffer size should also be page aligned, otherwisevmbus_open()will fail.I plan to modify this as
in
linux/hyperv.h:
Quoted 8 lines
#define
VMBUS_RING_SIZE(payload_sz)PAGE_ALIGN(sizeof(struct hv_ring_buffer) + (playload_sz))and here:
#define
KBD_VSC_SEND_RING_BUFFER_SIZEVMBUS_RING_SIZE(36 * 1024)#defineKBD_VSC_RECV_RING_BUFFER_SIZEVMBUS_RING_SIZE(36 * 1024)and the similar change for patch #9.
OOI why do you reduce the size by 4k here?
Wei.
Quoted 11 lines
Thoughts?
Regards,
BoqunQuoted 5 lines
drivers/input/serio/hyperv-keyboard.c +0
-0#define XTKBD_EMUL0 0xe0#define XTKBD_EMUL1 0xe1Signature · 1 line
2.28.0
Re: [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages
Quoted 38 lines · Wei Liu
Quoted 37 lines · Boqun Feng
Quoted 17 lines · Boqun Feng
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>--- drivers/input/serio/hyperv-keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/input/serio/hyperv-keyboard.c +0
-0drivers/input/serio/hyperv-keyboard.c struct synth_kbd_keystroke { · line 80
Quoted 8 lines
drivers/input/serio/hyperv-keyboard.c +2
-2@@ -75,8 +75,8 @@ struct synth_kbd_keystroke {#define HK_MAXIMUM_MESSAGE_SIZE 256 -#define KBD_VSC_SEND_RING_BUFFER_SIZE (40 * 1024) -#define KBD_VSC_RECV_RING_BUFFER_SIZE (40 * 1024) +#define KBD_VSC_SEND_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE)) +#define KBD_VSC_RECV_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE))Hmm.. just realized there is a problem here, if
PAGE_SIZE= 16k, then 40 * 1024 > 2 *PAGE_SIZE, however in the ring buffer size should also be page aligned, otherwisevmbus_open()will fail.I plan to modify this as
in
linux/hyperv.h:#define
VMBUS_RING_SIZE(payload_sz)PAGE_ALIGN(sizeof(struct hv_ring_buffer) + (playload_sz))
Quoted 9 lines
Quoted 6 lines
and here:
#define
KBD_VSC_SEND_RING_BUFFER_SIZEVMBUS_RING_SIZE(36 * 1024)#defineKBD_VSC_RECV_RING_BUFFER_SIZEVMBUS_RING_SIZE(36 * 1024)and the similar change for patch #9.
OOI why do you reduce the size by 4k here?
To keep the total ring buffer size unchanged (still 40k) when PAGE_SIZE=4k. Because in VMBUS_RING_SIZE() (which I plan to rename as HV_RING_SIZE()), the hv_ring_buffer size is already added.
Regards,
Boqun
Quoted 13 lines
Wei.
Quoted 11 lines
Thoughts?
Regards,
BoqunQuoted 5 lines
drivers/input/serio/hyperv-keyboard.c +0
-0#define XTKBD_EMUL0 0xe0#define XTKBD_EMUL1 0xe1Signature · 1 line
2.28.0
PATCH v3 9/11 HID: hyperv: Make ringbuffer at least take two pages
In reply to Boqun FengWhen PAGE_SIZE > HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 * PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).
So make sure the ringbuffer sizes to be at least 2 * PAGE_SIZE when using vmbus_open() to establish the vmbus connection.
---
Hi Jiri,
Thanks for your acked-by. I make a small change in this version (casting 2 * PAGE_SIZE into int to avoid compiler warnings), and it make no functional change. If the change is inappropriate, please let me know.
drivers/hid/hid-hyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-hyperv.c +2 -2
@@ -104,8 +104,8 @@ struct synthhid_input_report {#pragma pack(pop) -#define INPUTVSC_SEND_RING_BUFFER_SIZE (40 * 1024) -#define INPUTVSC_RECV_RING_BUFFER_SIZE (40 * 1024) +#define INPUTVSC_SEND_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE)) +#define INPUTVSC_RECV_RING_BUFFER_SIZE max(40 * 1024, (int)(2 * PAGE_SIZE))enum pipe_prot_msg_type {
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 09/11] HID: hyperv: Make ringbuffer at least take two pages
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 13 lines
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>Acked-by Jiri Kosina <[email protected]>---
Hi Jiri,
Quoted 7 lines
Thanks for your acked-by. I make a small change in this version (casting 2 *
PAGE_SIZEinto int to avoid compiler warnings), and it make no functional change. If the change is inappropriate, please let me know.drivers/hid/hid-hyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v3 10/11 Driver: hv: util: Make ringbuffer at least take two pages
In reply to Boqun FengWhen PAGE_SIZE > HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 * PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).
So make sure the ringbuffer sizes to be at least 2 * PAGE_SIZE when using vmbus_open() to establish the vmbus connection.
--- drivers/hv/hv_util.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/hv/hv_util.c +12 -4
@@ -500,6 +500,14 @@ static void heartbeat_onchannelcallback(void *context) } } +/* +* The size of each ring should be at least 2 * PAGE_SIZE, because we need one +* page for the header and at least another page (because of the alignment +* requirement for double mapping) for data part. +*/ +#define HV_UTIL_RING_SEND_SIZE max(4 * HV_HYP_PAGE_SIZE, 2 * PAGE_SIZE) +#define HV_UTIL_RING_RECV_SIZE max(4 * HV_HYP_PAGE_SIZE, 2 * PAGE_SIZE) +static int util_probe (struct hv_device *dev,const struct hv_vmbus_device_id *dev_id) {
@@ -530,8 +538,8 @@ static int util_probe(struct hv_device *dev,hv_set_drvdata (dev, srv); - ret =vmbus_open (dev->channel,4 *HV_HYP_PAGE_SIZE , -4 *HV_HYP_PAGE_SIZE ,NULL ,0 , srv->util_cb, + ret =vmbus_open (dev->channel,HV_UTIL_RING_SEND_SIZE , +HV_UTIL_RING_RECV_SIZE ,NULL ,0 , srv->util_cb, dev->channel);if (ret) goto error;
@@ -590,8 +598,8 @@ static int util_resume(struct hv_device *dev)return ret; } - ret =vmbus_open (dev->channel,4 *HV_HYP_PAGE_SIZE , -4 *HV_HYP_PAGE_SIZE ,NULL ,0 , srv->util_cb, + ret =vmbus_open (dev->channel,HV_UTIL_RING_SEND_SIZE , +HV_UTIL_RING_RECV_SIZE ,NULL ,0 , srv->util_cb, dev->channel);return ret; }
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 10/11] Driver: hv: util: Make ringbuffer at least take two pages
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 5 lines
When
PAGE_SIZE>HV_HYP_PAGE_SIZE, we need the ringbuffer size to be at least 2 *PAGE_SIZE: one page for the header and at least one page of the data part (because of the alignment requirement for double mapping).
Quoted 8 lines
So make sure the ringbuffer sizes to be at least 2 *
PAGE_SIZEwhen usingvmbus_open()to establish the vmbus connection.Signed-off-by Boqun Feng <[email protected]>--- drivers/hv/hv_util.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
PATCH v3 11/11 scsi: storvsc: Support PAGE_SIZE larger than 4K
In reply to Boqun FengHyper-V always use 4k page size (HV_HYP_PAGE_SIZE), so when communicating with Hyper-V, a guest should always use HV_HYP_PAGE_SIZE as the unit for page related data. For storvsc, the data is vmbus_packet_mpb_array. And since in scsi_cmnd, sglist of pages (in unit of PAGE_SIZE) is used, we need convert pages in the sglist of scsi_cmnd into Hyper-V pages in vmbus_packet_mpb_array.
This patch does the conversion by dividing pages in sglist into Hyper-V pages, offset and indexes in vmbus_packet_mpb_array are recalculated accordingly.
--- drivers/scsi/storvsc_drv.c | 54 +++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 7 deletions(-)
drivers/scsi/storvsc_drv.c +47 -7
@@ -1739,23 +1739,63 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) payload_sz =sizeof (cmd_request->mpb);if (sg_count) { -if (sg_count >MAX_PAGE_BUFFER_COUNT ) { +unsigned int hvpgoff =0 ; +unsigned long hvpg_offset = sgl->offset & ~HV_HYP_PAGE_MASK ; +unsigned int hvpg_count =HVPFN_UP (hvpg_offset + length); +u64 hvpfn; - payload_sz = (sg_count *sizeof (u64) + +if (hvpg_count >MAX_PAGE_BUFFER_COUNT ) { + + payload_sz = (hvpg_count *sizeof (u64) +sizeof (struct vmbus_packet_mpb_array )); payload =kzalloc (payload_sz,GFP_ATOMIC );if (!payload)return SCSI_MLQUEUE_DEVICE_BUSY ; } +/* +* sgl is a list of PAGEs, and payload->range.pfn_array +* expects the page number in the unit of HV_HYP_PAGE_SIZE (the +* page size that Hyper-V uses, so here we need to divide PAGEs +* into HV_HYP_PAGE in case that PAGE_SIZE > HV_HYP_PAGE_SIZE. +*/ payload->range.len = length; - payload->range.offset = sgl[0 ].offset; + payload->range.offset = sgl[0 ].offset & ~HV_HYP_PAGE_MASK ; + hvpgoff = sgl[0 ].offset >>HV_HYP_PAGE_SHIFT ; cur_sgl = sgl; -for (i =0 ; i < sg_count; i++) { - payload->range.pfn_array[i] = -page_to_pfn (sg_page ((cur_sgl))); - cur_sgl =sg_next (cur_sgl); +for (i =0 ; i < hvpg_count; i++) { +/* +* 'i' is the index of hv pages in the payload and +* 'hvpgoff' is the offset (in hv pages) of the first +* hv page in the the first page. The relationship +* between the sum of 'i' and 'hvpgoff' and the offset +* (in hv pages) in a payload page ('hvpgoff_in_page') +* is as follow: +* +* |------------------ PAGE -------------------| +* | NR_HV_HYP_PAGES_IN_PAGE hvpgs in total | +* |hvpg|hvpg| ... |hvpg|... |hvpg| +* ^ ^ ^ ^ +* +-hvpgoff-+ +-hvpgoff_in_page-+ +* ^ | +* +--------------------- i ---------------------------+ +*/ +unsigned int hvpgoff_in_page = + (i + hvpgoff) %NR_HV_HYP_PAGES_IN_PAGE ; + +/* +* Two cases that we need to fetch a page: +* 1) i == 0, the first step or +* 2) hvpgoff_in_page == 0, when we reach the boundary +* of a page. +*/ +if (hvpgoff_in_page ==0 || i ==0 ) { + hvpfn =page_to_hvpfn (sg_page (cur_sgl)); + cur_sgl =sg_next (cur_sgl); + } + + payload->range.pfn_array[i] = hvpfn + hvpgoff_in_page; } }
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [PATCH v3 11/11] scsi: storvsc: Support PAGE_SIZE larger than 4K
From: Boqun Feng <[email protected]> Sent: Thursday, September 10, 2020 7:35 AM
Quoted 22 lines
Hyper-V always use 4k page size (
HV_HYP_PAGE_SIZE), so when communicating with Hyper-V, a guest should always useHV_HYP_PAGE_SIZEas the unit for page related data. For storvsc, the data isvmbus_packet_mpb_array. And since inscsi_cmnd, sglist of pages (in unit ofPAGE_SIZE) is used, we need convert pages in the sglist ofscsi_cmndinto Hyper-V pages invmbus_packet_mpb_array.This patch does the conversion by dividing pages in sglist into Hyper-V pages, offset and indexes in
vmbus_packet_mpb_arrayare recalculated accordingly.Signed-off-by Boqun Feng <[email protected]>--- drivers/scsi/storvsc_drv.c | 54 +++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 7 deletions(-)drivers/scsi/storvsc_drv.c +0
-0
drivers/scsi/storvsc_drv.c static int storvsc_queuecommand(struct Scsi_Host *host, struct · line 1744
Quoted 7 lines
drivers/scsi/storvsc_drv.c +2
-1@@ -1739,23 +1739,63 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) payload_sz =sizeof (cmd_request->mpb);if (sg_count) { -if (sg_count >MAX_PAGE_BUFFER_COUNT ) { +unsigned int hvpgoff =0 ; +unsigned long hvpg_offset = sgl->offset & ~HV_HYP_PAGE_MASK ;
This is a minor nit. The above expression uses sgl->offset. Code below uses sgl[0].offset. They're the same but the inconsistency sticks out a bit.
Quoted 12 lines
drivers/scsi/storvsc_drv.c +5
-1+unsigned int hvpg_count =HVPFN_UP (hvpg_offset + length); +u64 hvpfn; - payload_sz = (sg_count *sizeof (u64) + +if (hvpg_count >MAX_PAGE_BUFFER_COUNT ) { + + payload_sz = (hvpg_count *sizeof (u64) +sizeof (struct vmbus_packet_mpb_array )); payload =kzalloc (payload_sz,GFP_ATOMIC );if (!payload)return SCSI_MLQUEUE_DEVICE_BUSY ; }
drivers/scsi/storvsc_drv.c static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) · line 1763
Quoted 10 lines
drivers/scsi/storvsc_drv.c +7
-1+/* +* sgl is a list of PAGEs, and payload->range.pfn_array +* expects the page number in the unit of HV_HYP_PAGE_SIZE (the +* page size that Hyper-V uses, so here we need to divide PAGEs +* into HV_HYP_PAGE in case that PAGE_SIZE > HV_HYP_PAGE_SIZE. +*/ payload->range.len = length; - payload->range.offset = sgl[0 ].offset; + payload->range.offset = sgl[0 ].offset & ~HV_HYP_PAGE_MASK ;
Another nit. The right hand side of the above assignment is already calculated as hvpg_offset.
Nits aside,
Quoted 44 lines
drivers/scsi/storvsc_drv.c +33
-5+ hvpgoff = sgl[0 ].offset >>HV_HYP_PAGE_SHIFT ; cur_sgl = sgl; -for (i =0 ; i < sg_count; i++) { - payload->range.pfn_array[i] = -page_to_pfn (sg_page ((cur_sgl))); - cur_sgl =sg_next (cur_sgl); +for (i =0 ; i < hvpg_count; i++) { +/* +* 'i' is the index of hv pages in the payload and +* 'hvpgoff' is the offset (in hv pages) of the first +* hv page in the the first page. The relationship +* between the sum of 'i' and 'hvpgoff' and the offset +* (in hv pages) in a payload page ('hvpgoff_in_page') +* is as follow: +* +* |------------------ PAGE -------------------| +* | NR_HV_HYP_PAGES_IN_PAGE hvpgs in total | +* |hvpg|hvpg| ... |hvpg|... |hvpg| +* ^ ^ ^ ^ +* +-hvpgoff-+ +-hvpgoff_in_page-+ +* ^ | +* +--------------------- i ---------------------------+ +*/ +unsigned int hvpgoff_in_page = + (i + hvpgoff) %NR_HV_HYP_PAGES_IN_PAGE ; + +/* +* Two cases that we need to fetch a page: +* 1) i == 0, the first step or +* 2) hvpgoff_in_page == 0, when we reach the boundary +* of a page. +*/ +if (hvpgoff_in_page ==0 || i ==0 ) { + hvpfn =page_to_hvpfn (sg_page (cur_sgl)); + cur_sgl =sg_next (cur_sgl); + } + + payload->range.pfn_array[i] = hvpfn + hvpgoff_in_page; } } --2.28.0