Support iso images

binding.gyp

@@ -13,23 +13,23 @@
 				{
 					'action_name': "lkl_make",
 					'inputs': [
-						"src/linux/**"
+						"vendor/linux/**"
 					],
 					'outputs': [
-						"src/linux/tools/lkl/liblkl.a"
+						"vendor/linux/tools/lkl/liblkl.a"
 					],
-					'action': [ 'make', '-j4', '-C', 'src/linux/tools/lkl', 'static' ],
+					'action': [ 'make', '-j4', '-C', 'vendor/linux/tools/lkl', 'static' ],
 					'message': 'Compiling LKL kernel..'
 				}
 			],
 			"cflags_cc": [ '-fpermissive', '-Wno-pointer-arith' ],
 			"defines": [ "CONFIG_AUTO_LKL_POSIX_HOST" ],
 			"libraries": [
-				"../src/linux/tools/lkl/liblkl.a"
+				"../vendor/linux/tools/lkl/liblkl.a"
 			],
 			"include_dirs": [
 				"<!(node -e \"require('nan')\")",
-				"src/linux/tools/lkl/include"
+				"vendor/linux/tools/lkl/include"
 			]
 		}
 	]

defconfig.patch

@@ -0,0 +1,14 @@
+diff --git a/linux-tmp/arch/lkl/defconfig b/linux-tmp/arch/lkl/defconfig
+--- a/linux-tmp/arch/lkl/defconfig
++++ b/linux-tmp/arch/lkl/defconfig
+@@ -33,6 +33,10 @@ CONFIG_XFS_FS=y
+ CONFIG_XFS_POSIX_ACL=y
+ CONFIG_BTRFS_FS=y
+ CONFIG_BTRFS_FS_POSIX_ACL=y
++CONFIG_ISO9660_FS=y
++CONFIG_JOLIET=y
++CONFIG_ZISOFS=y
++CONFIG_UDF_FS=y
+ # CONFIG_FILE_LOCKING is not set
+ # CONFIG_DNOTIFY is not set
+ # CONFIG_INOTIFY_USER is not set

test/index.js

@@ -11,6 +11,8 @@ lkl.fs = Promise.promisifyAll(lkl.fs);
 const RAW_FS_PATH = path.join(__dirname, 'fixtures/test.ext4');
 const TMP_RAW_FS_PATH = path.join(__dirname, '.tmp-test.ext4');
 const DISK_PATH = path.join(__dirname, 'fixtures/disk.img');
+const ISO_FS_PATH = path.join(__dirname, 'fixtures/test.iso');
+const UDF_FS_PATH = path.join(__dirname, 'fixtures/test.udf');
 
 describe('node-lkl', function() {
 	it('should start the kernel', function() {
@@ -127,6 +129,57 @@ describe('node-lkl', function() {
 				})
 			});
 		});
