From patchwork Tue Jun 6 23:24:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 103189 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1670678qgd; Tue, 6 Jun 2017 16:25:14 -0700 (PDT) X-Received: by 10.84.224.5 with SMTP id r5mr24766948plj.267.1496791514811; Tue, 06 Jun 2017 16:25:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496791514; cv=none; d=google.com; s=arc-20160816; b=fydUPHyfjJimltlGQUW+WIOh3fNgXs055I09efJZKIxAWwZsyjrg0Q0JFpki/qEgVk MpD8UhwEWm6fQe2+Erk/4ls5GBpDBCRZJ0xXnwGP3yEZsjucZ/RmBaR95qT3lpFvgc0A jA+sOh8Tt7vG++hNwiI+jb54ho7rvnHarscEG5hODDWSvG6H2IdV0lfueAPQEGS93p56 BzE84gU6lEOPRC5I/83PTpHMaNkvJeflfUrDKI6XarDws8SlAxyDnlDqSahhroB5rruU WVIIyZdXyUhVCBZpZpW2IVDh4rgyx9bnPQs29knvd1zlTbC3Op/Ojqq3vN5dkGI93juc /Bdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=sdYroL4SumkGv/NuUHBFaluA/unPWkmy88pbdqugAm8=; b=dyQab+2+ymFcldh76RalLDNN1bbs7xeRUgXm2s5sfvrxVYsOA1mpjdwJPr/SQsL9PL 85SUyusVk4eW5JK08LJcnHa/y1H7dqdaBzHsMiPX5wepIGwsp0NAc6u9b+hwKSNij5Za k8Ht+OOusJCcqToBpUigTLHWFCnhF2fT+A5mhIX2oqlI3bu9T6TewkenwVgX32Zz9dzV SaNWotww7aBN6Y0PJFZ9+u31KYVe5sDQN3Lt2rtY3HikZuL5N3dsG/DlXreL6ewkz8un JGEERdNWpefWkeDHZnll3QSDGjK3XJkokNLKdmLmbnb5cuTBToNmwQm+pDheUnQZyCvx A9Fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w31si2425552pla.343.2017.06.06.16.25.14; Tue, 06 Jun 2017 16:25:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751520AbdFFXZG (ORCPT + 25 others); Tue, 6 Jun 2017 19:25:06 -0400 Received: from alt13.smtp-out.videotron.ca ([135.19.0.26]:27028 "EHLO alt12.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751437AbdFFXZB (ORCPT ); Tue, 6 Jun 2017 19:25:01 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id INqMdEGk3q3HFINqOdEV4J; Tue, 06 Jun 2017 19:25:00 -0400 X-Authority-Analysis: v=2.1 cv=Q9lym9Ca c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=LWSFodeU3zMA:10 a=KKAkSRfTAAAA:8 a=B9Y0AwaOc7kCs6NPOrwA:9 a=FdOpKekb0-IRxDa2:21 a=aQQ4gQ2imCHPmnEh:21 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id DE2A42DA0692; Tue, 6 Jun 2017 19:24:58 -0400 (EDT) From: Nicolas Pitre To: Ingo Molnar , Peter Zijlstra Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] sched: omit stop_sched_class when !SMP Date: Tue, 6 Jun 2017 19:24:44 -0400 Message-Id: <20170606232450.30278-3-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606232450.30278-1-nicolas.pitre@linaro.org> References: <20170606232450.30278-1-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfHmNGMViGhcmYC4WKfFCX9fwwucOHZtTG8m2Q8gfX2/F0RB8CgghCyW/M+pbfr3BfXQJIa877/CwqQNeoyarlNVAxtvJI2MZBnKlKaP6PbVccYqDDcNu DfSDJzOL7O7C8xZHh9XSuAFKW1t9KQEkaz6DXZxphsg7fBNHWmM/SM3aniRcqoi9z/CTq032bS1NyyDQtT2E0cBYCDgiNT6AU7gJ++LNOrWnpW4tMhv09zKc Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The stop class is invoked through stop_machine only. This is dead code on UP builds. Signed-off-by: Nicolas Pitre --- kernel/sched/Makefile | 4 ++-- kernel/sched/core.c | 60 +++++++++++++++++++++++++-------------------------- kernel/sched/sched.h | 4 ++++ 3 files changed, 36 insertions(+), 32 deletions(-) -- 2.9.4 diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 89ab675866..5e4c2e7a63 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -16,9 +16,9 @@ CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer endif obj-y += core.o loadavg.o clock.o cputime.o -obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o +obj-y += idle_task.o fair.o rt.o deadline.o obj-y += wait.o swait.o completion.o idle.o -obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o +obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o obj-$(CONFIG_SCHEDSTATS) += stats.o obj-$(CONFIG_SCHED_DEBUG) += debug.o diff --git a/kernel/sched/core.c b/kernel/sched/core.c index de274b1bd2..94fa712791 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -788,36 +788,6 @@ void deactivate_task(struct rq *rq, struct task_struct *p, int flags) dequeue_task(rq, p, flags); } -void sched_set_stop_task(int cpu, struct task_struct *stop) -{ - struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; - struct task_struct *old_stop = cpu_rq(cpu)->stop; - - if (stop) { - /* - * Make it appear like a SCHED_FIFO task, its something - * userspace knows about and won't get confused about. - * - * Also, it will make PI more or less work without too - * much confusion -- but then, stop work should not - * rely on PI working anyway. - */ - sched_setscheduler_nocheck(stop, SCHED_FIFO, ¶m); - - stop->sched_class = &stop_sched_class; - } - - cpu_rq(cpu)->stop = stop; - - if (old_stop) { - /* - * Reset it back to a normal scheduling class so that - * it can die in pieces. - */ - old_stop->sched_class = &rt_sched_class; - } -} - /* * __normal_prio - return the priority that is based on the static prio */ @@ -1588,6 +1558,36 @@ static void update_avg(u64 *avg, u64 sample) *avg += diff >> 3; } +void sched_set_stop_task(int cpu, struct task_struct *stop) +{ + struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; + struct task_struct *old_stop = cpu_rq(cpu)->stop; + + if (stop) { + /* + * Make it appear like a SCHED_FIFO task, its something + * userspace knows about and won't get confused about. + * + * Also, it will make PI more or less work without too + * much confusion -- but then, stop work should not + * rely on PI working anyway. + */ + sched_setscheduler_nocheck(stop, SCHED_FIFO, ¶m); + + stop->sched_class = &stop_sched_class; + } + + cpu_rq(cpu)->stop = stop; + + if (old_stop) { + /* + * Reset it back to a normal scheduling class so that + * it can die in pieces. + */ + old_stop->sched_class = &rt_sched_class; + } +} + #else static inline int __set_cpus_allowed_ptr(struct task_struct *p, diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 6dda2aab73..053f60afb7 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1422,7 +1422,11 @@ static inline void set_curr_task(struct rq *rq, struct task_struct *curr) curr->sched_class->set_curr_task(rq); } +#ifdef CONFIG_SMP #define sched_class_highest (&stop_sched_class) +#else +#define sched_class_highest (&dl_sched_class) +#endif #define for_each_class(class) \ for (class = sched_class_highest; class; class = class->next)