From patchwork Mon Nov 17 16:11:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 40930 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7469D24035 for ; Mon, 17 Nov 2014 16:12:14 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf13181323eek.7 for ; Mon, 17 Nov 2014 08:12:13 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=N2jxWvPUPR/at92EorY8t84B7ox2Eu1mN4V/Mq1ArZs=; b=b/OJzNgJHdHfNqQCmnfSzHFkTVbph34Z/8LR1fo3ebJfVzG79MlTZDMAErPbo8xyV9 Qv6cxvegr6JI2VOvsdJmV+xoKqJIquKgqR8ZNojaAEEeL67vHO6nLh17fibcfitvk4Yc I0LY2IhI+/mjbbwcUXM6xvx4CoJcPQT7CVIAJLVQuMjB0fDpf/t6j9pcGeWnpu4tLM7O AFmWS86K84xS06aYT5mcFahXw1i6W/JhkaXHG6WOKHKg98wiD+isub/+4ALQs3Mqlu8F a7BuoR8K9QYbYzL4yvV3VKSFzCu0PqlxBrbl6BYg/WnM6xzp3sGKnhjmly7KSEBOYRme gxsw== X-Gm-Message-State: ALoCoQkR8SNeYgToe5eIssVj9kRdXm8XX6I/rEPcDaMoEyBh4AhAUUqRJRaX7rJO9RdnsSf+2vPs X-Received: by 10.112.169.68 with SMTP id ac4mr22981lbc.24.1416240733665; Mon, 17 Nov 2014 08:12:13 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls932147laj.57.gmail; Mon, 17 Nov 2014 08:12:13 -0800 (PST) X-Received: by 10.112.168.129 with SMTP id zw1mr9589421lbb.77.1416240733412; Mon, 17 Nov 2014 08:12:13 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id ka2si52576081lbc.9.2014.11.17.08.12.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:12:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so16500762lbi.34 for ; Mon, 17 Nov 2014 08:12:12 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr4396748laa.56.1416240732762; Mon, 17 Nov 2014 08:12:12 -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 ew9csp1179967lbc; Mon, 17 Nov 2014 08:12:11 -0800 (PST) X-Received: by 10.70.133.202 with SMTP id pe10mr30558853pdb.32.1416240731142; Mon, 17 Nov 2014 08:12:11 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nq4si35486176pbc.123.2014.11.17.08.12.10 for ; Mon, 17 Nov 2014 08:12:11 -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 S1752027AbaKQQMD (ORCPT + 26 others); Mon, 17 Nov 2014 11:12:03 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:61102 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751847AbaKQQMA (ORCPT ); Mon, 17 Nov 2014 11:12:00 -0500 Received: by mail-pa0-f52.google.com with SMTP id eu11so1679663pac.11 for ; Mon, 17 Nov 2014 08:12:00 -0800 (PST) X-Received: by 10.68.106.161 with SMTP id gv1mr30757836pbb.1.1416240720102; Mon, 17 Nov 2014 08:12:00 -0800 (PST) Received: from vptest-PC.zte.com.cn ([167.160.116.21]) by mx.google.com with ESMTPSA id xy3sm35436833pbb.38.2014.11.17.08.11.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 08:11:59 -0800 (PST) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Steven Rostedt , Juri Lelli , "pang.xunlei" Subject: [PATCH 2/2] sched/deadline: Fix wrong cpudl_find() in check_preempt_equal_dl() Date: Tue, 18 Nov 2014 00:11:04 +0800 Message-Id: <1416240664-7200-2-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1416240664-7200-1-git-send-email-pang.xunlei@linaro.org> References: <1416240664-7200-1-git-send-email-pang.xunlei@linaro.org> 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.217.175 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: , In check_preempt_equal_dl(), cpudl_find() is called with a NULL later_mask, thus cpudl_find() here doesn't check cpudl.free_cpus at all. This patch takles this issue by always passing a non-NULL cpumask to cpudl_find(), and assigns later_mask in this function. Signed-off-by: pang.xunlei --- kernel/sched/cpudeadline.c | 14 ++++++-------- kernel/sched/deadline.c | 10 ++++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index 9a69353..623f7b5 100755 --- a/kernel/sched/cpudeadline.c +++ b/kernel/sched/cpudeadline.c @@ -97,7 +97,7 @@ static inline int cpudl_maximum(struct cpudl *cp) * cpudl_find - find the best (later-dl) CPU in the system * @cp: the cpudl max-heap context * @p: the task - * @later_mask: a mask to fill in with the selected CPUs (or NULL) + * @later_mask: a mask to fill in with the selected CPUs (not NULL) * * Returns: int - best CPU (heap maximum if suitable) */ @@ -107,16 +107,14 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p, int best_cpu = -1; const struct sched_dl_entity *dl_se = &p->dl; - if (later_mask && cpumask_and(later_mask, cp->free_cpus, - &p->cpus_allowed) && cpumask_and(later_mask, - later_mask, cpu_active_mask)) { + cpumask_and(later_mask, cpu_active_mask, &p->cpus_allowed); + if (cpumask_and(later_mask, later_mask, cp->free_cpus)) { best_cpu = cpumask_any(later_mask); goto out; - } else if (cpumask_test_cpu(cpudl_maximum(cp), &p->cpus_allowed) && - dl_time_before(dl_se->deadline, cp->elements[0].dl)) { + } else if (cpumask_and(later_mask, cpumask_of(cpudl_maximum(cp)), + &p->cpus_allowed) && dl_time_before(dl_se->deadline, + cp->elements[0].dl)) { best_cpu = cpudl_maximum(cp); - if (later_mask) - cpumask_set_cpu(best_cpu, later_mask); } out: diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index bd83272..3ecf838 100755 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -965,14 +965,18 @@ out: return cpu; } +static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask_dl); + static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p) { + struct cpumask *later_mask = this_cpu_cpumask_var_ptr(local_cpu_mask_dl); + /* * Current can't be migrated, useless to reschedule, * let's hope p can move out. */ if (rq->curr->nr_cpus_allowed == 1 || - cpudl_find(&rq->rd->cpudl, rq->curr, NULL) == -1) + cpudl_find(&rq->rd->cpudl, rq->curr, later_mask) == -1) return; /* @@ -980,7 +984,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p) * see if it is pushed or pulled somewhere else. */ if (p->nr_cpus_allowed != 1 && - cpudl_find(&rq->rd->cpudl, p, NULL) != -1) + cpudl_find(&rq->rd->cpudl, p, later_mask) != -1) return; resched_curr(rq); @@ -1167,8 +1171,6 @@ next_node: return NULL; } -static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask_dl); - static int find_later_rq(struct task_struct *task) { struct sched_domain *sd;