gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uti: rename x86-specific 'fs' to 'tls' + arm implem

Browse Source 
Note: the original fujitsu implementation didn't rename the various
save_fs function/desc to save_tls for some reason, might as well go all
the way though...

Change-Id: Ic362c15c8b320c4d258d2ead8c5fd4eafd9d0ae9
Fujitsu: POSTK_DEBUG_ARCH_DEP_91
This commit is contained in:
Shiratori, Takehiro
2019-03-12 14:35:27 +09:00
committed by Masamichi Takagi
parent 8356ef6c96
commit c32edff2bb
8 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
executer/kernel/mcctrl/control.c
View File

@ -2434,10 +2434,10 @@ long mcctrl_getrusage(ihk_os_t ihk_os, struct mcctrl_ioctl_getrusage_desc *__use
extern void *get_user_sp(void);
extern void set_user_sp(unsigned long);
extern void restore_fs(unsigned long fs);
extern void save_fs_ctx(void *);
extern unsigned long get_fs_ctx(void *);
extern unsigned long get_rsp_ctx(void *);
extern void restore_tls(unsigned long addr);
extern void save_tls_ctx(void __user *ctx);
extern unsigned long get_tls_ctx(void __user *ctx);
extern unsigned long get_rsp_ctx(void *ctx);
long mcexec_uti_get_ctx(ihk_os_t os, struct uti_get_ctx_desc __user *udesc)
{
@ -2481,7 +2481,7 @@ long mcexec_uti_get_ctx(ihk_os_t os, struct uti_get_ctx_desc __user *udesc)
return rc;
}
long mcctrl_switch_ctx(ihk_os_t os, struct uti_save_fs_desc __user *udesc,
long mcctrl_switch_ctx(ihk_os_t os, struct uti_switch_ctx_desc __user *udesc,
struct file *file)
{
int rc = 0;
@ -2489,7 +2489,7 @@ long mcctrl_switch_ctx(ihk_os_t os, struct uti_save_fs_desc __user *udesc,
struct mcos_handler_info *info;
struct host_thread *thread;
unsigned long flags;
struct uti_save_fs_desc desc;
struct uti_switch_ctx_desc desc;
struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
struct mcctrl_per_proc_data *ppd;
@ -2499,7 +2499,7 @@ long mcctrl_switch_ctx(ihk_os_t os, struct uti_save_fs_desc __user *udesc,
goto out;
}
if (copy_from_user(&desc, udesc, sizeof(struct uti_save_fs_desc))) {
if (copy_from_user(&desc, udesc, sizeof(struct uti_switch_ctx_desc))) {
printk("%s: Error: copy_from_user failed\n", __FUNCTION__);
rc = -EFAULT;
goto out;
@ -2510,15 +2510,15 @@ long mcctrl_switch_ctx(ihk_os_t os, struct uti_save_fs_desc __user *udesc,
goto out;
}
save_fs_ctx(desc.lctx);
save_tls_ctx(desc.lctx);
info = ihk_os_get_mcos_private_data(file);
thread = kmalloc(sizeof(struct host_thread), GFP_KERNEL);
memset(thread, '\0', sizeof(struct host_thread));
thread->pid = task_tgid_vnr(current);
thread->tid = task_pid_vnr(current);
thread->usp = (unsigned long)usp;
thread->lfs = get_fs_ctx(desc.lctx);
thread->rfs = get_fs_ctx(desc.rctx);
thread->ltls = get_tls_ctx(desc.lctx);
thread->rtls = get_tls_ctx(desc.rctx);
thread->handler = info;
write_lock_irqsave(&host_thread_lock, flags);
@ -2564,9 +2564,9 @@ mcexec_sig_thread(ihk_os_t os, unsigned long arg, struct file *file)
read_unlock_irqrestore(&host_thread_lock, flags);
if (thread) {
if (arg)
restore_fs(thread->lfs);
restore_tls(thread->ltls);
else
restore_fs(thread->rfs);
restore_tls(thread->rtls);
goto out;
}
ret = -EINVAL;
@ -3268,7 +3268,7 @@ long __mcctrl_control(ihk_os_t os, unsigned int req, unsigned long arg,
return mcexec_uti_get_ctx(os, (struct uti_get_ctx_desc *)arg);
case MCEXEC_UP_UTI_SWITCH_CTX:
return mcctrl_switch_ctx(os, (struct uti_save_fs_desc *)arg,
return mcctrl_switch_ctx(os, (struct uti_switch_ctx_desc *)arg,
file);
case MCEXEC_UP_SIG_THREAD: