From patchwork Thu Nov 20 17:28: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: 41254 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 3268E241C9 for ; Thu, 20 Nov 2014 17:29:12 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id ex7sf2333866wid.11 for ; Thu, 20 Nov 2014 09:29:11 -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=jJRmjL8v/yAKNfprtY4pUH6yosKhAeyHsncMRD5FMYs=; b=PiNz8avM0qBFryX41ZibOKMCV2bAxbIffsCTbWOV/22SE/eyR/xxDwmqj1FTXEM4T9 Fq8RuNlMC+GSYojSYb+VmsDapK+kJyDitzk3529qrwWP0HyuvznDqyBy995S55QpOfEu kfbZp6Hki/WgaCW3dEEdPxlvlrXxJ8zF9C5r5iG0da2i+BV/3NvtHSPa/+mFJgHmsTL9 zG8VTg1HRSK1UtpM6y0XZqEmDubbOwrAWKb0rpjHrVtfZm+m+zn2WstUTaiDGXu09X9q WkGnEGS6KwFWckgJBbLtufoqZr/xFDi1GLh0bP1KOgrBV2j3FFgfV3GRkd3Oi7y3WhZV YoIw== X-Gm-Message-State: ALoCoQkJkAdKyj0zvSFUXt0YUTdfI3A4N7gg1pDfYAxMux/fYG/iqLtb81Gg9r0rYEh5PAU0GCCB X-Received: by 10.112.17.65 with SMTP id m1mr1228660lbd.16.1416504551456; Thu, 20 Nov 2014 09:29:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.227 with SMTP id e3ls95337laa.69.gmail; Thu, 20 Nov 2014 09:29:11 -0800 (PST) X-Received: by 10.152.10.143 with SMTP id i15mr49623565lab.5.1416504551280; Thu, 20 Nov 2014 09:29:11 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id xv2si2770595lab.12.2014.11.20.09.29.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Nov 2014 09:29:11 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id p9so1641276lbv.14 for ; Thu, 20 Nov 2014 09:29:11 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr12549472lal.29.1416504551150; Thu, 20 Nov 2014 09:29:11 -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 ew9csp303333lbc; Thu, 20 Nov 2014 09:29:10 -0800 (PST) X-Received: by 10.69.18.225 with SMTP id gp1mr31637344pbd.144.1416504549235; Thu, 20 Nov 2014 09:29:09 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ga4si3949146pbb.176.2014.11.20.09.29.08 for ; Thu, 20 Nov 2014 09:29:09 -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 S1757770AbaKTR24 (ORCPT + 26 others); Thu, 20 Nov 2014 12:28:56 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:41475 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756396AbaKTR2y (ORCPT ); Thu, 20 Nov 2014 12:28:54 -0500 Received: by mail-pa0-f44.google.com with SMTP id et14so2999977pad.3 for ; Thu, 20 Nov 2014 09:28:53 -0800 (PST) X-Received: by 10.68.69.48 with SMTP id b16mr43259694pbu.59.1416504533240; Thu, 20 Nov 2014 09:28:53 -0800 (PST) Received: from vptest-PC.zte.com.cn ([167.160.116.65]) by mx.google.com with ESMTPSA id tv4sm2604342pab.28.2014.11.20.09.28.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 09:28:52 -0800 (PST) From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Steven Rostedt , Juri Lelli , "pang.xunlei" Subject: [PATCH v3 2/3] sched/deadline: Fix wrong cpudl_find() in check_preempt_equal_dl() Date: Fri, 21 Nov 2014 01:28:04 +0800 Message-Id: <1416504485-8180-2-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1416504485-8180-1-git-send-email-pang.xunlei@linaro.org> References: <1416504485-8180-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.169 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 | 10 ++++------ kernel/sched/deadline.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index c79f0d7..c01b3aa 100644 --- 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)) { best_cpu = cpudl_maximum(cp); - if (later_mask) - cpumask_set_cpu(best_cpu, later_mask); + cpumask_set_cpu(best_cpu, later_mask); } out: diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index bd83272..03bb3f0 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -965,14 +965,22 @@ 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); + + /* Make sure the mask is initialized first */ + if (unlikely(!later_mask)) + return; + /* * 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 +988,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 +1175,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;