Merge pull request torvalds#258 from liuyuan10/memfix

liuyuan10 · web-flow · commit 487de9a717f9 · 2016-11-03T13:46:10.000-07:00
Fix boot mem size and lkl_set_fd_limit
diff --git a/arch/lkl/include/asm/page.h b/arch/lkl/include/asm/page.h
@@ -5,7 +5,7 @@
 
 #ifndef __ASSEMBLY__
 void free_mem(void);
-void bootmem_init(int mem_size);
+void bootmem_init(unsigned long mem_size);
 #endif
 
 #include <asm-generic/page.h>
diff --git a/arch/lkl/mm/bootmem.c b/arch/lkl/mm/bootmem.c
@@ -7,9 +7,9 @@ static unsigned long _memory_start, mem_size;
 
 void *empty_zero_page;
 
-void __init bootmem_init(int mem_size)
+void __init bootmem_init(unsigned long mem_size)
 {
-	int bootmap_size;
+	unsigned long bootmap_size;
 
 	_memory_start = (unsigned long)lkl_ops->mem_alloc(mem_size);
 	memory_start = _memory_start;
diff --git a/tools/lkl/include/lkl.h b/tools/lkl/include/lkl.h
@@ -437,6 +437,12 @@ int lkl_if_del_ip(int ifindex, int af, void *addr, unsigned int netprefix_len);
  */
 int lkl_if_wait_ipv6_dad(int ifindex, void *addr);
 
+/**
+ * lkl_set_fd_limit - set the maximum number of file descriptors allowed
+ * @fd_limit - fd max limit
+ */
+int lkl_set_fd_limit(unsigned int fd_limit);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tools/lkl/lib/fs.c b/tools/lkl/lib/fs.c
@@ -363,3 +363,12 @@ int lkl_dirfd(struct lkl_dir *dir)
 {
 	return dir->fd;
 }
+
+int lkl_set_fd_limit(unsigned int fd_limit)
+{
+	struct lkl_rlimit rlim = {
+		.rlim_cur = fd_limit,
+		.rlim_max = fd_limit,
+	};
+	return lkl_sys_setrlimit(LKL_RLIMIT_NOFILE, &rlim);
+}
diff --git a/tools/lkl/lib/hijack/init.c b/tools/lkl/lib/hijack/init.c
@@ -323,7 +323,7 @@ hijack_init(void)
 	if (single_cpu_mode == 1)
 		PinToFirstCpu(&ori_cpu);
 
-	ret = lkl_start_kernel(&lkl_host_ops, 64 * 1024 * 1024, "");
+	ret = lkl_start_kernel(&lkl_host_ops, 64 * 1024 * 1024UL, "");
 	if (ret) {
 		fprintf(stderr, "can't start kernel: %s\n", lkl_strerror(ret));
 		return;
@@ -335,6 +335,11 @@ hijack_init(void)
 	if (single_cpu_mode)
 		PinToCpus(&ori_cpu);
 
+	ret = lkl_set_fd_limit(65535);
+	if (ret)
+		fprintf(stderr, "lkl_set_fd_limit failed: %s\n",
+			lkl_strerror(ret));
+
 	/* fillup FDs up to LKL_FD_OFFSET */
 	ret = lkl_sys_mknod("/dev_null", LKL_S_IFCHR | 0600, LKL_MKDEV(1, 3));
 	dev_null = lkl_sys_open("/dev_null", LKL_O_RDONLY, 0);

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ static unsigned long _memory_start, mem_size;`
`7`	`7`
`8`	`8`	`void *empty_zero_page;`
`9`	`9`
`10`		`-void __init bootmem_init(int mem_size)`
	`10`	`+void __init bootmem_init(unsigned long mem_size)`
`11`	`11`	`{`
`12`		`- int bootmap_size;`
	`12`	`+ unsigned long bootmap_size;`
`13`	`13`
`14`	`14`	`_memory_start = (unsigned long)lkl_ops->mem_alloc(mem_size);`
`15`	`15`	`memory_start = _memory_start;`
Original file line number	Diff line number	Diff line change
`@@ -363,3 +363,12 @@ int lkl_dirfd(struct lkl_dir *dir)`
`363`	`363`	`{`
`364`	`364`	`return dir->fd;`
`365`	`365`	`}`
	`366`	`+`
	`367`	`+int lkl_set_fd_limit(unsigned int fd_limit)`
	`368`	`+{`
	`369`	`+ struct lkl_rlimit rlim = {`
	`370`	`+ .rlim_cur = fd_limit,`
	`371`	`+ .rlim_max = fd_limit,`
	`372`	`+ };`
	`373`	`+ return lkl_sys_setrlimit(LKL_RLIMIT_NOFILE, &rlim);`
	`374`	`+}`