From owner-svn-soc-all@freebsd.org Wed Jun 24 22:03:07 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53D91916977 for ; Wed, 24 Jun 2015 22:03:07 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 238AD18DD for ; Wed, 24 Jun 2015 22:03:07 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OM37d6062084 for ; Wed, 24 Jun 2015 22:03:07 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5OM36Rs062043 for svn-soc-all@FreeBSD.org; Wed, 24 Jun 2015 22:03:06 GMT (envelope-from mihai@FreeBSD.org) Date: Wed, 24 Jun 2015 22:03:06 GMT Message-Id: <201506242203.t5OM36Rs062043@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287554 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 22:03:07 -0000 Author: mihai Date: Wed Jun 24 22:03:05 2015 New Revision: 287554 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287554 Log: soc2015: mihai: bhyve-on-arm-head: sys: arm: vmm: remove alloc for the code area because it breaks the global pointers Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 21:30:35 2015 (r287553) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 22:03:05 2015 (r287554) @@ -30,7 +30,6 @@ arm_init(int ipinum) { char *stack_top; - size_t hyp_code_size; uint64_t *phys_hyp_l1pd; stack = malloc(PAGE_SIZE, M_HYP); @@ -39,25 +38,15 @@ lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - /* - * Allocate a PAGE for the HYP code to be sure it's PAGE_SIZE - * aligned and doesn't cross a page boundary. - */ - hyp_code_size = _hyp_code_stop - _hyp_code_start; - hyp_code_size = (hyp_code_size + PAGE_SIZE) & PAGE_SIZE; - hyp_code = contigmalloc(hyp_code_size, M_HYP, 0, 0x0, - 0xffffffff, PAGE_SIZE, 0); - memcpy(hyp_code, _hyp_code_start, hyp_code_size); - - printf("%s hyp_code_size: %p, _hyp_code_start: %p, hyp_code: %p\n", __func__, (void*) _hyp_code_start, (void*) hyp_code); + printf("%s _hyp_code_start: %p\n", __func__, (void*) _hyp_code_start); /* Create two mappings: * - one identity - VA == PA * - one normal mappings to HYP pagetable */ - lpae_vmmmap_set(NULL, hyp_code, ptophys(hyp_code), hyp_code_size, + lpae_vmmmap_set(NULL, hyp_code, ptophys(_hyp_code_start), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - lpae_vmmmap_set(NULL, ptophys(hyp_code), ptophys(hyp_code), hyp_code_size, + lpae_vmmmap_set(NULL, ptophys(_hyp_code_start), ptophys(_hyp_code_start), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); /* Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Wed Jun 24 21:30:35 2015 (r287553) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Wed Jun 24 22:03:05 2015 (r287554) @@ -14,6 +14,7 @@ .globl _hyp_vector .globl _init_hyp_vector + .p2align 12 _hyp_code_start: __semi_call: