mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-22 11:17:19 +00:00
Code Issues Releases Activity

hyperv: Use kmem_malloc for hypercall memory due to NX bit change.

Browse Source 
Reported by:	dexuan@
MFC after:	now
Sponsored by:	Microsoft
This commit is contained in:
Sepherosa Ziehau 2017-04-19 02:39:48 +00:00
parent d86e8e9c57
commit 9ba5e29c5c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=317107
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/hyperv/vmbus/hyperv.c
View File

@ -34,9 +34,15 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/timetc.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/hyperv_busdma.h>
#include <dev/hyperv/vmbus/hyperv_machdep.h>
@ -64,7 +70,7 @@ __FBSDID("$FreeBSD$");
struct hypercall_ctx {
void *hc_addr;
struct hyperv_dma hc_dma;
vm_paddr_t hc_paddr;
};
static u_int hyperv_get_timecount(struct timecounter *);
@ -255,8 +261,8 @@ SYSINIT(hyperv_initialize, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, hyperv_init,
static void
hypercall_memfree(void)
{
hyperv_dmamem_free(&hypercall_context.hc_dma,
hypercall_context.hc_addr);
kmem_free(kernel_arena, (vm_offset_t)hypercall_context.hc_addr,
PAGE_SIZE);
hypercall_context.hc_addr = NULL;
}
@ -268,14 +274,15 @@ hypercall_create(void *arg __unused)
if (vm_guest != VM_GUEST_HV)
return;
hypercall_context.hc_addr = hyperv_dmamem_alloc(NULL, PAGE_SIZE, 0,
PAGE_SIZE, &hypercall_context.hc_dma, BUS_DMA_WAITOK);
if (hypercall_context.hc_addr == NULL) {
printf("hyperv: Hypercall page allocation failed\n");
/* Can't perform any Hyper-V specific actions */
vm_guest = VM_GUEST_VM;
return;
}
/*
* NOTE:
* - busdma(9), i.e. hyperv_dmamem APIs, can _not_ be used due to
* the NX bit.
* - Assume kmem_malloc() returns properly aligned memory.
*/
hypercall_context.hc_addr = (void *)kmem_malloc(kernel_arena, PAGE_SIZE,
M_WAITOK);
hypercall_context.hc_paddr = vtophys(hypercall_context.hc_addr);
/* Get the 'reserved' bits, which requires preservation. */
hc_orig = rdmsr(MSR_HV_HYPERCALL);
@ -285,7 +292,7 @@ hypercall_create(void *arg __unused)
*
* NOTE: 'reserved' bits MUST be preserved.
*/
hc = ((hypercall_context.hc_dma.hv_paddr >> PAGE_SHIFT) <<
hc = ((hypercall_context.hc_paddr >> PAGE_SHIFT) <<
MSR_HV_HYPERCALL_PGSHIFT) |
(hc_orig & MSR_HV_HYPERCALL_RSVD_MASK) |
MSR_HV_HYPERCALL_ENABLE;