mcctrl: add MCEXEC_UP_SYS_MOUNT, MCEXEC_UP_SYS_UNSHARE

executer/kernel/mcctrl/config.h.in

@@ -0,0 +1,25 @@
+/* executer/kernel/mcctrl/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to address of kernel symbol sys_mount, or 0 if exported */
+#undef MCCTRL_KSYM_sys_mount
+
+/* Define to address of kernel symbol sys_unshare, or 0 if exported */
+#undef MCCTRL_KSYM_sys_unshare
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION

executer/kernel/mcctrl/control.c

@@ -36,6 +36,7 @@
 #include <asm/delay.h>
 #include <asm/msr.h>
 #include <asm/io.h>
+#include "config.h"
 #include "mcctrl.h"
 
 //#define DEBUG
@@ -46,6 +47,28 @@
 #define dprintk(...)
 #endif
 
+#ifdef MCCTRL_KSYM_sys_unshare
+#if MCCTRL_KSYM_sys_unshare
+typedef int (*int_star_fn_ulong_t)(unsigned long);
+int (*mcctrl_sys_unshare)(unsigned long unshare_flags) =
+        (int_star_fn_ulong_t)
+        MCCTRL_KSYM_sys_unshare;
+#else // exported
+int (*mcctrl_sys_unshare)(unsigned long unshare_flags) = NULL;
+#endif
+#endif
+
+#ifdef MCCTRL_KSYM_sys_mount
+#if MCCTRL_KSYM_sys_mount
+typedef int (*int_star_fn_char_char_char_ulong_void_t)(char *, char *, char *, unsigned long, void *);
+int (*mcctrl_sys_mount)(char *dev_name,char *dir_name, char *type, unsigned long flags, void *data) =
+        (int_star_fn_char_char_char_ulong_void_t)
+        MCCTRL_KSYM_sys_mount;
+#else // exported
+int (*mcctrl_sys_mount)(char *dev_name,char *dir_name, char *type, unsigned long flags, void *data) = NULL;
+#endif
+#endif
+
 //static DECLARE_WAIT_QUEUE_HEAD(wq_prepare);
 //extern struct mcctrl_channel *channels;
 int mcctrl_ikc_set_recv_cpu(ihk_os_t os, int cpu);
@@ -1011,6 +1034,67 @@ long mcexec_strncpy_from_user(ihk_os_t os, struct strncpy_from_user_desc * __use
 	return 0;
 }
 
+long mcexec_sys_mount(struct sys_mount_desc *__user arg)
+{
+	struct sys_mount_desc desc;
+	struct cred *promoted;
+	const struct cred *original;
+	int ret;
+
+	if (copy_from_user(&desc, arg, sizeof(desc))) {
+		return -EFAULT;
+	}
+
+	promoted = prepare_creds();
+	if (!promoted) {
+		return -ENOMEM;
+	}
+	cap_raise(promoted->cap_effective, CAP_SYS_ADMIN);
+	original = override_creds(promoted);
+
+#if MCCTRL_KSYM_sys_mount
+	ret = mcctrl_sys_mount(desc.dev_name, desc.dir_name, desc.type,
+		desc.flags, desc.data);
+#else
+	ret = -EFAULT;
+#endif
+
+	revert_creds(original);
+	put_cred(promoted);
+
+	return ret;
+}
+
+long mcexec_sys_unshare(struct sys_unshare_desc *__user arg)
+{
+	struct sys_unshare_desc desc;
+	struct cred *promoted;
+	const struct cred *original;
+	int ret;
+
+	if (copy_from_user(&desc, arg, sizeof(desc))) {
+		return -EFAULT;
+	}
+
+	promoted = prepare_creds();
+	if (!promoted) {
+		return -ENOMEM;
+	}
+	cap_raise(promoted->cap_effective, CAP_SYS_ADMIN);
+	original = override_creds(promoted);
+
+#if MCCTRL_KSYM_sys_unshare
+	ret = mcctrl_sys_unshare(desc.unshare_flags);
+#else
+	ret = -EFAULT;
+#endif
+
+	revert_creds(original);
+	put_cred(promoted);
+
+	return ret;
+}
+
 long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
                       struct file *file)
 {
@@ -1065,6 +1149,12 @@ long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
 	case MCEXEC_UP_GET_CREDV:
 		return mcexec_getcredv((int *)arg);
 
+	case MCEXEC_UP_SYS_MOUNT:
+		return mcexec_sys_mount((struct sys_mount_desc *)arg);
+
+	case MCEXEC_UP_SYS_UNSHARE:
+		return mcexec_sys_unshare((struct sys_unshare_desc *)arg);
+
 	case MCEXEC_UP_DEBUG_LOG:
 		return mcexec_debug_log(os, arg);
 	}

executer/kernel/mcctrl/driver.c

@@ -68,6 +68,8 @@ static struct ihk_os_user_call_handler mcctrl_uchs[] = {
 	{ .request = MCEXEC_UP_CLOSE_EXEC, .func = mcctrl_ioctl },
 	{ .request = MCEXEC_UP_GET_CRED, .func = mcctrl_ioctl },
 	{ .request = MCEXEC_UP_GET_CREDV, .func = mcctrl_ioctl },
+	{ .request = MCEXEC_UP_SYS_MOUNT, .func = mcctrl_ioctl },
+	{ .request = MCEXEC_UP_SYS_UNSHARE, .func = mcctrl_ioctl },
 	{ .request = MCEXEC_UP_DEBUG_LOG, .func = mcctrl_ioctl },
 };