svn commit: r268894 - stable/10/usr.sbin/bhyve
John Baldwin
jhb at FreeBSD.org
Sat Jul 19 22:24:31 UTC 2014
Author: jhb
Date: Sat Jul 19 22:24:29 2014
New Revision: 268894
URL: http://svnweb.freebsd.org/changeset/base/268894
Log:
MFC 263432,265366,265376:
Fixes for vcpu management in bhyve:
- Use 'cpuset_t' to represent the vcpus active in a virtual machine.
- Modify the "-p" option to be more flexible when associating a 'vcpu' with
a 'hostcpu'.
Modified:
stable/10/usr.sbin/bhyve/bhyve.8
stable/10/usr.sbin/bhyve/bhyverun.c
stable/10/usr.sbin/bhyve/bhyverun.h
stable/10/usr.sbin/bhyve/spinup_ap.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bhyve/bhyve.8
==============================================================================
--- stable/10/usr.sbin/bhyve/bhyve.8 Sat Jul 19 22:13:27 2014 (r268893)
+++ stable/10/usr.sbin/bhyve/bhyve.8 Sat Jul 19 22:24:29 2014 (r268894)
@@ -35,7 +35,7 @@
.Op Fl aehwxAHPW
.Op Fl c Ar numcpus
.Op Fl g Ar gdbport
-.Op Fl p Ar pinnedcpu
+.Op Fl p Ar vcpu:hostcpu
.Op Fl s Ar slot,emulation Ns Op , Ns Ar conf
.Op Fl l Ar lpcdev Ns Op , Ns Ar conf
.Ar vmname
@@ -79,12 +79,11 @@ For
allow a remote kernel kgdb to be relayed to the guest kernel gdb stub
via a local IPv4 address and this port.
This option will be deprecated in a future version.
-.It Fl p Ar pinnedcpu
-Force guest virtual CPUs to be pinned to host CPUs.
-Virtual CPU
-.Em n
-is pinned to host CPU
-.Em pinnedcpu+n .
+.It Fl p Ar vcpu:hostcpu
+Pin guest's virtual CPU
+.Em vcpu
+to
+.Em hostcpu .
.It Fl P
Force the guest virtual CPU to exit when a PAUSE instruction is detected.
.It Fl W
Modified: stable/10/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- stable/10/usr.sbin/bhyve/bhyverun.c Sat Jul 19 22:13:27 2014 (r268893)
+++ stable/10/usr.sbin/bhyve/bhyverun.c Sat Jul 19 22:24:29 2014 (r268894)
@@ -85,7 +85,6 @@ char *vmname;
int guest_ncpus;
char *guest_uuid_str;
-static int pincpu = -1;
static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
static int virtio_msix = 1;
static int x2apic_mode = 0; /* default is xAPIC */
@@ -98,7 +97,7 @@ static int acpi;
static char *progname;
static const int BSP = 0;
-static int cpumask;
+static cpuset_t cpumask;
static void vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip);
@@ -122,18 +121,20 @@ struct mt_vmm_info {
int mt_vcpu;
} mt_vmm_info[VM_MAXCPU];
+static cpuset_t *vcpumap[VM_MAXCPU] = { NULL };
+
static void
usage(int code)
{
fprintf(stderr,
- "Usage: %s [-aehwAHIPW] [-g <gdb port>] [-s <pci>]\n"
- " %*s [-c vcpus] [-p pincpu] [-m mem] [-l <lpc>] <vm>\n"
+ "Usage: %s [-aehwAHIPW] [-g <gdb port>] [-s <pci>] [-c vcpus]\n"
+ " %*s [-p vcpu:hostcpu] [-m mem] [-l <lpc>] <vm>\n"
" -a: local apic is in xAPIC mode (deprecated)\n"
" -A: create an ACPI table\n"
" -g: gdb port\n"
" -c: # cpus (default 1)\n"
- " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
+ " -p: pin 'vcpu' to 'hostcpu'\n"
" -H: vmexit from the guest on hlt\n"
" -P: vmexit from the guest on pause\n"
" -W: force virtio to use single-vector MSI\n"
@@ -151,6 +152,39 @@ usage(int code)
exit(code);
}
+static int
+pincpu_parse(const char *opt)
+{
+ int vcpu, pcpu;
+
+ if (sscanf(opt, "%d:%d", &vcpu, &pcpu) != 2) {
+ fprintf(stderr, "invalid format: %s\n", opt);
+ return (-1);
+ }
+
+ if (vcpu < 0 || vcpu >= VM_MAXCPU) {
+ fprintf(stderr, "vcpu '%d' outside valid range from 0 to %d\n",
+ vcpu, VM_MAXCPU - 1);
+ return (-1);
+ }
+
+ if (pcpu < 0 || pcpu >= CPU_SETSIZE) {
+ fprintf(stderr, "hostcpu '%d' outside valid range from "
+ "0 to %d\n", pcpu, CPU_SETSIZE - 1);
+ return (-1);
+ }
+
+ if (vcpumap[vcpu] == NULL) {
+ if ((vcpumap[vcpu] = malloc(sizeof(cpuset_t))) == NULL) {
+ perror("malloc");
+ return (-1);
+ }
+ CPU_ZERO(vcpumap[vcpu]);
+ }
+ CPU_SET(pcpu, vcpumap[vcpu]);
+ return (0);
+}
+
void *
paddr_guest2host(struct vmctx *ctx, uintptr_t gaddr, size_t len)
{
@@ -200,30 +234,26 @@ fbsdrun_start_thread(void *param)
}
void
-fbsdrun_addcpu(struct vmctx *ctx, int vcpu, uint64_t rip)
+fbsdrun_addcpu(struct vmctx *ctx, int fromcpu, int newcpu, uint64_t rip)
{
int error;
- if (cpumask & (1 << vcpu)) {
- fprintf(stderr, "addcpu: attempting to add existing cpu %d\n",
- vcpu);
- exit(1);
- }
+ assert(fromcpu == BSP);
- atomic_set_int(&cpumask, 1 << vcpu);
+ CPU_SET_ATOMIC(newcpu, &cpumask);
/*
* Set up the vmexit struct to allow execution to start
* at the given RIP
*/
- vmexit[vcpu].rip = rip;
- vmexit[vcpu].inst_length = 0;
+ vmexit[newcpu].rip = rip;
+ vmexit[newcpu].inst_length = 0;
- mt_vmm_info[vcpu].mt_ctx = ctx;
- mt_vmm_info[vcpu].mt_vcpu = vcpu;
+ mt_vmm_info[newcpu].mt_ctx = ctx;
+ mt_vmm_info[newcpu].mt_vcpu = newcpu;
- error = pthread_create(&mt_vmm_info[vcpu].mt_thr, NULL,
- fbsdrun_start_thread, &mt_vmm_info[vcpu]);
+ error = pthread_create(&mt_vmm_info[newcpu].mt_thr, NULL,
+ fbsdrun_start_thread, &mt_vmm_info[newcpu]);
assert(error == 0);
}
@@ -231,14 +261,13 @@ static int
fbsdrun_deletecpu(struct vmctx *ctx, int vcpu)
{
- if ((cpumask & (1 << vcpu)) == 0) {
- fprintf(stderr, "addcpu: attempting to delete unknown cpu %d\n",
- vcpu);
+ if (!CPU_ISSET(vcpu, &cpumask)) {
+ fprintf(stderr, "Attempting to delete unknown cpu %d\n", vcpu);
exit(1);
}
- atomic_clear_int(&cpumask, 1 << vcpu);
- return (cpumask == 0);
+ CPU_CLR_ATOMIC(vcpu, &cpumask);
+ return (CPU_EMPTY(&cpumask));
}
static int
@@ -483,15 +512,12 @@ static vmexit_handler_t handler[VM_EXITC
static void
vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip)
{
- cpuset_t mask;
int error, rc, prevcpu;
enum vm_exitcode exitcode;
- if (pincpu >= 0) {
- CPU_ZERO(&mask);
- CPU_SET(pincpu + vcpu, &mask);
+ if (vcpumap[vcpu] != NULL) {
error = pthread_setaffinity_np(pthread_self(),
- sizeof(mask), &mask);
+ sizeof(cpuset_t), vcpumap[vcpu]);
assert(error == 0);
}
@@ -616,7 +642,10 @@ main(int argc, char *argv[])
bvmcons = 1;
break;
case 'p':
- pincpu = atoi(optarg);
+ if (pincpu_parse(optarg) != 0) {
+ errx(EX_USAGE, "invalid vcpu pinning "
+ "configuration '%s'", optarg);
+ }
break;
case 'c':
guest_ncpus = atoi(optarg);
@@ -754,7 +783,7 @@ main(int argc, char *argv[])
/*
* Add CPU 0
*/
- fbsdrun_addcpu(ctx, BSP, rip);
+ fbsdrun_addcpu(ctx, BSP, BSP, rip);
/*
* Head off to the main event dispatch loop
Modified: stable/10/usr.sbin/bhyve/bhyverun.h
==============================================================================
--- stable/10/usr.sbin/bhyve/bhyverun.h Sat Jul 19 22:13:27 2014 (r268893)
+++ stable/10/usr.sbin/bhyve/bhyverun.h Sat Jul 19 22:24:29 2014 (r268894)
@@ -43,7 +43,7 @@ extern char *vmname;
void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
void fbsdrun_set_capabilities(struct vmctx *ctx, int cpu);
-void fbsdrun_addcpu(struct vmctx *ctx, int cpu, uint64_t rip);
+void fbsdrun_addcpu(struct vmctx *ctx, int fromcpu, int newcpu, uint64_t rip);
int fbsdrun_muxed(void);
int fbsdrun_vmexit_on_hlt(void);
int fbsdrun_vmexit_on_pause(void);
Modified: stable/10/usr.sbin/bhyve/spinup_ap.c
==============================================================================
--- stable/10/usr.sbin/bhyve/spinup_ap.c Sat Jul 19 22:13:27 2014 (r268893)
+++ stable/10/usr.sbin/bhyve/spinup_ap.c Sat Jul 19 22:24:29 2014 (r268894)
@@ -98,7 +98,7 @@ spinup_ap(struct vmctx *ctx, int vcpu, i
spinup_ap_realmode(ctx, newcpu, &rip);
- fbsdrun_addcpu(ctx, newcpu, rip);
+ fbsdrun_addcpu(ctx, vcpu, newcpu, rip);
return (newcpu);
}
More information about the svn-src-stable-10
mailing list