From patchwork Thu Oct 4 07:42:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 148106 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp618748lji; Thu, 4 Oct 2018 00:42:20 -0700 (PDT) X-Google-Smtp-Source: ACcGV62scUTnguzPL1Gn2Feld8XAlbaBH+s2wx/SkQY+mTz4jqH5N6eL3re+WS2CUPCom5uaQ0ZN X-Received: by 2002:a63:e05:: with SMTP id d5-v6mr4597414pgl.272.1538638939884; Thu, 04 Oct 2018 00:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538638939; cv=none; d=google.com; s=arc-20160816; b=pYLbvey6hx8ba8vIDZ8+tIdfcnlxUGC8WZNVl6pTHViK5VpRYu55R6iJhaioCN7Dc6 hdpUAFnLU3AwH/vVNFGMeS2X5IyQnKdFvuTKtJIWD89RnR1rEAAntYJbjAT+fEUpIWIP YP3JM25oJqtmU8p+HwHF3nZN8nKXwtFHla+JTTDXLX+yU6G+sMJcBl+S5A7wah8WjkxF 6oaSHWUiJxwHduTA4wZ8qvdwbXCTbd5zfaM9c7rQeJ5P4e11hqCxA5kw2AKNE6ZCp/+S CZ/qrfdqvLhLOa9YBMeGrgVi74muzVeie3UMRRlV1XfF5843goYnWoU4lsIaditLnh2w R11A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=G8KE0KJrHfkVSbRNTnKXaz2S9vIBp4IhY5kWUCvJkJ0=; b=ZVvCmv5o+DwZTQ9ts3nfSPQsUa2ZGkaDrkbjJQfklDlfeI9uksT4yEqwxfAjBQEW5W TnV/vA4HE7NiVZNp6S4e1xE0157y7v83+g6nY8EhnEeYckRIsaJuR2fENeTrOvObuSvi wmATpz3SmnEc+n0s55Nl9LSDzt4Up3yd5rPqzsA1ze9ZArJo1e9RfDp6LqjGbrCOj1hG aXW/4cks6DnciJbZIzWxem49wN3iYhzplE66zj6J7GDXbA3hSijtKrN4JeUsi1oyayC3 m3PtMmw48nozLhZsMdpxghS62U4mPQ0RZO1kzfPnIVIcz9pBo0TUgIdNpRRmbfiiGbjo 9DFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YwIkZU5/"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 e3-v6si3889249pgg.530.2018.10.04.00.42.19; Thu, 04 Oct 2018 00:42:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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="YwIkZU5/"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1727477AbeJDOeM (ORCPT + 10 others); Thu, 4 Oct 2018 10:34:12 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41548 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727264AbeJDOeM (ORCPT ); Thu, 4 Oct 2018 10:34:12 -0400 Received: by mail-wr1-f68.google.com with SMTP id x12-v6so8736734wru.8 for ; Thu, 04 Oct 2018 00:42:17 -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; bh=G8KE0KJrHfkVSbRNTnKXaz2S9vIBp4IhY5kWUCvJkJ0=; b=YwIkZU5/OolhcvzAXeCYyF0DsU1328A0Iagqn37qvWYimqLwH1Esl0Z2HVGQ+ohfiS 5xCMZHcbu8N+wswCi/A7ZvRFRpg6+kFejCjVaeLJo5XRlQ+2r8IKsIcF3m275EF3kk7u h88oQlbeoAOClDWaSa8RDGB0nZBs9xybVnLVQ= 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; bh=G8KE0KJrHfkVSbRNTnKXaz2S9vIBp4IhY5kWUCvJkJ0=; b=qpnVGPAfXRTIPHDXoPQsqs5cY6Zvk9moAVfjo62NKYQm9A3UdsTjCrcBckFCmY1OR0 Vi8YeF4RJZ6rLu0q+LInPraQowZdmEZjV2Sqn16tbJSpeeA7dONmDOtcUYVIllmxUVQe wWwFqQ831emJf9Z3GGXh+I1RxdvhtWTn/YFE5+LsIC8ODui2yQC2NiGqw1jLx0xm+hxa wypK+hnB/re9kFMzeVC8aEq/rqe53uxILbOrWQBtw1k7DPw3ypoUTdXm6qcUnRcV+sD/ N/UWsflg8tlslevnh1QWKT65YIoWsqq0ngJjkGKZXjkWjik4EWk0sV9Nnq6LBn0IEeQM Y5FQ== X-Gm-Message-State: ABuFfojyDBZRxX0rKuRrHE3TlsNVfwNouAY/ezla5qKeVWDX2TUyi3L0 wAuG8XwhRWbsFYYDCO99ZiZIq8lA4cg= X-Received: by 2002:a5d:404b:: with SMTP id w11-v6mr3564889wrp.147.1538638936523; Thu, 04 Oct 2018 00:42:16 -0700 (PDT) Received: from localhost.localdomain (225.182.88.92.rev.sfr.net. [92.88.182.225]) by smtp.gmail.com with ESMTPSA id t82-v6sm651579wme.30.2018.10.04.00.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Oct 2018 00:42:15 -0700 (PDT) From: Daniel Lezcano To: rafael@kernel.org Cc: rjw@rjwysocki.net, linux-pm@vger.kernel.org, Ingo Molnar , Peter Zijlstra , linux-kernel@vger.kernel.org (open list:SCHEDULER) Subject: [PATCH 1/2] sched: Factor out nr_iowait and nr_iowait_cpu Date: Thu, 4 Oct 2018 09:42:06 +0200 Message-Id: <1538638927-26846-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The function nr_iowait_cpu() can be used directly by nr_iowait() instead of duplicating code. Call nr_iowait_cpu() from nr_iowait() Signed-off-by: Daniel Lezcano --- kernel/sched/core.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) -- 2.7.4 Reviewed-by: Rafael J. Wysocki diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 625bc98..b88a145 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2873,6 +2873,24 @@ unsigned long long nr_context_switches(void) return sum; } +/* + * Consumers of these two interfaces, like for example the cpufreq menu + * governor are using nonsensical data. Boosting frequency for a CPU that has + * IO-wait which might not even end up running the task when it does become + * runnable. + */ + +unsigned long nr_iowait_cpu(int cpu) +{ + return atomic_read(&cpu_rq(cpu)->nr_iowait); +} + +void get_iowait_load(unsigned long *nr_waiters, unsigned long *load) +{ + struct rq *rq = this_rq(); + *nr_waiters = atomic_read(&rq->nr_iowait); + *load = rq->load.weight; +} /* * IO-wait accounting, and how its mostly bollocks (on SMP). @@ -2909,31 +2927,11 @@ unsigned long nr_iowait(void) unsigned long i, sum = 0; for_each_possible_cpu(i) - sum += atomic_read(&cpu_rq(i)->nr_iowait); + sum += nr_iowait_cpu(i); return sum; } -/* - * Consumers of these two interfaces, like for example the cpufreq menu - * governor are using nonsensical data. Boosting frequency for a CPU that has - * IO-wait which might not even end up running the task when it does become - * runnable. - */ - -unsigned long nr_iowait_cpu(int cpu) -{ - struct rq *this = cpu_rq(cpu); - return atomic_read(&this->nr_iowait); -} - -void get_iowait_load(unsigned long *nr_waiters, unsigned long *load) -{ - struct rq *rq = this_rq(); - *nr_waiters = atomic_read(&rq->nr_iowait); - *load = rq->load.weight; -} - #ifdef CONFIG_SMP /*