From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89437C04AB1 for ; Thu, 9 May 2019 09:18:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6653C206A3 for ; Thu, 9 May 2019 09:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbfEIJSN (ORCPT ); Thu, 9 May 2019 05:18:13 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:35490 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbfEIJSN (ORCPT ); Thu, 9 May 2019 05:18:13 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C16C9374; Thu, 9 May 2019 02:18:12 -0700 (PDT) Received: from e110439-lin (e110439-lin.cambridge.arm.com [10.1.194.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CC5FA3F575; Thu, 9 May 2019 02:18:09 -0700 (PDT) Date: Thu, 9 May 2019 10:18:07 +0100 From: Patrick Bellasi To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-api@vger.kernel.org, Ingo Molnar , Tejun Heo , "Rafael J . Wysocki" , Vincent Guittot , Viresh Kumar , Paul Turner , Quentin Perret , Dietmar Eggemann , Morten Rasmussen , Juri Lelli , Todd Kjos , Joel Fernandes , Steve Muckle , Suren Baghdasaryan Subject: Re: [PATCH v8 05/16] sched/core: Allow sched_setattr() to use the current policy Message-ID: <20190509091807.7d3iykkn3oj4b737@e110439-lin> References: <20190402104153.25404-1-patrick.bellasi@arm.com> <20190402104153.25404-6-patrick.bellasi@arm.com> <20190508192131.GD32547@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190508192131.GD32547@worktop.programming.kicks-ass.net> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08-May 21:21, Peter Zijlstra wrote: > On Tue, Apr 02, 2019 at 11:41:41AM +0100, Patrick Bellasi wrote: > > diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h > > index 22627f80063e..075c610adf45 100644 > > --- a/include/uapi/linux/sched.h > > +++ b/include/uapi/linux/sched.h > > @@ -40,6 +40,8 @@ > > /* SCHED_ISO: reserved but not implemented yet */ > > #define SCHED_IDLE 5 > > #define SCHED_DEADLINE 6 > > +/* Must be the last entry: used to sanity check attr.policy values */ > > +#define SCHED_POLICY_MAX SCHED_DEADLINE > > This is a wee bit sad to put in a uapi header; but yeah, where else :/ > > Another option would be something like: > > enum { > SCHED_NORMAL = 0, > SCHED_FIFO = 1, > SCHED_RR = 2, > SCHED_BATCH = 3, > /* SCHED_ISO = 4, reserved */ > SCHED_IDLE = 5, > SCHED_DEADLINE = 6, > SCHED_POLICY_NR > }; I just wanted to minimize the changes by keeping the same structure... If you prefer the above I can add a refactoring patch just to update existing definitions before adding this patch... > > > /* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */ > > #define SCHED_RESET_ON_FORK 0x40000000 > > @@ -50,9 +52,11 @@ > > #define SCHED_FLAG_RESET_ON_FORK 0x01 > > #define SCHED_FLAG_RECLAIM 0x02 > > #define SCHED_FLAG_DL_OVERRUN 0x04 > > +#define SCHED_FLAG_KEEP_POLICY 0x08 > > > > #define SCHED_FLAG_ALL (SCHED_FLAG_RESET_ON_FORK | \ > > SCHED_FLAG_RECLAIM | \ > > - SCHED_FLAG_DL_OVERRUN) > > + SCHED_FLAG_DL_OVERRUN | \ > > + SCHED_FLAG_KEEP_POLICY) > > > > #endif /* _UAPI_LINUX_SCHED_H */ > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > > index d368ac26b8aa..20efb32e1a7e 100644 > > --- a/kernel/sched/core.c > > +++ b/kernel/sched/core.c > > @@ -4907,8 +4907,17 @@ SYSCALL_DEFINE3(sched_setattr, pid_t, pid, struct sched_attr __user *, uattr, > > if (retval) > > return retval; > > > > - if ((int)attr.sched_policy < 0) > > + /* > > + * A valid policy is always required from userspace, unless > > + * SCHED_FLAG_KEEP_POLICY is set and the current policy > > + * is enforced for this call. > > + */ > > + if (attr.sched_policy > SCHED_POLICY_MAX && > > + !(attr.sched_flags & SCHED_FLAG_KEEP_POLICY)) { > > return -EINVAL; > > + } > > And given I just looked at those darn SCHED_* things, I now note the > above does 'funny' things when passed: attr.policy=4. ... and maybe factor in the same refactoring patch a check on SCHED_ISO being not yet supported. > > > + if (attr.sched_flags & SCHED_FLAG_KEEP_POLICY) > > + attr.sched_policy = SETPARAM_POLICY; > > > > rcu_read_lock(); > > retval = -ESRCH; -- #include Patrick Bellasi