From patchwork Wed Nov 5 15:48:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 40195 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FCEF2404A for ; Wed, 5 Nov 2014 15:48:54 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf1037112wiw.11 for ; Wed, 05 Nov 2014 07:48:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=W3zpgXO1UHUrlZsAmQQIEaCNit+0DacEUuaLfpDVewk=; b=EDaD+bSAaRbUojxHIFZ/bDYTGwQp5LUXuy06qzz7nz2Yih+OFQqlmQdr8ndmajQNOj f2haKMYJdMM+QWNsYdeOKTCJNg61WQB1vZ4mPiBZkYnzJP3IdeIgVwdJq7WTQEodyYPE 6VkxoaNrUMew/ZmbfjFFuv3swTc6VSzujUAdMf5TeDfjGRRK3I3nbzhdtCx49o3ayCgV t+W8PjmuvOu6Na4hhl0qW3/3+wB6rafWjn8bJTSVXjXo0OuyHkvQsv+VM4n4bfhdlCF/ HkHQiawC+I3Idcck4MM7HSfeA9KM+d9nhM6HaAcbnXCGAKO4JY155t8sy1v6pHPXSbGq BInw== X-Gm-Message-State: ALoCoQmTpooJoFFOXp5XFgFwbrPjQO8j379+vQk05lRkSdDZgY4/cfNOK4f1BXwZeeLRG6TwpCpb X-Received: by 10.180.90.234 with SMTP id bz10mr3060580wib.0.1415202533157; Wed, 05 Nov 2014 07:48:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.1 with SMTP id lk1ls161966lac.9.gmail; Wed, 05 Nov 2014 07:48:52 -0800 (PST) X-Received: by 10.112.180.198 with SMTP id dq6mr67582591lbc.56.1415202532579; Wed, 05 Nov 2014 07:48:52 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ob1si6702529lbb.113.2014.11.05.07.48.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 07:48:52 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id s18so942767lam.13 for ; Wed, 05 Nov 2014 07:48:52 -0800 (PST) X-Received: by 10.152.5.38 with SMTP id p6mr68010191lap.44.1415202531942; Wed, 05 Nov 2014 07:48:51 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp303260lbc; Wed, 5 Nov 2014 07:48:51 -0800 (PST) X-Received: by 10.70.48.175 with SMTP id m15mr15711460pdn.153.1415202530257; Wed, 05 Nov 2014 07:48:50 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yu4si3359408pac.115.2014.11.05.07.48.49 for ; Wed, 05 Nov 2014 07:48:50 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755423AbaKEPsr (ORCPT + 25 others); Wed, 5 Nov 2014 10:48:47 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:58377 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755392AbaKEPsp (ORCPT ); Wed, 5 Nov 2014 10:48:45 -0500 Received: by mail-pd0-f177.google.com with SMTP id v10so966824pde.8 for ; Wed, 05 Nov 2014 07:48:45 -0800 (PST) X-Received: by 10.68.215.2 with SMTP id oe2mr58465376pbc.94.1415202525225; Wed, 05 Nov 2014 07:48:45 -0800 (PST) Received: from vptest-PC.zte.com.cn ([167.160.116.59]) by mx.google.com with ESMTPSA id e9sm3517098pdp.59.2014.11.05.07.48.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Nov 2014 07:48:44 -0800 (PST) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Steven Rostedt , Juri Lelli , "pang.xunlei" Subject: [PATCH v3 1/7] sched/rt: Deal with cpupri.pri_to_cpu[CPUPRI_IDLE] for idle cases Date: Wed, 5 Nov 2014 23:48:20 +0800 Message-Id: <1415202506-7800-1-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 2.0.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When a runqueue runs out of RT tasks, it may have non-RT tasks or none tasks(idle). Currently, RT balance treats the two cases equally and manipulates cpupri.pri_to_cpu[CPUPRI_NORMAL] only which may cause problems. For instance, 4 cpus system, non-RT task1 is running on cpu0, RT task2 is running on cpu3, cpu1/cpu2 both are idle. Then RT task3 (usually CPU-intensive) is waken up or created on cpu3, it will be placed to cpu0 (see find_lowest_rq()) causing task1 starving until cfs load balance places task1 to another cpu, or even worse if task1 is bound on cpu0. So, it would be reasonable to put task3 to cpu1 or cpu2 which is idle(even though doing this may break the energy-saving idle state). This patch tackles the problem by operating pri_to_cpu[CPUPRI_IDLE] of cpupri according to the stages of idle task, so that when pushing RT tasks through find_lowest_rq(), it will try to find one idle cpu as the goal. Signed-off-by: pang.xunlei --- kernel/sched/idle_task.c | 3 +++ kernel/sched/rt.c | 21 +++++++++++++++++++++ kernel/sched/sched.h | 6 ++++++ 3 files changed, 30 insertions(+) diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c index 67ad4e7..e053347 100644 --- a/kernel/sched/idle_task.c +++ b/kernel/sched/idle_task.c @@ -26,6 +26,8 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int fl static struct task_struct * pick_next_task_idle(struct rq *rq, struct task_struct *prev) { + idle_enter_rt(rq); + put_prev_task(rq, prev); schedstat_inc(rq, sched_goidle); @@ -47,6 +49,7 @@ dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags) static void put_prev_task_idle(struct rq *rq, struct task_struct *prev) { + idle_exit_rt(rq); idle_exit_fair(rq); rq_last_tick_reset(rq); } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index d024e6c..da6922e 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -992,6 +992,27 @@ enqueue_top_rt_rq(struct rt_rq *rt_rq) #if defined CONFIG_SMP +/* Set CPUPRI_IDLE bitmap for this cpu when entering idle. */ +void idle_enter_rt(struct rq *this_rq) +{ + struct cpupri *cp = &this_rq->rd->cpupri; + int currpri = cp->cpu_to_pri[this_rq->cpu]; + + BUG_ON(currpri != CPUPRI_NORMAL); + cpupri_set(cp, this_rq->cpu, MAX_PRIO); +} + +/* Set CPUPRI_NORMAL bitmap for this cpu when exiting from idle. */ +void idle_exit_rt(struct rq *this_rq) +{ + struct cpupri *cp = &this_rq->rd->cpupri; + int currpri = cp->cpu_to_pri[this_rq->cpu]; + + /* RT tasks may be queued before, this judgement is needed. */ + if (currpri == CPUPRI_IDLE) + cpupri_set(cp, this_rq->cpu, MAX_RT_PRIO); +} + static void inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) { diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 24156c84..cc603fa 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1162,11 +1162,17 @@ extern void update_group_capacity(struct sched_domain *sd, int cpu); extern void trigger_load_balance(struct rq *rq); +extern void idle_enter_rt(struct rq *this_rq); +extern void idle_exit_rt(struct rq *this_rq); + extern void idle_enter_fair(struct rq *this_rq); extern void idle_exit_fair(struct rq *this_rq); #else +static inline void idle_enter_rt(struct rq *rq) { } +static inline void idle_exit_rt(struct rq *rq) { } + static inline void idle_enter_fair(struct rq *rq) { } static inline void idle_exit_fair(struct rq *rq) { }