From patchwork Wed Jun 13 12:17:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 138447 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp645576lji; Wed, 13 Jun 2018 05:18:18 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLEHorK1c6Y218ne/xq0qkpqWU0BVq/F3XFz2V/n7K0d4SXqg6SwOiNI5NF1ipILc2jrDCC X-Received: by 2002:a62:fcb:: with SMTP id 72-v6mr4690067pfp.231.1528892297863; Wed, 13 Jun 2018 05:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528892297; cv=none; d=google.com; s=arc-20160816; b=h46yRq5EGXedUrhugUThlDPh3r3TuaQvtnWm2eaXWxr0jz9AAg6DHGFUtw9oMW8xre haGEzPKBuZurBGHPb0/c9QKtKvuyfkhqAoGrpH6SgAfNktFX6PDdq+Z1OraGzpmojEqX AoF7fx/k9Ybr83t6gI4XUk5ufdvnBssc932YBJynOQCUEq7N6OqZkVCkNx9c7DPg8i71 SGycokcGn/LzUd6AxVi1emn2iYcZSgSSZqiS1577/Alo+Prwd37cDwEcHyjFTTG0ZBJx tuo7i2i6pW8LdZq0Wnf6uFKR5xQJhWn5PnVM8FMsc5TgM0/un6Ypf0Q4/t+96vecon4E vp3g== 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=KX4uxSPk+Ym6JtztjwcqO+gEDs3avL9GQ5ej6jLr24U=; b=VS8zGl2LrRi6X/jBSbTaFkhgwoF6LzU1MvoNRYQeQa9GU69xvQpB6uMtblQIAqVcBC tqPKopMn5GtNZDEktfmBFTzdRGahslS5WzVQ7VylmKK9Uyqrj10YWHu5aoIbcL5kUVod UQK14dGZlGVJKQPA6ZwolR54aZ+aZUzPbJQwqAocfbxnv1XFM3t6g6ifEB8EXu/D4lV3 RPi/XwmIBZiCccf4TXk/uU9vtLlqjaztFOON0vjOuQTaHDRTYMAi1ETKiyxXDqMzAohD zgxbSXYDMBFMszngl2AU6/5burgBH7oweSYq/iSSP1kU5zLlRCk2Ts/g8HBXP2aLrD3h QQrg== 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=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f26-v6si2186054pgn.247.2018.06.13.05.18.17; Wed, 13 Jun 2018 05:18:17 -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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964803AbeFMMSN (ORCPT + 30 others); Wed, 13 Jun 2018 08:18:13 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34977 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935286AbeFMMRb (ORCPT ); Wed, 13 Jun 2018 08:17:31 -0400 Received: by mail-wr0-f194.google.com with SMTP id l10-v6so2540916wrn.2 for ; Wed, 13 Jun 2018 05:17:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KX4uxSPk+Ym6JtztjwcqO+gEDs3avL9GQ5ej6jLr24U=; b=dFo4+6f6XAP/XxpD9CW2yx1UMljC/TsZvEnVcX8JVAoS0GEW670DcMVboxZkDZmsHP CDotTvsC63gApeDrTp/XK8WPWML/AHTPlIiJFAQIYoIIs9I6wXfpLMsTS93pg+qAxrBh zWPTcxgDJUfB8RwjKeu9mm3pimLJ69ou2DvzWWs8GnnskpTAaRMuU9k6bvijIYzz6Rv7 RXwOBWSN6rhFOyI/vgKpRL47ZusaHE22bOfAgfKq4qU2GXgNN0UYmB+e2V0lKxuq9lVx iUWi1aJn1nErYy5mlgJjmP8ap0iMoXnVFtDaq0icM4j7BBKQvbhT4EiDJDC0w5ujrszc MA8g== X-Gm-Message-State: APt69E3+7z6Om6hedRIhMilPFh9Hj2tBAbBR2wvQSLu8uBDR7eR+LwL7 zefYCzH66BefYkiDsXioMN3/gA== X-Received: by 2002:a5d:41c6:: with SMTP id e6-v6mr4044599wrq.25.1528892249983; Wed, 13 Jun 2018 05:17:29 -0700 (PDT) Received: from localhost.localdomain.com ([151.15.207.242]) by smtp.gmail.com with ESMTPSA id 137-v6sm4943673wmv.28.2018.06.13.05.17.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Jun 2018 05:17:29 -0700 (PDT) From: Juri Lelli To: peterz@infradead.org, mingo@redhat.com, rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, luca.abeni@santannapisa.it, claudio@evidence.eu.com, tommaso.cucinotta@santannapisa.it, bristot@redhat.com, mathieu.poirier@linaro.org, lizefan@huawei.com, cgroups@vger.kernel.org Subject: [PATCH v4 3/5] sched/core: Streamlining calls to task_rq_unlock() Date: Wed, 13 Jun 2018 14:17:09 +0200 Message-Id: <20180613121711.5018-4-juri.lelli@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180613121711.5018-1-juri.lelli@redhat.com> References: <20180613121711.5018-1-juri.lelli@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathieu Poirier Calls to task_rq_unlock() are done several times in function __sched_setscheduler(). This is fine when only the rq lock needs to be handled but not so much when other locks come into play. This patch streamlines the release of the rq lock so that only one location need to be modified when dealing with more than one lock. No change of functionality is introduced by this patch. Signed-off-by: Mathieu Poirier --- kernel/sched/core.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -- 2.14.3 Reviewed-by: Steven Rostedt (VMware) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d1555185c054..ca788f74259d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4237,8 +4237,8 @@ static int __sched_setscheduler(struct task_struct *p, * Changing the policy of the stop threads its a very bad idea: */ if (p == rq->stop) { - task_rq_unlock(rq, p, &rf); - return -EINVAL; + retval = -EINVAL; + goto unlock; } /* @@ -4254,8 +4254,8 @@ static int __sched_setscheduler(struct task_struct *p, goto change; p->sched_reset_on_fork = reset_on_fork; - task_rq_unlock(rq, p, &rf); - return 0; + retval = 0; + goto unlock; } change: @@ -4268,8 +4268,8 @@ static int __sched_setscheduler(struct task_struct *p, if (rt_bandwidth_enabled() && rt_policy(policy) && task_group(p)->rt_bandwidth.rt_runtime == 0 && !task_group_is_autogroup(task_group(p))) { - task_rq_unlock(rq, p, &rf); - return -EPERM; + retval = -EPERM; + goto unlock; } #endif #ifdef CONFIG_SMP @@ -4284,8 +4284,8 @@ static int __sched_setscheduler(struct task_struct *p, */ if (!cpumask_subset(span, &p->cpus_allowed) || rq->rd->dl_bw.bw == 0) { - task_rq_unlock(rq, p, &rf); - return -EPERM; + retval = -EPERM; + goto unlock; } } #endif @@ -4304,8 +4304,8 @@ static int __sched_setscheduler(struct task_struct *p, * is available. */ if ((dl_policy(policy) || dl_task(p)) && sched_dl_overflow(p, policy, attr)) { - task_rq_unlock(rq, p, &rf); - return -EBUSY; + retval = -EBUSY; + goto unlock; } p->sched_reset_on_fork = reset_on_fork; @@ -4361,6 +4361,10 @@ static int __sched_setscheduler(struct task_struct *p, preempt_enable(); return 0; + +unlock: + task_rq_unlock(rq, p, &rf); + return retval; } static int _sched_setscheduler(struct task_struct *p, int policy,