Print this page
13275 bhyve needs richer INIT/SIPI support
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/bhyve/spinup_ap.c
+++ new/usr/src/cmd/bhyve/spinup_ap.c
1 1 /*-
2 2 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3 3 *
4 4 * Copyright (c) 2012 NetApp, Inc.
5 5 * All rights reserved.
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
9 9 * are met:
10 10 * 1. Redistributions of source code must retain the above copyright
11 11 * notice, this list of conditions and the following disclaimer.
12 12 * 2. Redistributions in binary form must reproduce the above copyright
13 13 * notice, this list of conditions and the following disclaimer in the
14 14 * documentation and/or other materials provided with the distribution.
15 15 *
16 16 * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
17 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 19 * ARE DISCLAIMED. IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
20 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 26 * SUCH DAMAGE.
27 27 *
28 28 * $FreeBSD$
29 29 */
30 30 /*
31 31 * This file and its contents are supplied under the terms of the
32 32 * Common Development and Distribution License ("CDDL"), version 1.0.
33 33 * You may only use this file in accordance with the terms of version
34 34 * 1.0 of the CDDL.
35 35 *
36 36 * A full copy of the text of the CDDL should have accompanied this
37 37 * source. A copy of the CDDL is also available via the Internet at
38 38 * http://www.illumos.org/license/CDDL.
39 39 *
40 40 * Copyright 2020 Oxide Computer Company
41 41 */
42 42
43 43 #include <sys/cdefs.h>
44 44 __FBSDID("$FreeBSD$");
45 45
46 46 #include <sys/param.h>
47 47 #include <sys/types.h>
48 48
|
↓ open down ↓ |
48 lines elided |
↑ open up ↑ |
49 49 #include <machine/vmm.h>
50 50 #include <vmmapi.h>
51 51
52 52 #include <stdio.h>
53 53 #include <stdlib.h>
54 54 #include <assert.h>
55 55
56 56 #include "bhyverun.h"
57 57 #include "spinup_ap.h"
58 58
59 +#ifdef __FreeBSD__
59 60 static void
60 61 spinup_ap_realmode(struct vmctx *ctx, int newcpu, uint64_t *rip)
61 62 {
62 63 int vector, error;
63 64 uint16_t cs;
64 65 uint64_t desc_base;
65 66 uint32_t desc_limit, desc_access;
66 67
67 68 vector = *rip >> PAGE_SHIFT;
68 69 *rip = 0;
69 70
70 71 /*
71 72 * Update the %cs and %rip of the guest so that it starts
72 73 * executing real mode code at at 'vector << 12'.
73 74 */
74 75 error = vm_set_register(ctx, newcpu, VM_REG_GUEST_RIP, *rip);
75 76 assert(error == 0);
76 77
77 78 error = vm_get_desc(ctx, newcpu, VM_REG_GUEST_CS, &desc_base,
78 79 &desc_limit, &desc_access);
79 80 assert(error == 0);
80 81
81 82 desc_base = vector << PAGE_SHIFT;
82 83 error = vm_set_desc(ctx, newcpu, VM_REG_GUEST_CS,
83 84 desc_base, desc_limit, desc_access);
84 85 assert(error == 0);
85 86
86 87 cs = (vector << PAGE_SHIFT) >> 4;
87 88 error = vm_set_register(ctx, newcpu, VM_REG_GUEST_CS, cs);
88 89 assert(error == 0);
89 90 }
90 91
91 92 int
92 93 spinup_ap(struct vmctx *ctx, int vcpu, int newcpu, uint64_t rip)
93 94 {
|
↓ open down ↓ |
25 lines elided |
↑ open up ↑ |
94 95 int error;
95 96
96 97 assert(newcpu != 0);
97 98 assert(newcpu < guest_ncpus);
98 99
99 100 error = vcpu_reset(ctx, newcpu);
100 101 assert(error == 0);
101 102
102 103 fbsdrun_set_capabilities(ctx, newcpu);
103 104
104 -#ifdef __FreeBSD__
105 105 /*
106 106 * Enable the 'unrestricted guest' mode for 'newcpu'.
107 107 *
108 108 * Set up the processor state in power-on 16-bit mode, with the CS:IP
109 109 * init'd to the specified low-mem 4K page.
110 110 */
111 111 error = vm_set_capability(ctx, newcpu, VM_CAP_UNRESTRICTED_GUEST, 1);
112 112 assert(error == 0);
113 -#else
114 - /* Unrestricted Guest is always enabled on illumos */
115 -#endif
116 113
117 114 spinup_ap_realmode(ctx, newcpu, &rip);
118 115
119 -#ifdef __FreeBSD__
120 116 fbsdrun_addcpu(ctx, vcpu, newcpu, rip);
121 -#else
122 - fbsdrun_addcpu(ctx, vcpu, newcpu, rip, false);
123 -#endif
124 117
125 118 return (newcpu);
126 119 }
120 +#else /* __FreeBSD__ */
121 +void
122 +spinup_halted_ap(struct vmctx *ctx, int newcpu)
123 +{
124 + int error;
125 +
126 + assert(newcpu != 0);
127 + assert(newcpu < guest_ncpus);
128 +
129 + error = vcpu_reset(ctx, newcpu);
130 + assert(error == 0);
131 +
132 + fbsdrun_set_capabilities(ctx, newcpu);
133 +
134 + error = vm_set_run_state(ctx, newcpu, VRS_HALT, 0);
135 + assert(error == 0);
136 +
137 + fbsdrun_addcpu(ctx, newcpu, 0, false);
138 +}
139 +#endif /* __FreeBSD__ */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX