From b39fec11044e6f24afd828f213bb4cd2036711ae Mon Sep 17 00:00:00 2001 From: Tomoki Shirasawa Date: Wed, 26 Jul 2017 13:14:30 +0900 Subject: [PATCH] uti: remove unused functions --- executer/include/uprotocol.h | 5 +--- executer/kernel/mcctrl/control.c | 45 ++------------------------------ executer/kernel/mcctrl/driver.c | 2 -- executer/user/mcexec.c | 23 +++------------- 4 files changed, 7 insertions(+), 68 deletions(-) diff --git a/executer/include/uprotocol.h b/executer/include/uprotocol.h index 7b985f5b..434bb63b 100644 --- a/executer/include/uprotocol.h +++ b/executer/include/uprotocol.h @@ -63,9 +63,6 @@ #define MCEXEC_UP_GET_NUM_POOL_THREADS 0x30a02926 #define MCEXEC_UP_UTI_ATTR 0x30a02927 -#define MCEXEC_UP_COPY_FROM_MCK 0x30a03000 -#define MCEXEC_UP_COPY_TO_MCK 0x30a03001 - #define MCEXEC_UP_DEBUG_LOG 0x40000000 #define MCEXEC_UP_TRANSFER_TO_REMOTE 0 @@ -311,7 +308,7 @@ struct kuti_attr { }; struct uti_attr_desc { - struct kuti_attr *attr; + unsigned long phys_attr; }; #endif diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 70e2337c..325c9f37 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -2399,7 +2399,6 @@ retry: if (retval != minrr) goto retry; -printk("sel cpu=%d rr=%d\n", mincpu, uti_rr[mincpu]); for_each_cpu(i, cpumask) { if (i != mincpu) { cpumask_clear_cpu(i, cpumask); @@ -2432,13 +2431,8 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg) } if (copy_from_user(&desc, arg, sizeof desc)) return -EFAULT; - if (!(kattr = kmalloc(sizeof(struct kuti_attr), GFP_KERNEL))) - return -ENOMEM; - if (copy_from_user(kattr, (struct kuti_attr __user *)desc.attr, - sizeof(struct kuti_attr))) { - kfree(kattr); - return -EFAULT; - } + + kattr = phys_to_virt(desc.phys_attr); if (((kattr->attr.flags & UTI_FLAG_SAME_L1) && (kattr->attr.flags & UTI_FLAG_DIFFERENT_L1)) || @@ -2448,12 +2442,10 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg) (kattr->attr.flags & UTI_FLAG_DIFFERENT_L3)) || ((kattr->attr.flags & UTI_FLAG_SAME_NUMA_DOMAIN) && (kattr->attr.flags & UTI_FLAG_DIFFERENT_NUMA_DOMAIN))) { - kfree(kattr); return -EINVAL; } if (!(cpuset = kmalloc(mask_size * 2, GFP_KERNEL))) { - kfree(kattr); return -ENOMEM; } wkmask = (cpumask_t *)(((char *)cpuset) + mask_size); @@ -2586,37 +2578,10 @@ mcexec_uti_attr(ihk_os_t os, struct uti_attr_desc __user *arg) setaffinity(0, cpuset); } - kfree(kattr); kfree(cpuset); return rc; } -long -mcexec_copy_from_mck(ihk_os_t os, unsigned long *arg) -{ - void __user *to = (void *)arg[0]; - void *from = phys_to_virt(arg[1]); - long len = arg[2]; - - if (copy_to_user(to, from, len)) { - return -EFAULT; - } - return 0; -} - -long -mcexec_copy_to_mck(ihk_os_t os, unsigned long *arg) -{ - void *to = phys_to_virt(arg[0]); - void __user *from = (void *)arg[1]; - long len = arg[2]; - - if (copy_from_user(to, from, len)) { - return -EFAULT; - } - return 0; -} - long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg, struct file *file) { @@ -2710,12 +2675,6 @@ long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg, case MCEXEC_UP_UTI_ATTR: return mcexec_uti_attr(os, (struct uti_attr_desc __user *)arg); - case MCEXEC_UP_COPY_FROM_MCK: - return mcexec_copy_from_mck(os, (unsigned long *)arg); - - case MCEXEC_UP_COPY_TO_MCK: - return mcexec_copy_to_mck(os, (unsigned long *)arg); - case MCEXEC_UP_DEBUG_LOG: return mcexec_debug_log(os, arg); diff --git a/executer/kernel/mcctrl/driver.c b/executer/kernel/mcctrl/driver.c index 21ada913..15b2c4c9 100644 --- a/executer/kernel/mcctrl/driver.c +++ b/executer/kernel/mcctrl/driver.c @@ -90,8 +90,6 @@ static struct ihk_os_user_call_handler mcctrl_uchs[] = { { .request = MCEXEC_UP_GET_NUM_POOL_THREADS, .func = mcctrl_ioctl }, { .request = MCEXEC_UP_UTI_ATTR, .func = mcctrl_ioctl }, { .request = MCEXEC_UP_DEBUG_LOG, .func = mcctrl_ioctl }, - { .request = MCEXEC_UP_COPY_FROM_MCK, .func = mcctrl_ioctl }, - { .request = MCEXEC_UP_COPY_TO_MCK, .func = mcctrl_ioctl }, { .request = IHK_OS_AUX_PERF_NUM, .func = mcctrl_ioctl }, { .request = IHK_OS_AUX_PERF_SET, .func = mcctrl_ioctl }, { .request = IHK_OS_AUX_PERF_GET, .func = mcctrl_ioctl }, diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c index 1de09df8..b447b530 100644 --- a/executer/user/mcexec.c +++ b/executer/user/mcexec.c @@ -2552,24 +2552,6 @@ create_tracer(void *wp, int mck_tid, unsigned long key) exit(0); } -static void -util_thread_setaffinity(unsigned long pattr) -{ - struct kuti_attr kattr; - unsigned long args[3]; - struct uti_attr_desc desc; - - args[0] = (unsigned long)&kattr; - args[1] = pattr; - args[2] = sizeof kattr; - if (ioctl(fd, MCEXEC_UP_COPY_FROM_MCK, args) == -1) { - return; - } - - desc.attr = &kattr; - ioctl(fd, MCEXEC_UP_UTI_ATTR, &desc); -} - static long util_thread(unsigned long uctx_pa, int remote_tid, unsigned long pattr) { @@ -2607,7 +2589,10 @@ util_thread(unsigned long uctx_pa, int remote_tid, unsigned long pattr) } if (pattr) { - util_thread_setaffinity(pattr); + struct uti_attr_desc desc; + + desc.phys_attr = pattr; + ioctl(fd, MCEXEC_UP_UTI_ATTR, &desc); } if ((rc = switch_ctx(fd, MCEXEC_UP_UTIL_THREAD2, param, lctx, rctx))