consume latest hooklift goodies

Signed-off-by: António Meireles <antonio.meireles@reformi.st>

Author: AntonioMeireles

.gitignore

@@ -1,3 +1,4 @@
 cmd/xhyve/imgs/stable*
 cmd/xhyve/xhyve
 vendor
+xhyve

Makefile

@@ -5,6 +5,12 @@ build:
 
 clone-xhyve:
 	-git clone https://github.com/xhyve-xyz/xhyve.git vendor/xhyve
+	# cherry-picked from https://github.com/c4milo/xhyve/commit/53b63a8819f35a123fb67f2ce5dba21f34cf97b9
+	# "Makes user message less verbose when using autopty"
+	-cd vendor/xhyve; curl -Ls https://github.com/c4milo/xhyve/commit/53b63a8819f35a123fb67f2ce5dba21f34cf97b9.patch | patch -N -p1
+	# cherry-picked from https://github.com/mist64/xhyve/pull/81
+	# Fix non-deterministic delays when accessing a vcpu in "running" or "sleeping" state.
+	-cd vendor/xhyve; curl -Ls https://patch-diff.githubusercontent.com/raw/mist64/xhyve/pull/81.patch | patch -N -p1
 
 sync: clone-xhyve apply-patch
 	find . \( -name \*.orig -o -name \*.rej \) -delete

include/xhyve/uart_emul.h

