Drivers: hv: Remove dependencies on guest page size
Subsystems (3)
cover Drivers: hv: Remove dependencies on guest page size
Hyper-V assumes page size to be 4KB. This might not be the case on ARM64 architecture. The first patch in this patchset introduces a hyer-v specific function for allocating a zeroed page which can have a different implementation on ARM64 to address the issue of different guest and host page sizes. The second patch removes dependencies on guest page size in vmbus by using hyper-v specific page symbol and functions.
Himadri Pandya (2):
x86: hv: Add function to allocate zeroed page for Hyper-V
Drivers: hv: vmbus: Remove dependencies on guest page size
arch/x86/hyperv/hv_init.c | 8 ++++++++ arch/x86/include/asm/mshyperv.h | 1 + drivers/hv/connection.c | 14 +++++++------- drivers/hv/vmbus_drv.c | 6 +++--- 4 files changed, 19 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 x86: hv: Add function to allocate zeroed page for Hyper-V
Hyper-V assumes page size to be 4K. While this assumption holds true on x86 architecture, it might not be true for ARM64 architecture. Hence define hyper-v specific function to allocate a zeroed page which can have a different implementation on ARM64 architecture to handle the conflict between hyper-v's assumed page size and actual guest page size.
--- arch/x86/hyperv/hv_init.c | 8 ++++++++ arch/x86/include/asm/mshyperv.h | 1 + 2 files changed, 9 insertions(+)
arch/x86/hyperv/hv_init.c +8 -0
@@ -45,6 +45,14 @@ void *hv_alloc_hyperv_page(void) }EXPORT_SYMBOL_GPL (hv_alloc_hyperv_page); +void *hv_alloc_hyperv_zeroed_page (void ) +{ +BUILD_BUG_ON (PAGE_SIZE !=HV_HYP_PAGE_SIZE ); + +return (void *)__get_free_page (GFP_KERNEL | __GFP_ZERO); +} +EXPORT_SYMBOL_GPL (hv_alloc_hyperv_zeroed_page); +void hv_free_hyperv_page (unsigned long addr) {free_page (addr);
arch/x86/include/asm/mshyperv.h +1 -0
@@ -219,6 +219,7 @@ static inline struct hv_vp_assist_page *hv_get_vp_assist_page(unsigned int cpu)void __init hyperv_init (void );void hyperv_setup_mmu_ops (void );void *hv_alloc_hyperv_page (void ); +void *hv_alloc_hyperv_zeroed_page (void );void hv_free_hyperv_page (unsigned long addr);void hyperv_reenlightenment_intr (struct pt_regs *regs);void set_hv_tscchange_cb (void (*cb)(void ));
Signature · 1 line
2.17.1
PATCH 2/2 Drivers: hv: vmbus: Remove dependencies on guest page size
In reply to Himadri PandyaHyper-V assumes page size to be 4K. This might not be the case for ARM64 architecture. Hence use hyper-v page size and page allocation function to avoid conflicts between different host and guest page size on ARM64.
--- drivers/hv/connection.c | 14 +++++++------- drivers/hv/vmbus_drv.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/hv/connection.c +7 -7
@@ -202,7 +202,7 @@ int vmbus_connect(void)* abstraction stuff */ vmbus_connection.int_page = - (void *)__get_free_pages (GFP_KERNEL |__GFP_ZERO,0 ); + (void *)hv_alloc_hyperv_zeroed_page ();if (vmbus_connection.int_page ==NULL ) { ret = -ENOMEM ; goto cleanup;
@@ -211,14 +211,14 @@ int vmbus_connect(void) vmbus_connection.recv_int_page = vmbus_connection.int_page; vmbus_connection.send_int_page = (void *)((unsigned long )vmbus_connection.int_page + - (PAGE_SIZE >>1 )); + (HV_HYP_PAGE_SIZE >>1 ));/* * Setup the monitor notification facility. The 1st page for * parent->child and the 2nd page for child->parent */ - vmbus_connection.monitor_pages[0 ] = (void *)__get_free_pages ((GFP_KERNEL |__GFP_ZERO),0 ); - vmbus_connection.monitor_pages[1 ] = (void *)__get_free_pages ((GFP_KERNEL |__GFP_ZERO),0 ); + vmbus_connection.monitor_pages[0 ] = (void *)hv_alloc_hyperv_zeroed_page (); + vmbus_connection.monitor_pages[1 ] = (void *)hv_alloc_hyperv_zeroed_page ();if ((vmbus_connection.monitor_pages[0 ] ==NULL ) || (vmbus_connection.monitor_pages[1 ] ==NULL )) { ret = -ENOMEM ;
@@ -291,12 +291,12 @@ void vmbus_disconnect(void)destroy_workqueue (vmbus_connection.work_queue);if (vmbus_connection.int_page) { -free_pages ((unsigned long )vmbus_connection.int_page,0 ); +hv_free_hyperv_page ((unsigned long )vmbus_connection.int_page); vmbus_connection.int_page =NULL ; } -free_pages ((unsigned long )vmbus_connection.monitor_pages[0 ],0 ); -free_pages ((unsigned long )vmbus_connection.monitor_pages[1 ],0 ); +hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[0 ]); +hv_free_hyperv_page ((unsigned long )vmbus_connection.monitor_pages[1 ]); vmbus_connection.monitor_pages[0 ] =NULL ; vmbus_connection.monitor_pages[1 ] =NULL ; }
drivers/hv/vmbus_drv.c +3 -3
@@ -1186,7 +1186,7 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper,* Write dump contents to the page. No need to synchronize; panic should * be single-threaded. */ -kmsg_dump_get_buffer (dumper, true, hv_panic_page,PAGE_SIZE , +kmsg_dump_get_buffer (dumper, true, hv_panic_page,HV_HYP_PAGE_SIZE , &bytes_written);if (bytes_written)hyperv_report_panic_msg (panic_pa, bytes_written);
@@ -1290,7 +1290,7 @@ static int vmbus_bus_init(void)*/ hv_get_crash_ctl (hyperv_crash_ctl);if (hyperv_crash_ctl &HV_CRASH_CTL_CRASH_NOTIFY_MSG ) { - hv_panic_page = (void *)get_zeroed_page (GFP_KERNEL ); + hv_panic_page = (void *)hv_alloc_hyperv_zeroed_page ();if (hv_panic_page) { ret =kmsg_dump_register (&hv_kmsg_dumper);if (ret)
@@ -1319,7 +1319,7 @@ static int vmbus_bus_init(void)hv_remove_vmbus_irq ();bus_unregister (&hv_bus); -free_page ((unsigned long )hv_panic_page); +hv_free_hyperv_page ((unsigned long )hv_panic_page);unregister_sysctl_table (hv_ctl_table_hdr); hv_ctl_table_hdr =NULL ;return ret;
Signature · 1 line
2.17.1
A message that is not in the archive (sent off-list or not yet received): DM5PR21MB01377F433CD767AF5E917EA6D7B80@DM5PR21MB0137.namprd21.prod.outlook.com
Quoted 20 lines · Michael Kelley
From: Himadri Pandya <[email protected]>
Quoted 19 lines
Hyper-V assumes page size to be 4KB. This might not be the case on ARM64 architecture. The first patch in this patchset introduces a hyer-v specific function for allocating a zeroed page which can have a different implementation on ARM64 to address the issue of different guest and host page sizes. The second patch removes dependencies on guest page size in vmbus by using hyper-v specific page symbol and functions.
Himadri Pandya (2):
x86: hv: Add function to allocate zeroed page for Hyper-V
Drivers: hv: vmbus: Remove dependencies on guest page sizearch/x86/hyperv/hv_init.c | 8 ++++++++ arch/x86/include/asm/mshyperv.h | 1 + drivers/hv/connection.c | 14 +++++++------- drivers/hv/vmbus_drv.c | 6 +++--- 4 files changed, 19 insertions(+), 10 deletions(-)
Quoted 5 lines
Quoted 2 lines
--
2.17.1Thomas -- can you pick up this patch in the x86/hyperv branch of your tip tree along with the other patches to fix wrong page size assumptions?
I'll take it through the hyper-v tree, there's a bunch of similar work queued up there already.
--
Thanks,
Sasha