From patchwork Tue Nov 4 11:13:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 40126 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46695240A6 for ; Tue, 4 Nov 2014 11:15:35 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf494005lab.5 for ; Tue, 04 Nov 2014 03:15:33 -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=728M28kul484kjnNDX2gdCTjr9VIlb8KVZXX7yVc9E0=; b=MpMuBMhz1B1HOBUPpMnk7whluHk1Mu3x5H8Qr1/hoBbyc2nbSJYj3wq8Qxyz4bGvMv TR6D1959xa85/ELMJ1X8CNX7r+wW2EXFkNQxwIMUu2KSnVKzA0dp0caGUb5KVhWs/BOg C8gSXfjr0OEYT9/Yv0MNP2rYOZg7yQH8I6YptWQURWO/Cl42lFXVT7cs844I5WJMzRdC EvIfs/j9y7jKrYXX+S1Jgx4N47Ytrr20d97H0IRO2+5tR7AUQSv2heXFCBnDMZ+oIU8m 02ptaWChH0GynJFZVPTVGqTyitd0T2IyEpaAo6N5aPqfZoxoEGyLp3rROPbNim7zaNud m9sA== X-Gm-Message-State: ALoCoQmBiQBfnt/ytMMmKBNdSe2ap2vFjxMR37+kiiKTHeURGHfbvGSHpvUuS3GBb5tQ9F04PeLk X-Received: by 10.180.73.73 with SMTP id j9mr4048956wiv.3.1415099733884; Tue, 04 Nov 2014 03:15:33 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.35 with SMTP id ll3ls376088lac.8.gmail; Tue, 04 Nov 2014 03:15:33 -0800 (PST) X-Received: by 10.152.18.166 with SMTP id x6mr57366191lad.18.1415099733570; Tue, 04 Nov 2014 03:15:33 -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 kc7si310951lbc.3.2014.11.04.03.15.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 03:15:33 -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 s18so668097lam.27 for ; Tue, 04 Nov 2014 03:15:33 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr22725832lbo.32.1415099733063; Tue, 04 Nov 2014 03:15:33 -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 ew9csp98469lbc; Tue, 4 Nov 2014 03:15:32 -0800 (PST) X-Received: by 10.70.94.197 with SMTP id de5mr953154pdb.161.1415099730638; Tue, 04 Nov 2014 03:15:30 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ig2si132068pbb.3.2014.11.04.03.15.29 for ; Tue, 04 Nov 2014 03:15:30 -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 S1751368AbaKDLP2 (ORCPT + 25 others); Tue, 4 Nov 2014 06:15:28 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:64713 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750706AbaKDLP0 (ORCPT ); Tue, 4 Nov 2014 06:15:26 -0500 Received: by mail-pd0-f173.google.com with SMTP id v10so13450425pde.18 for ; Tue, 04 Nov 2014 03:15:25 -0800 (PST) X-Received: by 10.68.231.232 with SMTP id tj8mr918085pbc.166.1415099725855; Tue, 04 Nov 2014 03:15:25 -0800 (PST) Received: from wangdeqiang.com ([210.21.223.3]) by mx.google.com with ESMTPSA id ol3sm158568pbb.17.2014.11.04.03.15.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 03:15:25 -0800 (PST) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Steven Rostedt , Juri Lelli , "pang.xunlei" Subject: [PATCH v2 1/6] sched/cpupri: Deal with cpupri.pri_to_cpu[CPUPRI_IDLE] for idle cases Date: Tue, 4 Nov 2014 19:13:00 +0800 Message-Id: <1415099585-31174-1-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 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 or selecting 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) { }