@@ -39,4 +39,6 @@ struct uart_softc *uart_init(uart_intr_func_t intr_assert,
 int uart_legacy_alloc(int unit, int *ioaddr, int *irq);
 uint8_t uart_read(struct uart_softc *sc, int offset);
 void uart_write(struct uart_softc *sc, int offset, uint8_t value);
-int uart_set_backend(struct uart_softc *sc, const char *opt);
+int uart_set_backend(struct uart_softc *sc, const char *backend, const char *devname);
+
+extern void go_set_pty_name(char *name);

include/xhyve/vmm/vmm.h

@@ -62,12 +62,18 @@ struct vm_object;
 struct vm_guest_paging;
 struct pmap;
 
+struct vm_eventinfo {
+	void	*rptr;		/* rendezvous cookie */
+	int	*sptr;		/* suspend cookie */
+	int	*iptr;		/* reqidle cookie */
+};
+
 typedef int (*vmm_init_func_t)(void);
 typedef int (*vmm_cleanup_func_t)(void);
 typedef void *(*vmi_vm_init_func_t)(struct vm *vm);
 typedef int (*vmi_vcpu_init_func_t)(void *vmi, int vcpu);
 typedef int (*vmi_run_func_t)(void *vmi, int vcpu, register_t rip,
-	void *rendezvous_cookie, void *suspend_cookie);
+	struct vm_eventinfo *info);
 typedef void (*vmi_vm_cleanup_func_t)(void *vmi);
 typedef void (*vmi_vcpu_cleanup_func_t)(void *vmi, int vcpu);
 typedef int (*vmi_get_register_t)(void *vmi, int vcpu, int num,
@@ -145,6 +151,7 @@ int vm_activate_cpu(struct vm *vm, int vcpu);
 struct vm_exit *vm_exitinfo(struct vm *vm, int vcpuid);
 void vm_exit_suspended(struct vm *vm, int vcpuid, uint64_t rip);
 void vm_exit_rendezvous(struct vm *vm, int vcpuid, uint64_t rip);
+void vm_exit_reqidle(struct vm *vm, int vcpuid, uint64_t rip);
 
 /*
  * Rendezvous all vcpus specified in 'dest' and execute 'func(arg)'.
@@ -167,17 +174,21 @@ cpuset_t vm_active_cpus(struct vm *vm);
 cpuset_t vm_suspended_cpus(struct vm *vm);
 
 static __inline int
-vcpu_rendezvous_pending(void *rendezvous_cookie)
+vcpu_rendezvous_pending(struct vm_eventinfo *info)
 {
-
-	return (*(uintptr_t *)rendezvous_cookie != 0);
+	return (*((uintptr_t *)(info->rptr)) != 0);
 }
 
 static __inline int
-vcpu_suspended(void *suspend_cookie)
+vcpu_suspended(struct vm_eventinfo *info)
 {
+	return (*info->sptr);
+}
 
-	return (*(int *)suspend_cookie);
+static __inline int
+vcpu_reqidle(struct vm_eventinfo *info)
+{
+	return (*info->iptr);
 }
 
 enum vcpu_state {
@@ -256,7 +267,7 @@ struct vm_copyinfo {
 /*
  * Set up 'copyinfo[]' to copy to/from guest linear address space starting
  * at 'gla' and 'len' bytes long. The 'prot' should be set to PROT_READ for
- * a copyin or PROT_WRITE for a copyout. 
+ * a copyin or PROT_WRITE for a copyout.
  *
  * retval	is_fault	Intepretation
  *   0		   0		Success

include/xhyve/vmm/vmm_common.h

@@ -143,6 +143,7 @@ enum vm_exitcode {
 	VM_EXITCODE_INOUT,
 	VM_EXITCODE_VMX,
 	VM_EXITCODE_BOGUS,
+	VM_EXITCODE_REQIDLE,
 	VM_EXITCODE_RDMSR,
 	VM_EXITCODE_WRMSR,
 	VM_EXITCODE_HLT,

include/xhyve/vmm/vmm_ktr.h

@@ -41,32 +41,32 @@ struct vm;
 extern const char *vm_name(struct vm *vm);
 
 #define	VCPU_CTR0(vm, vcpuid, format)					\
-vmmtrace("vm %s[%d]: " format "\n", vm_name((vm)), (vcpuid))
+vmmtrace("vm %s[%d]: " format "\r\n", vm_name((vm)), (vcpuid))
 
 #define	VCPU_CTR1(vm, vcpuid, format, p1)				\
-vmmtrace("vm %s[%d]: " format "\n", vm_name((vm)), (vcpuid), (p1))
+vmmtrace("vm %s[%d]: " format "\r\n", vm_name((vm)), (vcpuid), (p1))
 
 #define	VCPU_CTR2(vm, vcpuid, format, p1, p2)				\
-vmmtrace("vm %s[%d]: " format "\n", vm_name((vm)), (vcpuid), (p1), (p2))
+vmmtrace("vm %s[%d]: " format "\r\n", vm_name((vm)), (vcpuid), (p1), (p2))
 
 #define	VCPU_CTR3(vm, vcpuid, format, p1, p2, p3)			\
-vmmtrace("vm %s[%d]: " format "\n", vm_name((vm)), (vcpuid), (p1), (p2), (p3))
+vmmtrace("vm %s[%d]: " format "\r\n", vm_name((vm)), (vcpuid), (p1), (p2), (p3))
 
 #define	VCPU_CTR4(vm, vcpuid, format, p1, p2, p3, p4)			\
-vmmtrace("vm %s[%d]: " format "\n", vm_name((vm)), (vcpuid),		\
+vmmtrace("vm %s[%d]: " format "\r\n", vm_name((vm)), (vcpuid),		\
     (p1), (p2), (p3), (p4))
 
 #define	VM_CTR0(vm, format)						\
-vmmtrace("vm %s: " format "\n", vm_name((vm)))
+vmmtrace("vm %s: " format "\r\n", vm_name((vm)))
 
 #define	VM_CTR1(vm, format, p1)						\
-vmmtrace("vm %s: " format "\n", vm_name((vm)), (p1))
+vmmtrace("vm %s: " format "\r\n", vm_name((vm)), (p1))
 
 #define	VM_CTR2(vm, format, p1, p2)					\
-vmmtrace("vm %s: " format "\n", vm_name((vm)), (p1), (p2))
+vmmtrace("vm %s: " format "\r\n", vm_name((vm)), (p1), (p2))
 
 #define	VM_CTR3(vm, format, p1, p2, p3)					\
-vmmtrace("vm %s: " format "\n", vm_name((vm)), (p1), (p2), (p3))
+vmmtrace("vm %s: " format "\r\n", vm_name((vm)), (p1), (p2), (p3))
 
 #define	VM_CTR4(vm, format, p1, p2, p3, p4)				\
-vmmtrace("vm %s: " format "\n", vm_name((vm)), (p1), (p2), (p3), (p4))
+vmmtrace("vm %s: " format "\r\n", vm_name((vm)), (p1), (p2), (p3), (p4))

include/xhyve/vmm/vmm_stat.h

@@ -101,7 +101,7 @@ vmm_stat_array_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
 {
 #ifdef XHYVE_CONFIG_STATS
 	uint64_t *stats;
-	
+
 	stats = vcpu_stats(vm, vcpu);
 
 	if (vst->index >= 0 && statidx < vst->nelems)
@@ -121,7 +121,7 @@ vmm_stat_array_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
 {
 #ifdef XHYVE_CONFIG_STATS
 	uint64_t *stats;
-	
+
 	stats = vcpu_stats(vm, vcpu);
 
 	if (vst->index >= 0 && statidx < vst->nelems)
@@ -134,7 +134,7 @@ vmm_stat_array_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
 	(void) val;
 #endif
 }
-		   
+
 static void __inline
 vmm_stat_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t x)
 {
@@ -183,3 +183,4 @@ VMM_STAT_DECLARE(VMEXIT_ASTPENDING);
 VMM_STAT_DECLARE(VMEXIT_USERSPACE);
 VMM_STAT_DECLARE(VMEXIT_RENDEZVOUS);
 VMM_STAT_DECLARE(VMEXIT_EXCEPTION);
+VMM_STAT_DECLARE(VMEXIT_REQIDLE);

pci_lpc.c

@@ -63,6 +63,7 @@ static struct pci_devinst *lpc_bridge;
 static struct lpc_uart_softc {
 	struct uart_softc *uart_softc;
 	const char *opts;
+	const char *name;
 	int	iobase;
 	int	irq;
 	int	enabled;
@@ -89,6 +90,7 @@ lpc_device_parse(const char *opts)
 		for (unit = 0; unit < LPC_UART_NUM; unit++) {
 			if (strcasecmp(lpcdev, lpc_uart_names[unit]) == 0) {
 				lpc_uart_softc[unit].opts = str;
+				lpc_uart_softc[unit].name = lpc_uart_names[unit];
 				error = 0;
 				goto done;
 			}
@@ -115,7 +117,7 @@ lpc_uart_intr_assert(void *arg)
 static void
 lpc_uart_intr_deassert(UNUSED void *arg)
 {
-	/* 
+	/*
 	 * The COM devices on the LPC bus generate edge triggered interrupts,
 	 * so nothing more to do here.
 	 */
@@ -158,32 +160,30 @@ lpc_init(void)
 {
 	struct lpc_uart_softc *sc;
 	struct inout_port iop;
-	const char *name;
 	int unit, error;
 
 	/* COM1 and COM2 */
 	for (unit = 0; unit < LPC_UART_NUM; unit++) {
 		sc = &lpc_uart_softc[unit];
-		name = lpc_uart_names[unit];
 
 		if (uart_legacy_alloc(unit, &sc->iobase, &sc->irq) != 0) {
 			fprintf(stderr, "Unable to allocate resources for "
-			    "LPC device %s\n", name);
+			    "LPC device %s\n", sc->name);
 			return (-1);
 		}
 		pci_irq_reserve(sc->irq);
 
 		sc->uart_softc = uart_init(lpc_uart_intr_assert,
 				    lpc_uart_intr_deassert, sc);
 
-		if (uart_set_backend(sc->uart_softc, sc->opts) != 0) {
+		if (uart_set_backend(sc->uart_softc, sc->opts, sc->name) != 0) {
 			fprintf(stderr, "Unable to initialize backend '%s' "
-			    "for LPC device %s\n", sc->opts, name);
+			    "for LPC device %s\n", sc->opts, sc->name);
 			return (-1);
 		}
 
 		bzero(&iop, sizeof(struct inout_port));
-		iop.name = name;
+		iop.name = sc->name;
 		iop.port = sc->iobase;
 		iop.size = UART_IO_BAR_SIZE;
 		iop.flags = IOPORT_F_INOUT;

pci_uart.c

@@ -86,6 +86,7 @@ static int
 pci_uart_init(struct pci_devinst *pi, char *opts)
 {
 	struct uart_softc *sc;
+	char *name;
 
 	pci_emul_alloc_bar(pi, 0, PCIBAR_IO, UART_IO_BAR_SIZE);
 	pci_lintr_request(pi);
@@ -98,12 +99,14 @@ pci_uart_init(struct pci_devinst *pi, char *opts)
 	sc = uart_init(pci_uart_intr_assert, pci_uart_intr_deassert, pi);
 	pi->pi_arg = sc;
 
-	if (uart_set_backend(sc, opts) != 0) {
-		fprintf(stderr, "Unable to initialize backend '%s' for "
-		    "pci uart at %d:%d\n", opts, pi->pi_slot, pi->pi_func);
+	asprintf(&name, "pci uart at %d:%d", pi->pi_slot, pi->pi_func);
+	if (uart_set_backend(sc, opts, name) != 0) {
+		fprintf(stderr, "Unable to initialize backend '%s' for %s\n", opts, name);
+		free(name);
 		return (-1);
 	}
 
+	free(name);
 	return (0);
 }
 

uart_emul.c

@@ -611,14 +611,14 @@ uart_init(uart_intr_func_t intr_assert, uart_intr_func_t intr_deassert,
 }
 
 static int
-uart_tty_backend(struct uart_softc *sc, const char *opts)
+uart_tty_backend(struct uart_softc *sc, const char *backend)
 {
 	int fd;
 	int retval;
 
 	retval = -1;
 
-	fd = open(opts, O_RDWR | O_NONBLOCK);
+	fd = open(backend, O_RDWR | O_NONBLOCK);
 	if (fd > 0 && isatty(fd)) {
 		sc->tty.fd = fd;
 		sc->tty.opened = true;
@@ -629,23 +629,23 @@ uart_tty_backend(struct uart_softc *sc, const char *opts)
 }
 
 int
-uart_set_backend(struct uart_softc *sc, const char *opts)
+uart_set_backend(struct uart_softc *sc, const char *backend, const char *devname)
 {
 	int retval;
 	int ptyfd;
 	char *ptyname;
 
 	retval = -1;
 
-	if (opts == NULL)
+	if (backend == NULL)
 		return (0);
 
-	if (strcmp("stdio", opts) == 0 && !uart_stdio) {
+	if (strcmp("stdio", backend) == 0 && !uart_stdio) {
 		sc->tty.fd = STDIN_FILENO;
 		sc->tty.opened = true;
 		uart_stdio = true;
 		retval = fcntl(sc->tty.fd, F_SETFL, O_NONBLOCK);
-	} else if (strcmp("autopty", opts) == 0) {
+	} else if (strcmp("autopty", backend) == 0) {
 		if ((ptyfd = open("/dev/ptmx", O_RDWR | O_NONBLOCK)) == -1) {
 			fprintf(stderr, "error opening /dev/ptmx char device");
 			return retval;
@@ -666,12 +666,16 @@ uart_set_backend(struct uart_softc *sc, const char *opts)
 			return retval;
 		}
 
-		fprintf(stdout, "Hook up a terminal emulator to %s in order to access your VM\n", ptyname);
+		fprintf(stdout, "%s connected to %s\n", devname, ptyname);
+
+		// Sends to Go land the device path name for the slave pseudo-terminal.
+		go_set_pty_name(ptyname);
+
 		sc->tty.fd = ptyfd;
 		sc->tty.name = ptyname;
 		sc->tty.opened = true;
 		retval = 0;
-	} else if (uart_tty_backend(sc, opts) == 0) {
+	} else if (uart_tty_backend(sc, backend) == 0) {
 		retval = 0;
 	}