[PATCH 0/2] Build libxc on rump kernel

[PATCH 0/2] Build libxc on rump kernel

[Wei Liu]

I have upstreamed a privcmd driver for rump kernel. That driver has the same
semantics as the NetBSD one so we can just use xc_netbsd for rump kernel.

Wei.

Wei Liu (2):
  NetBSDRump: provide evtchn.h and privcmd.h
  libxc: use xc_netbsd.c for rump kernel

 tools/include/xen-sys/NetBSDRump/evtchn.h  | 86 ++++++++++++++++++++++++++++++
 tools/include/xen-sys/NetBSDRump/privcmd.h | 81 ++++++++++++++++++++++++++--
 tools/libxc/Makefile                       |  1 +
 3 files changed, 165 insertions(+), 3 deletions(-)
 create mode 100644 tools/include/xen-sys/NetBSDRump/evtchn.h

-- 
1.9.1

[PATCH 1/2] NetBSDRump: provide evtchn.h and privcmd.h

[Wei Liu]

Xen's build system has a target for rump kernel called NetBSDRump. We
want to build libxc against rump kernel, so we need to copy NetBSD's
evtchn.h and privcmd.h to NetBSDRump. These copies is not very likely to
diverge from NetBSD's copies, but we don't preclude such possibility.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/include/xen-sys/NetBSDRump/evtchn.h  | 86 ++++++++++++++++++++++++++++++
 tools/include/xen-sys/NetBSDRump/privcmd.h | 81 ++++++++++++++++++++++++++--
 2 files changed, 164 insertions(+), 3 deletions(-)
 create mode 100644 tools/include/xen-sys/NetBSDRump/evtchn.h

diff --git a/tools/include/xen-sys/NetBSDRump/evtchn.h b/tools/include/xen-sys/NetBSDRump/evtchn.h
new file mode 100644
index 0000000..2d8a1f9
--- /dev/null
+++ b/tools/include/xen-sys/NetBSDRump/evtchn.h
@@ -0,0 +1,86 @@
+/* $NetBSD: evtchn.h,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ */
+/******************************************************************************
+ * evtchn.h
+ * 
+ * Interface to /dev/xen/evtchn.
+ * 
+ * Copyright (c) 2003-2005, K A Fraser
+ * 
+ * This file may be distributed separately from the Linux kernel, or
+ * incorporated into other software packages, subject to the following license:
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef __NetBSD_EVTCHN_H__
+#define __NetBSD_EVTCHN_H__
+
+/*
+ * Bind a fresh port to VIRQ @virq.
+ */
+#define IOCTL_EVTCHN_BIND_VIRQ				\
+	_IOWR('E', 4, struct ioctl_evtchn_bind_virq)
+struct ioctl_evtchn_bind_virq {
+	unsigned int virq;
+	unsigned int port;
+};
+
+/*
+ * Bind a fresh port to remote <@remote_domain, @remote_port>.
+ */
+#define IOCTL_EVTCHN_BIND_INTERDOMAIN			\
+	_IOWR('E', 5, struct ioctl_evtchn_bind_interdomain)
+struct ioctl_evtchn_bind_interdomain {
+	unsigned int remote_domain, remote_port;
+	unsigned int port;
+};
+
+/*
+ * Allocate a fresh port for binding to @remote_domain.
+ */
+#define IOCTL_EVTCHN_BIND_UNBOUND_PORT			\
+	_IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port)
+struct ioctl_evtchn_bind_unbound_port {
+	unsigned int remote_domain;
+	unsigned int port;
+};
+
+/*
+ * Unbind previously allocated @port.
+ */
+#define IOCTL_EVTCHN_UNBIND				\
+	_IOW('E', 7, struct ioctl_evtchn_unbind)
+struct ioctl_evtchn_unbind {
+	unsigned int port;
+};
+
+/*
+ * Send event to previously allocated @port.
+ */
+#define IOCTL_EVTCHN_NOTIFY				\
+	_IOW('E', 8, struct ioctl_evtchn_notify)
+struct ioctl_evtchn_notify {
+	unsigned int port;
+};
+
+/* Clear and reinitialise the event buffer. Clear error condition. */
+#define IOCTL_EVTCHN_RESET				\
+	_IO('E', 9)
+
+#endif /* __NetBSD_EVTCHN_H__ */
diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h
index efdcae9..1296b30 100644
--- a/tools/include/xen-sys/NetBSDRump/privcmd.h
+++ b/tools/include/xen-sys/NetBSDRump/privcmd.h
@@ -1,6 +1,36 @@
+/*	NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $	*/
 
