From patchwork Fri Oct 19 16:17:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 149292 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3502492lji; Fri, 19 Oct 2018 09:18:02 -0700 (PDT) X-Google-Smtp-Source: ACcGV61IXHnEBdPWaqm2TVSdWIpwp8mSg2SbbuwrBsehAgNum6Nnt2eY4yoNQBpdefb62RusOsWg X-Received: by 2002:a65:4b82:: with SMTP id t2-v6mr1810490pgq.240.1539965882579; Fri, 19 Oct 2018 09:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539965882; cv=none; d=google.com; s=arc-20160816; b=E4+lYrMeVNwUj9pC35dUVmbrCgSdZD5/ApQbb9PG3oaoiGOy1wjXEsaDCd1E39mOXV /jOg0PraxZifzowDTYKXAz0uJbDzSOQZVrtITygD388pebwDN537+7bXU4KGx7KrE8fP OC9PrqDmE/F0GPw8lSsaCH7fL7fKvKadLeK2HkDAh1wVnpOTQVlYl2qqZUe+hh007nkl kSbfzvxcZcPhqKhU7mjT/z4unp29v2shTgwIWes1U9aKTP77XMXfTLBPuKtoeuN1xJRw KzLuCA9TR4UZ1YxigYjOmn3e0zo097RE+WTVnCgyYoA7254gsSSfhGOYJt0WxNei8i3u BoqQ== 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:dkim-signature; bh=oaEkGQ1rlKwLiDv3FIuCYJt+L7qQIIrOC89EmKYAq9Y=; b=Lh1JxTO4GV8lHgtdSmsY7XTKp5HiGWfgcxRjecaQmkMQy/iYH1YVv4r8hLYhIsy0c7 V1B2rksa+KBpOY4WhZGWYX8wvl+ym2/6uNYMx0JE2q9Hzu3WOWDp3tefl6k4QxKK5KtH YxjBfC53lp0t8pMEhhoqZd6fmML+bkNtd4LCpv7PEV5ZrSv9MBqscJt1wX3H9N0bQgJj MJLNFNVK92d/fbiHm+UEbUTGJALBxB5rYqjb8A5VQNstySARLRnt6JyzjvhBRH7LzkcU iWJ6jdK3qveV7crOv5R6hr7pd4Zfm4mqUQR9dLuS8/hXl61ovaPFcQGF6rco9j8Mt8QM OupQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GZQ5q2DT; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be12-v6si24041339plb.347.2018.10.19.09.18.02; Fri, 19 Oct 2018 09:18:02 -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; dkim=pass header.i=@linaro.org header.s=google header.b=GZQ5q2DT; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727950AbeJTAYr (ORCPT + 32 others); Fri, 19 Oct 2018 20:24:47 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36561 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727219AbeJTAYr (ORCPT ); Fri, 19 Oct 2018 20:24:47 -0400 Received: by mail-wr1-f66.google.com with SMTP id y16so38051015wrw.3 for ; Fri, 19 Oct 2018 09:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oaEkGQ1rlKwLiDv3FIuCYJt+L7qQIIrOC89EmKYAq9Y=; b=GZQ5q2DThJ5fdRiJF2HZI0py1F1ckPXm2jh1Qzq/+9D6NIARXVPgCo6Sj5gTgG2HI6 LRDTQN9GxDGGVz9TGVvvncUkE/RcpnuaJI7gU0uapyu4wbmTkUPoOGWadtDkXC1rcb5x QejpBcmyzL4sYVtXIz78xMYr7S/mWlafpNiSc= 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=oaEkGQ1rlKwLiDv3FIuCYJt+L7qQIIrOC89EmKYAq9Y=; b=hj+9m5svljupT6F78AioWJT9SjSJaIWeUBzkdN+vusLHI1Kd5EN0L8t3L4iQyL0JNl Txbnb72P7S/oJUMC4m/XEC0ob4My/oZDqTu/rSnL01twCy3zBnpEAxnigSNFYs6+5jht Ls5LNvUcewCirjQIDOV34EmJXK7VlqFVFtZfXAEGdwtAgq8GoI+7aCdYZ311Kqx7dsPL q/OlJZN97GZWVxJEw52AEbEcqG5aPyDvrBYOCnwyKddCpbiyPt1aEVlt2pcA+xxkWeDN qtvIA+7kelp5Es7q3RciNzrkMTJEGhD3yQ8VBpPL6xtaDgpsm/vD9clI1m3uCfFgmW/K +rIg== X-Gm-Message-State: AGRZ1gJzq8djHh2vE4GdzChA+mZZVchWRCvGJ2DoW9ZBOrBKse+3gPGS ycHqKH0MvHj8ONFMvSP68ZACtg== X-Received: by 2002:adf:b612:: with SMTP id f18-v6mr1215668wre.120.1539965878528; Fri, 19 Oct 2018 09:17:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:f:6020:9024:3180:921a:1e27]) by smtp.gmail.com with ESMTPSA id n11-v6sm17009460wrx.17.2018.10.19.09.17.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Oct 2018 09:17:57 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, dietmar.eggemann@arm.com, Morten.Rasmussen@arm.com, patrick.bellasi@arm.com, pjt@google.com, bsegall@google.com, thara.gopinath@linaro.org, Vincent Guittot Subject: [PATCH 1/2] sched/fair: move rq_of helper function Date: Fri, 19 Oct 2018 18:17:50 +0200 Message-Id: <1539965871-22410-2-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539965871-22410-1-git-send-email-vincent.guittot@linaro.org> References: <1539965871-22410-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move rq_of() helper function so it can be used in pelt.c Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 13 ------------- kernel/sched/sched.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6bd142d..0969ce3 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -248,13 +248,6 @@ const struct sched_class fair_sched_class; */ #ifdef CONFIG_FAIR_GROUP_SCHED - -/* cpu runqueue to which this cfs_rq is attached */ -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return cfs_rq->rq; -} - static inline struct task_struct *task_of(struct sched_entity *se) { SCHED_WARN_ON(!entity_is_task(se)); @@ -411,12 +404,6 @@ static inline struct task_struct *task_of(struct sched_entity *se) return container_of(se, struct task_struct, se); } -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return container_of(cfs_rq, struct rq, cfs); -} - - #define for_each_sched_entity(se) \ for (; se; se = NULL) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3a4ef8f..3990818 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -566,6 +566,22 @@ struct cfs_rq { #endif /* CONFIG_FAIR_GROUP_SCHED */ }; +#ifdef CONFIG_FAIR_GROUP_SCHED + +/* cpu runqueue to which this cfs_rq is attached */ +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return cfs_rq->rq; +} + +#else /* !CONFIG_FAIR_GROUP_SCHED */ + +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return container_of(cfs_rq, struct rq, cfs); +} +#endif + static inline int rt_bandwidth_enabled(void) { return sysctl_sched_rt_runtime >= 0;