Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐞 fix: fix taskset #8211

Merged
merged 1 commit into from
Nov 2, 2023
Merged

🐞 fix: fix taskset #8211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion components/lwp/lwp_pid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ rt_lwp_t lwp_create(rt_base_t flags)
/* minimal setup of lwp object */
new_lwp->session = -1;
new_lwp->ref = 1;
#ifdef RT_USING_SMP
new_lwp->bind_cpu = RT_CPUS_NR;
#endif
rt_list_init(&new_lwp->wait_list);
rt_list_init(&new_lwp->t_grp);
rt_list_init(&new_lwp->timer);
Expand Down Expand Up @@ -1193,7 +1196,10 @@ static int _lwp_setaffinity(pid_t pid, int cpu)
int ret = -1;

lwp_pid_lock_take();
lwp = lwp_from_pid_locked(pid);
if(pid == 0)
lwp = lwp_self();
else
lwp = lwp_from_pid_locked(pid);
if (lwp)
{
#ifdef RT_USING_SMP
Expand Down
50 changes: 33 additions & 17 deletions components/lwp/lwp_syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5259,28 +5259,32 @@ ssize_t sys_readlink(char* path, char *buf, size_t bufsz)
return bufsz;
}

sysret_t sys_setaffinity(pid_t pid, size_t size, void *set)
sysret_t sys_sched_setaffinity(pid_t pid, size_t size, void *set)
{
void *kset = RT_NULL;

if (!lwp_user_accessable((void *)set, sizeof(cpu_set_t)))
if (size <= 0 || size > sizeof(cpu_set_t))
{
return -EINVAL;
}
if (!lwp_user_accessable((void *)set, size))
return -EFAULT;

kset = kmem_get(sizeof(*kset));
kset = kmem_get(size);
if (kset == RT_NULL)
{
return -ENOMEM;
}

if (lwp_get_from_user(kset, set, sizeof(cpu_set_t)) != sizeof(cpu_set_t))
if (lwp_get_from_user(kset, set, size) != size)
{
kmem_put(kset);
return -EINVAL;
}

for (int i = 0;i < size * 8; i++)
{
if (CPU_ISSET(i, (cpu_set_t *)kset))
if (CPU_ISSET_S(i, size, kset))
{
kmem_put(kset);
return lwp_setaffinity(pid, i);
Expand All @@ -5292,11 +5296,11 @@ sysret_t sys_setaffinity(pid_t pid, size_t size, void *set)
return -1;
}

sysret_t sys_getaffinity(const pid_t pid, size_t size, void *set)
sysret_t sys_sched_getaffinity(const pid_t pid, size_t size, void *set)
{
#ifdef ARCH_MM_MMU
DEF_RETURN_CODE(rc);
cpu_set_t mask;
void *mask;
struct rt_lwp *lwp;
rt_bool_t need_release = RT_FALSE;

Expand All @@ -5308,6 +5312,13 @@ sysret_t sys_getaffinity(const pid_t pid, size_t size, void *set)
{
return -EFAULT;
}
mask = kmem_get(size);
if (!mask)
{
return -ENOMEM;
}

CPU_ZERO_S(size, mask);

if (pid == 0)
{
Expand All @@ -5326,29 +5337,34 @@ sysret_t sys_getaffinity(const pid_t pid, size_t size, void *set)
}
else
{
#ifdef RT_USING_SMP
#ifdef RT_USING_SMP
if (lwp->bind_cpu == RT_CPUS_NR) /* not bind */
{
CPU_ZERO_S(size, &mask);
for(int i = 0; i < RT_CPUS_NR; i++)
{
CPU_SET_S(i, size, mask);
}
}
else /* set bind cpu */
{
/* TODO: only single-core bindings are now supported of rt-smart */
CPU_SET_S(lwp->bind_cpu, size, &mask);
CPU_SET_S(lwp->bind_cpu, size, mask);
}
#else
CPU_SET_S(0, size, &mask);
#endif
#else
CPU_SET_S(0, size, mask);
#endif

if (lwp_put_to_user(set, &mask, size) != size)
if (lwp_put_to_user(set, mask, size) != size)
rc = -EFAULT;
else
rc = 0;
rc = size;
}

if (need_release)
lwp_pid_lock_release();

kmem_put(mask);

RETURN(rc);
#else
return -1;
Expand Down Expand Up @@ -6803,7 +6819,7 @@ const static struct rt_syscall_def func_table[] =
SYSCALL_SIGN(sys_sched_get_priority_min),
SYSCALL_SIGN(sys_sched_setscheduler),
SYSCALL_SIGN(sys_sched_getscheduler),
SYSCALL_SIGN(sys_setaffinity),
SYSCALL_SIGN(sys_sched_setaffinity),
SYSCALL_SIGN(sys_fsync), /* 155 */
SYSCALL_SIGN(sys_clock_nanosleep),
SYSCALL_SIGN(sys_timer_create),
Expand All @@ -6829,7 +6845,7 @@ const static struct rt_syscall_def func_table[] =
SYSCALL_SIGN(sys_umount2),
SYSCALL_SIGN(sys_link),
SYSCALL_SIGN(sys_symlink),
SYSCALL_SIGN(sys_getaffinity), /* 180 */
SYSCALL_SIGN(sys_sched_getaffinity), /* 180 */
SYSCALL_SIGN(sys_sysinfo),
SYSCALL_SIGN(sys_chmod),
SYSCALL_SIGN(sys_reboot),
Expand Down