lkl: add rumpun unikernel support for LKL

thehajime · thehajime · commit badf2bd2b998 · 2017-02-13T08:53:25.000+09:00
This commit offers an integration with rumprun unikernel. It is only tested with qemu-system-x86_64 but it potentially works fine with x86 baremetal machines as well as xen hypervior. An initial PCI device support is also implemented by relying on exposed virtual devices from hyperviros: virtio-net device is tested for the moment. The rumprun repository to support lkl build is not upstreamed yet - you can try with the following repository before it will be in. https://github.com/libos-nuse/rumprun Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
diff --git a/arch/lkl/Kconfig b/arch/lkl/Kconfig
@@ -61,6 +61,12 @@ config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
 
+config PCI
+	bool "PCI support"
+	select NO_GENERIC_PCI_IOPORT_MAP
+	select GENERIC_PCI_IOMAP
+	default y
+
 source init/Kconfig
 
 source net/Kconfig
diff --git a/arch/lkl/Makefile b/arch/lkl/Makefile
@@ -62,6 +62,7 @@ endif
 
 core-y += arch/lkl/kernel/
 core-y += arch/lkl/mm/
+core-y += arch/lkl/drivers/
 
 all: lkl.o
 
diff --git a/arch/lkl/defconfig b/arch/lkl/defconfig
@@ -94,3 +94,7 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_PCI=y
+CONFIG_NET_CORE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_GENERIC_IOMAP=y
diff --git a/arch/lkl/drivers/Makefile b/arch/lkl/drivers/Makefile
@@ -0,0 +1,13 @@
+
+obj-y = rumpdev_pci.o
+
+# need to build with
+librumpdev_linux_pci.a: ${RUMP_BMK_PCI_HYPERCALLS}
+	rm -f $@
+	$(AR) rc $@ ${RUMP_BMK_PCI_HYPERCALLS}
+
+install: librumpdev_linux_pci.a
+	install -D librumpdev_linux_pci.a ${DESTDIR}/lib/
+
+
+.PHONY: ${RUMP_BMK_PCI_HYPERCALLS}
diff --git a/arch/lkl/drivers/pci_user.h b/arch/lkl/drivers/pci_user.h
@@ -0,0 +1,43 @@
+/* Reused from src-netbsd/sys/rump/dev/lib/libpci/pci_user.h */
+/*
+ * Possible userfeature macro flags:
+ *
+ *   RUMPCOMP_USERFEATURE_PCI_DMAFREE:
+ *	Support free'ing DMA memory.  If not, panic() when free() is called.
+ *
+ *   RUMPCOMP_USERFEATURE_PCI_IOSPACE
+ *	Support for PCI I/O space.  If yes, rumpcomp_pci_iospace_init()
+ *	must be provided.
+ */
+
+
+void *rumpcomp_pci_map(unsigned long addr, unsigned long len);
+int rumpcomp_pci_confread(unsigned int bus, unsigned int dev,
+			  unsigned int fun, int reg, unsigned int *value);
+int rumpcomp_pci_confwrite(unsigned int bus, unsigned int dev,
+			   unsigned int fun, int reg, unsigned int value);
+int rumpcomp_pci_irq_map(unsigned int bus, unsigned int device,
+			 unsigned int fun, int intrline, unsigned int cookie);
+void *rumpcomp_pci_irq_establish(unsigned int cookie,
+				 int (*handler)(void *), void *data);
+
+/* XXX: needs work: support boundary-restricted allocations */
+int rumpcomp_pci_dmalloc(size_t size, size_t align,
+			 unsigned long *pap, unsigned long *vap);
+#ifdef RUMPCOMP_USERFEATURE_PCI_DMAFREE
+void rumpcomp_pci_dmafree(unsigned long mem, size_t size);
+#endif
+
+struct rumpcomp_pci_dmaseg {
+	unsigned long ds_pa;
+	unsigned long ds_len;
+	unsigned long ds_vacookie;
+};
+int rumpcomp_pci_dmamem_map(struct rumpcomp_pci_dmaseg *dss, size_t nseg,
+			    size_t totlen, void **vap);
+
+unsigned long rumpcomp_pci_virt_to_mach(void *virt);
+
+#ifdef RUMPCOMP_USERFEATURE_PCI_IOSPACE
+int rumpcomp_pci_iospace_init(void);
+#endif
diff --git a/arch/lkl/drivers/rumpdev_pci.c b/arch/lkl/drivers/rumpdev_pci.c
@@ -0,0 +1,263 @@
+/*
+ * rumprun PCI access (reused from src-netbsd/.../rumpdev_pci.c)
+ */
+
+/*
+ * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/io.h>
+#include <asm/host_ops.h>
+
+#include "pci_user.h"
+
+struct rump_pci_sysdata {
+	int domain; /* PCI domain */
+};
+
+/* stubs: should not called */
+int __weak rumpcomp_pci_confread(unsigned int bus, unsigned int dev,
+				 unsigned int fun,
+				 int reg, unsigned int *value)
+{
+	return 0;
+}
+
+int __weak rumpcomp_pci_confwrite(unsigned int bus, unsigned int dev,
+				  unsigned int fun,
+				  int reg, unsigned int value)
+{
+	return 0;
+}
+
+void * __weak rumpcomp_pci_map(unsigned long addr, unsigned long len)
+{
+	return NULL;
+}
+
+int __weak rumpcomp_pci_irq_map(unsigned int bus, unsigned int device,
+				unsigned int fun,
+				int intrline, unsigned int cookie)
+{
+	return 0;
+}
+
+void * __weak rumpcomp_pci_irq_establish(unsigned int cookie,
+					 int (*handler)(void *), void *data)
+{
+	return NULL;
+}
+
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+			       unsigned long port, unsigned int nr)
+{
+	/* XXX: no care at the moment */
+	return rumpcomp_pci_map(port, nr);
+}
+
+/* from arch/x86/pci/common.c  */
+void pcibios_fixup_bus(struct pci_bus *b)
+{
+	pci_read_bridge_bases(b);
+}
+
+/* from arch/x86/pci/i386.c */
+resource_size_t
+pcibios_align_resource(void *data, const struct resource *res,
+		       resource_size_t size, resource_size_t align)
+{
+	return 0;
+}
+
+/* from drivers/pci/access.c
+ *
+ * @bus: PCI bus to scan
+ * @devfn: slot number to scan (must have zero function.)
+ */
+void *rump_pci_map_bus(struct pci_bus *bus, unsigned int devfn, int where)
+{
+	unsigned long addr;
+
+	addr =  (1 << 31) | (bus->number << 16) | (PCI_SLOT(devfn) << 11) |
+		(PCI_FUNC(devfn) << 8) | (where & 0xfc);
+
+	/* FIXME: length? */
+	return rumpcomp_pci_map(addr, 0);
+}
+
+int rump_pci_generic_read(struct pci_bus *bus, unsigned int devfn,
+			  int where, int size, u32 *val)
+{
+
+	rumpcomp_pci_confread(bus->number, PCI_SLOT(devfn),
+			      PCI_FUNC(devfn), where, val);
+	if (size <= 2)
+		*val = (*val >> (8 * (where & 3))) & ((1 << (size * 8)) - 1);
+
+	return PCIBIOS_SUCCESSFUL;
+}
+
+int rump_pci_generic_write(struct pci_bus *bus, unsigned int devfn,
+			    int where, int size, u32 val)
+{
+	u32 mask, tmp;
+
+	if (size == 4) {
+		rumpcomp_pci_confwrite(bus->number, PCI_SLOT(devfn),
+				       PCI_FUNC(devfn), where, val);
+		return PCIBIOS_SUCCESSFUL;
+	}
+
+	mask = ~(((1 << (size * 8)) - 1) << ((where & 0x3) * 8));
+
+	/* This brings the way much overhead though I picked this
+	 * code from access.c.. maybe should come up with single
+	 * write method to avoid that.
+	 */
+
+	rumpcomp_pci_confread(bus->number, PCI_SLOT(devfn),
+			      PCI_FUNC(devfn), where, &tmp);
+	tmp &= mask;
+	tmp |= val << ((where & 0x3) * 8);
+
+	rumpcomp_pci_confwrite(bus->number, PCI_SLOT(devfn),
+			       PCI_FUNC(devfn), where, tmp);
+
+	return PCIBIOS_SUCCESSFUL;
+}
+
+
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciidereg.h>
+#include <dev/pci/pciidevar.h>
+
+void *
+pciide_machdep_compat_intr_establish(device_t dev,
+	const struct pci_attach_args *pa, int chan,
+	int (*func)(void *), void *arg)
+{
+	pci_intr_handle_t ih;
+	struct pci_attach_args mypa = *pa;
+
+	mypa.pa_intrline = PCIIDE_COMPAT_IRQ(chan);
+	if (pci_intr_map(&mypa, &ih) != 0)
+		return NULL;
+	return rumpcomp_pci_irq_establish(ih, func, arg);
+}
+
+__strong_alias(pciide_machdep_compat_intr_disestablish, pci_intr_disestablish);
+#endif /* __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH */
+
+
+/* from drivers/pci/xen-pcifront.c */
+static int pci_lib_claim_resource(struct pci_dev *dev, void *data)
+{
+	int i;
+	struct resource *r;
+
+	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+		r = &dev->resource[i];
+
+		if (!r->parent && r->start && r->flags) {
+			dev_info(&dev->dev, "claiming resource %s/%d\n",
+				pci_name(dev), i);
+			if (pci_claim_resource(dev, i)) {
+				dev_err(&dev->dev,
+					"Could not claim resource %s/%d!",
+					pci_name(dev), i);
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int rump_trigger_irq(void *arg)
+{
+	struct irq_data *data = arg;
+
+	lkl_trigger_irq(data->irq);
+	return 0;
+}
+
+int rump_pci_irq_request(struct irq_data *data)
+{
+	int ret, int_irq;
+	struct irq_desc *desc = irq_to_desc(data->irq);
+	const char *name = desc->name ? desc->name : "null"; /* XXX */
+
+	static int intr[5] = {9, 10, 11, 14, 15};
+	static int intnum;
+
+	/* setup IRQ */
+	int_irq = lkl_get_free_irq(name);
+
+	ret = rumpcomp_pci_irq_map(0, 0, 0, intr[intnum++], int_irq);
+	rumpcomp_pci_irq_establish(int_irq, rump_trigger_irq, data);
+
+	return 0;
+}
+
+void rump_pci_irq_release(struct irq_data *data)
+{
+	/* XXX: NOP */
+}
+
+struct pci_ops rump_pci_root_ops = {
+	.map_bus = rump_pci_map_bus,
+	.read = rump_pci_generic_read,
+	.write = rump_pci_generic_write,
+};
+
+
+static int __init rump_pci_init(void)
+{
+	struct pci_bus *bus;
+	struct rump_pci_sysdata *sd;
+	int busnum = 0;
+
+	sd = kzalloc(sizeof(*sd), GFP_KERNEL);
+	if (!sd)
+		return -1;
+
+	pr_info("PCI: root bus %02x: using default resources\n", busnum);
+	bus = pci_scan_bus(busnum, &rump_pci_root_ops, sd);
+	if (!bus) {
+		kfree(sd);
+		return -1;
+	}
+	pci_walk_bus(bus, pci_lib_claim_resource, NULL);
+	pci_bus_add_devices(bus);
+
+	return 0;
+}
+subsys_initcall(rump_pci_init);
diff --git a/arch/lkl/include/asm/Kbuild b/arch/lkl/include/asm/Kbuild
@@ -13,7 +13,6 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += device.h
 generic-y += div64.h
-generic-y += dma.h
 generic-y += emergency-restart.h
 generic-y += errno.h
 generic-y += exec.h
@@ -39,7 +38,7 @@ generic-y += msgbuf.h
 generic-y += page.h
 generic-y += param.h
 generic-y += parport.h
-generic-y += pci.h
+generic-y += pci_iomap.h
 generic-y += percpu.h
 generic-y += pgalloc.h
 generic-y += poll.h
diff --git a/arch/lkl/include/asm/dma.h b/arch/lkl/include/asm/dma.h
@@ -0,0 +1,12 @@
+#ifndef _ASM_LKL_DMA_H
+#define _ASM_LKL_DMA_H
+
+#include <asm-generic/dma.h>
+
+#ifdef CONFIG_PCI
+extern int isa_dma_bridge_buggy;
+#else
+#define isa_dma_bridge_buggy	(0)
+#endif
+
+#endif /* _ASM_LKL_DMA_H */
diff --git a/arch/lkl/include/asm/pci.h b/arch/lkl/include/asm/pci.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_LKL_PCI_H
+#define _ASM_LKL_PCI_H
+
+#include <asm-generic/pci.h>
+
+# define pcibios_assign_all_busses()	0
+#define PCIBIOS_MIN_IO		0x1000
+#define PCIBIOS_MIN_MEM		0x10000000
+
+#endif /* _ASM_LKL_PCI_H */
diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
diff --git a/tools/lkl/lib/fs.c b/tools/lkl/lib/fs.c
diff --git a/tools/lkl/lib/iomem.c b/tools/lkl/lib/iomem.c