+
+		describe('iso9660 image', function() {
+			before(function() {
+				this.disk = new lkl.disk.FileDisk(ISO_FS_PATH);
+			});
+
+			it('should mount', function() {
+				let diskId;
+				return lkl.diskAddAsync(this.disk)
+				.then(function(id) {
+					diskId = id;
+					return lkl.mountAsync(diskId, { readOnly: true, filesystem: 'iso9660'})
+				})
+				.then(lkl.umountAsync)
+				.then(function() {
+					return lkl.diskRemoveAsync(diskId);
+				});
+			});
+		});
+
+		describe('udf image', function() {
+			before(function() {
+				this.disk = new lkl.disk.FileDisk(UDF_FS_PATH);
+			});
+
+			it('should mount', function() {
+				let diskId;
+				let mpoint;
+				return lkl.diskAddAsync(this.disk)
+				.then(function(id) {
+					diskId = id;
+					return lkl.mountAsync(diskId, { readOnly: true, filesystem: 'udf'})
+				})
+				.then(function(mp) {
+					mpoint = mp;
+					return lkl.fs.readdirAsync(mp);
+				})
+				.then(function(files) {
+					assert.deepEqual(
+						files.sort(),
+						[ 'lost+found', '┬──┬◡ﾉ(° -°ﾉ)' ]
+					)
+				})
+				.then(function() {
+					return lkl.umountAsync(mpoint);
+				})
+				.then(function() {
+					return lkl.diskRemoveAsync(diskId);
+				});
+			});
+		});
 	});
 
 	describe('fs', function() {

vendor.sh

@@ -3,6 +3,7 @@
 set -o errexit
 
 git clone https://github.com/lkl/linux.git --depth=1 --branch master linux-tmp
+git apply defconfig.patch
 
 # Reset all access times to be in the past
 find linux-tmp | xargs touch -a -d 2015-01-01
@@ -32,5 +33,5 @@ git -C linux-tmp clean -ffxd
 rm -rf linux-tmp/.git
 
 # Vendor the code
-rm -rf src/linux
-mv linux-tmp src/linux
+rm -rf vendor/linux
+mv linux-tmp vendor/linux

src/linux/arch/lkl/Kconfig → vendor/linux/arch/lkl/Kconfig

@@ -4,11 +4,7 @@ config LKL
        select ARCH_THREAD_STACK_ALLOCATOR
        select RWSEM_GENERIC_SPINLOCK
        select GENERIC_ATOMIC64
-       select SEMAPHORE_SLEEPERS
-       select GENERIC_TIME
-       select GENERIC_FIND_NEXT_BIT
        select GENERIC_HWEIGHT
-       select GENERIC_HARDIRQS
        select FLATMEM
        select FLAT_NODE_MEM_MAP
        select GENERIC_CLOCKEVENTS
@@ -23,6 +19,10 @@ config LKL
        select 64BIT if OUTPUT_FORMAT = "elf64-x86-64-freebsd"
        select IP_PNP
        select IP_PNP_DHCP
+       select TCP_CONG_BBR
+       select HIGH_RES_TIMERS
+       select NET_SCHED
+       select NET_SCH_FQ
 
 config OUTPUTFORMAT
        string

src/linux/arch/lkl/Makefile → vendor/linux/arch/lkl/Makefile

@@ -22,8 +22,7 @@ endif
 
 LDFLAGS_vmlinux += -r
 LKL_ENTRY_POINTS := lkl_start_kernel lkl_sys_halt lkl_syscall lkl_trigger_irq \
-	lkl_get_free_irq lkl_put_irq lkl_create_syscall_thread \
-	lkl_stop_syscall_thread lkl_is_running
+	lkl_get_free_irq lkl_put_irq lkl_is_running
 
 core-y += arch/lkl/kernel/
 core-y += arch/lkl/mm/

src/linux/arch/lkl/defconfig → vendor/linux/arch/lkl/defconfig

@@ -33,6 +33,10 @@ CONFIG_XFS_FS=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
 # CONFIG_FILE_LOCKING is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set

src/linux/arch/lkl/include/uapi/asm/host_ops.h → vendor/linux/arch/lkl/include/uapi/asm/host_ops.h

@@ -135,12 +135,10 @@ struct lkl_host_operations {
  * The function returns only after the kernel is shutdown with lkl_sys_halt.
  *
  * @lkl_ops - pointer to host operations
- * @mem_size - how much memory to allocate to the Linux kernel
  * @cmd_line - format for command line string that is going to be used to
  * generate the Linux kernel command line
  */
 int lkl_start_kernel(struct lkl_host_operations *lkl_ops,
-		    unsigned long mem_size,
 		    const char *cmd_line, ...);
 
 /**

src/linux/arch/lkl/include/uapi/asm/syscalls.h → vendor/linux/arch/lkl/include/uapi/asm/syscalls.h

@@ -128,6 +128,7 @@ struct sockaddr {
 #include <linux/virtio_blk.h>
 #include <linux/virtio_net.h>
 #include <linux/virtio_ring.h>
+#include <linux/pkt_sched.h>
 
 struct user_msghdr {
 	void		__user *msg_name;	/* ptr to socket address structure */

src/linux/arch/lkl/kernel/irq.c → vendor/linux/arch/lkl/kernel/irq.c

@@ -52,15 +52,19 @@ static struct irq_info {
 
 static bool irqs_enabled;
 
+static struct pt_regs dummy;
+
 static void run_irq(int irq)
 {
 	unsigned long flags;
+	struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)&dummy);
 
 	/* interrupt handlers need to run with interrupts disabled */
 	local_irq_save(flags);
 	irq_enter();
 	generic_handle_irq(irq);
 	irq_exit();
+	set_irq_regs(old_regs);
 	local_irq_restore(flags);
 }
 

src/linux/arch/lkl/kernel/setup.c → vendor/linux/arch/lkl/kernel/setup.c

@@ -18,18 +18,26 @@ static char cmd_line[COMMAND_LINE_SIZE];
 static void *init_sem;
 static int is_running;
 void (*pm_power_off)(void) = NULL;
-static unsigned long mem_size;
+static unsigned long mem_size = 64 * 1024 * 1024;
 
 long lkl_panic_blink(int state)
 {
 	lkl_ops->panic();
 	return 0;
 }
 
+static int __init setup_mem_size(char *str)
+{
+	mem_size = memparse(str, NULL);
+	return 0;
+}
+early_param("mem", setup_mem_size);
+
 void __init setup_arch(char **cl)
 {
 	*cl = cmd_line;
 	panic_blink = lkl_panic_blink;
+	parse_early_param();
 	bootmem_init(mem_size);
 }
 
@@ -41,14 +49,12 @@ static void __init lkl_run_kernel(void *arg)
 }
 
 int __init lkl_start_kernel(struct lkl_host_operations *ops,
-			unsigned long _mem_size,
 			const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
 
 	lkl_ops = ops;
-	mem_size = _mem_size;
 
 	va_start(ap, fmt);
 	ret = vsnprintf(boot_command_line, COMMAND_LINE_SIZE, fmt, ap);