Re: [PATCH v2] sched: Store restrict_cpus_allowed_ptr() call state

Will Deacon
2023-01-26T15:55:39Z

On Tue, Jan 24, 2023 at 03:08:09PM -0500, Waiman Long wrote:
> On 1/24/23 14:48, Will Deacon wrote:
> > On Fri, Jan 20, 2023 at 09:17:49PM -0500, Waiman Long wrote:
> > > diff --git a/include/linux/sched.h b/include/linux/sched.h
> > > index 853d08f7562b..f93f62a1f858 100644
> > > --- a/include/linux/sched.h
> > > +++ b/include/linux/sched.h
> > > @@ -886,6 +886,9 @@ struct task_struct {
> > > unsigned sched_contributes_to_load:1;
> > > unsigned sched_migrated:1;
> > > + /* restrict_cpus_allowed_ptr() bit, serialized by scheduler locks */
> > > + unsigned cpus_allowed_restricted:1;
> > > +
> > > /* Force alignment to the next boundary: */
> > > unsigned :0;
> > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> > > index bb1ee6d7bdde..48234dc9005b 100644
> > > --- a/kernel/sched/core.c
> > > +++ b/kernel/sched/core.c
> > > @@ -2999,15 +2999,40 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
> > > struct rq *rq;
> > > rq = task_rq_lock(p, &rf);
> > > +
> > > + if (ctx->flags & (SCA_CLR_RESTRICT | SCA_SET_RESTRICT)) {
> > > + p->cpus_allowed_restricted = 0;
> > I don't think this is ever called on the SCA_SET_RESTRICT path, as
> > restrict_cpus_allowed_ptr() calls __set_cpus_allowed_ptr_locked() directly.
> > In my testing, we see a failure in the following sequence:
> >
> > 1. A 64-bit task has an affinity of 0xf
> > 2. It exec()s a 32-bit program and is forcefully restricted to the set
> > of 32-bit-capable cores. Let's say that new mask is 0xc
> > 3. The 32-bit task now exec()s a 64-bit program again
> >
> > And now we're still stuck with 0xc after step 3 whereas we should restore
> > 0xf.
> I am sorry that missed it. You are right. For setting the
> cpus_allowed_restricted bit, it should be done directly in
> restrict_cpus_allowed_ptr().
> > > + } else if (p->cpus_allowed_restricted) {
> > > + /*
> > > + * If force_compatible_cpus_allowed_ptr() has been called,
> > > + * we can't extend cpumask to beyond what is in cpus_mask.
> > > + */
> > > + if (!cpumask_and(rq->scratch_mask, ctx->new_mask,
> > > + &p->cpus_mask)) {
> > > + task_rq_unlock(rq, p, &rf);
> > > + return -EINVAL;
> > > + }
> > Why is this masking actually needed? __sched_setaffinity() already
> > takes into account the task_cpu_possible_mask(), which is why I asked you
> > before [1] about cases where the saved affinity is not simply a superset
> > of the effective affinity.
>
> I kind of overlook the use of task_cpu_possible_mask() in
> __set_cpus_allowed_ptr_locked. So we don't really need that masking. That
> make the patch even simpler then. I will send out a v3.

Thanks; I'll give it a spin when I see it.

Will