sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched/group: Ensure that the setting of tg_members if safe in SMP

Browse Source 
Fixed ltp_stress_mqueues_multi_send_rev_1 test issue:

In SMP mode, tg_members will operate on different cores.
Adding interrupt locking operations ensures that the operation
of tg_members will not be interrupted by other cores.

Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
This commit is contained in:
zhangyuan21 2023-05-08 09:16:32 +08:00 committed by Xiang Xiao
parent 04f8bab063
commit 6ede91c5e7
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sched/group/group_join.c
View File

@ -72,6 +72,7 @@
#ifdef HAVE_GROUP_MEMBERS #ifdef HAVE_GROUP_MEMBERS
static inline int group_addmember(FAR struct task_group_s *group, pid_t pid) static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
{ {
FAR pid_t *oldmembers = NULL;
irqstate_t flags; irqstate_t flags;
DEBUGASSERT(group && group->tg_nmembers < UINT8_MAX); DEBUGASSERT(group && group->tg_nmembers < UINT8_MAX);
@ -91,8 +92,7 @@ static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
newmax = UINT8_MAX; newmax = UINT8_MAX;
} }
newmembers = (FAR pid_t *) newmembers = (FAR pid_t *)kmm_malloc(sizeof(pid_t) * newmax);
kmm_realloc(group->tg_members, sizeof(pid_t) * newmax);
if (!newmembers) if (!newmembers)
{ {
@ -105,10 +105,16 @@ static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
* may be traversed from an interrupt handler (read-only). * may be traversed from an interrupt handler (read-only).
*/ */
flags = enter_critical_section(); flags = spin_lock_irqsave(NULL);
memcpy(newmembers, group->tg_members,
sizeof(pid_t) * group->tg_mxmembers);
oldmembers = group->tg_members;
group->tg_members = newmembers; group->tg_members = newmembers;
group->tg_mxmembers = newmax; group->tg_mxmembers = newmax;
leave_critical_section(flags); }
else
{
flags = spin_lock_irqsave(NULL);
} }
/* Assign this new pid to the group; group->tg_nmembers will be incremented /* Assign this new pid to the group; group->tg_nmembers will be incremented
@ -116,6 +122,14 @@ static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
*/ */
group->tg_members[group->tg_nmembers] = pid; group->tg_members[group->tg_nmembers] = pid;
group->tg_nmembers++;
spin_unlock_irqrestore(NULL, flags);
if (oldmembers != NULL)
{
kmm_free(oldmembers);
}
return OK; return OK;
} }
#endif /* HAVE_GROUP_MEMBERS */ #endif /* HAVE_GROUP_MEMBERS */
@ -191,6 +205,8 @@ int group_join(FAR struct pthread_tcb_s *tcb)
FAR struct task_group_s *group; FAR struct task_group_s *group;
#ifdef HAVE_GROUP_MEMBERS #ifdef HAVE_GROUP_MEMBERS
int ret; int ret;
#else
irqstate_t flags;
#endif #endif
DEBUGASSERT(tcb && tcb->cmn.group && DEBUGASSERT(tcb && tcb->cmn.group &&
@ -208,9 +224,12 @@ int group_join(FAR struct pthread_tcb_s *tcb)
{ {
return ret; return ret;
} }
#else
flags = spin_lock_irqsave(NULL);
group->tg_nmembers++;
spin_unlock_irqrestore(NULL, flags);
#endif #endif
group->tg_nmembers++;
return OK; return OK;
} }