-#ifndef __NetBSDRump_PRIVCMD_H__
-#define __NetBSDRump_PRIVCMD_H__
+/******************************************************************************
+ * privcmd.h
+ * 
+ * Copyright (c) 2003-2004, K A Fraser
+ * 
+ * This file may be distributed separately from the Linux kernel, or
+ * incorporated into other software packages, subject to the following license:
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef __NetBSD_PRIVCMD_H__
+#define __NetBSD_PRIVCMD_H__
+
+/* Interface to /proc/xen/privcmd */
 
 typedef struct privcmd_hypercall
 {
@@ -28,4 +58,49 @@ typedef struct privcmd_mmapbatch {
     unsigned long *arr; /* array of mfns - top nibble set on err */
 } privcmd_mmapbatch_t; 
 
-#endif
+typedef struct privcmd_blkmsg
+{
+    unsigned long op;
+    void         *buf;
+    int           buf_size;
+} privcmd_blkmsg_t;
+
+/*
+ * @cmd: IOCTL_PRIVCMD_HYPERCALL
+ * @arg: &privcmd_hypercall_t
+ * Return: Value returned from execution of the specified hypercall.
+ */
+#define IOCTL_PRIVCMD_HYPERCALL         \
+    _IOWR('P', 0, privcmd_hypercall_t)
+
+#if defined(_KERNEL)
+/* compat */
+#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN_OLD \
+    _IO('P', 1)
+#endif /* defined(_KERNEL) */
+    
+#define IOCTL_PRIVCMD_MMAP             \
+    _IOW('P', 2, privcmd_mmap_t)
+#define IOCTL_PRIVCMD_MMAPBATCH        \
+    _IOW('P', 3, privcmd_mmapbatch_t)
+#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
+    _IOR('P', 4, unsigned long)
+
+/*
+ * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN
+ * @arg: n/a
+ * Return: Port associated with domain-controller end of control event channel
+ *         for the initial domain.
+ */
+#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \
+    _IOR('P', 5, int)
+
+/* Interface to /dev/xenevt */
+/* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */
+#define EVTCHN_RESET  _IO('E', 1)
+/* EVTCHN_BIND: Bind to the specified event-channel port. */
+#define EVTCHN_BIND   _IOW('E', 2, unsigned long)
+/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */
+#define EVTCHN_UNBIND _IOW('E', 3, unsigned long)
+
+#endif /* __NetBSD_PRIVCMD_H__ */
-- 
1.9.1

[PATCH 2/2] libxc: use xc_netbsd.c for rump kernel

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 55782c8..153b79e 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -48,6 +48,7 @@ CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c xc_linux_osdep.c
 CTRL_SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c xc_freebsd_osdep.c
 CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c
 CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c
+CTRL_SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c
 CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c
 
 GUEST_SRCS-y :=
-- 
1.9.1

Re: [PATCH 1/2] NetBSDRump: provide evtchn.h and privcmd.h

[Roger Pau Monné]

El 24/06/15 a les 12.10, Wei Liu ha escrit:
  > +#define IOCTL_PRIVCMD_MMAP             \
> +    _IOW('P', 2, privcmd_mmap_t)
> +#define IOCTL_PRIVCMD_MMAPBATCH        \
> +    _IOW('P', 3, privcmd_mmapbatch_t)

FWIW you could have gotten away with just implementing
IOCTL_PRIVCMD_MMAPBATCH, this is what I did on FreeBSD.

Roger.

Re: [PATCH 1/2] NetBSDRump: provide evtchn.h and privcmd.h

[Wei Liu]

On Wed, Jun 24, 2015 at 12:22:46PM +0200, Roger Pau Monné wrote:
> El 24/06/15 a les 12.10, Wei Liu ha escrit:
>   > +#define IOCTL_PRIVCMD_MMAP             \
> > +    _IOW('P', 2, privcmd_mmap_t)
> > +#define IOCTL_PRIVCMD_MMAPBATCH        \
> > +    _IOW('P', 3, privcmd_mmapbatch_t)
> 
> FWIW you could have gotten away with just implementing
> IOCTL_PRIVCMD_MMAPBATCH, this is what I did on FreeBSD.
> 

I was too lazy to change libxc code so I implemented both in rump
kernel. It's just plumbing through some minios functions.

Wei.

> Roger.

Re: [PATCH 0/2] Build libxc on rump kernel

[Ian Campbell]

On Wed, 2015-06-24 at 11:10 +0100, Wei Liu wrote:
> I have upstreamed a privcmd driver for rump kernel. That driver has the same
> semantics as the NetBSD one so we can just use xc_netbsd for rump kernel.
> 
> Wei.
> 
> Wei Liu (2):
>   NetBSDRump: provide evtchn.h and privcmd.h
>   libxc: use xc_netbsd.c for rump kernel

Acked + applied. At some point I may need to pick your brains regarding
the refactoring I'm doing to all this stuff..

> 
>  tools/include/xen-sys/NetBSDRump/evtchn.h  | 86 ++++++++++++++++++++++++++++++
>  tools/include/xen-sys/NetBSDRump/privcmd.h | 81 ++++++++++++++++++++++++++--
>  tools/libxc/Makefile                       |  1 +
>  3 files changed, 165 insertions(+), 3 deletions(-)
>  create mode 100644 tools/include/xen-sys/NetBSDRump/evtchn.h
>