From patchwork Fri May 23 18:16:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Rasmussen X-Patchwork-Id: 30849 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8CE1620369 for ; Fri, 23 May 2014 18:18:52 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf11706038ykp.1 for ; Fri, 23 May 2014 11:18:52 -0700 (PDT) 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:content-type :content-transfer-encoding; bh=rVdJKjRSkmx6/A/0Vr5UTJp98SKDu/plW+RegofS4RA=; b=AncTQZuoSKwWdojpu6NbAgYOdtWHUJ6g3kTui3eDOGa7Li1B4do72khFOMKOonG3VW cMAmgiri1x7K2vwVq2vPLsilIjjf8fDtP0oF0gI6zf4AdN1kYuMZuGfC8rV/SCMfoPWH bWLWcuf2fKXe5VF9aQwn+G4v1xiqPrVR8lGz/R5cBkNcDe3YUIScmNZ32lqBve9kfxAz 5Q6G6NmBjRFzR17iOQ9Zps0ZWcVmjIPPYMP86En4qJ8nLBhKcM6TqQumOWioxcJkInjP QjFKNx4MT7nY8DmMYZCsaDVe+50EpCMuWosgnw1f9V6qVX/UQTJcer/fVA8xEeaDeb2D +iyw== X-Gm-Message-State: ALoCoQnkbf7bp65ASTUuWnBtTUWcPj62dLbpj/7nD3BDJnTMRL4DN5AIvRXitquwAPe3+t9QYZfz X-Received: by 10.58.181.68 with SMTP id du4mr2485880vec.15.1400869132219; Fri, 23 May 2014 11:18:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.97 with SMTP id g88ls1947846qgf.40.gmail; Fri, 23 May 2014 11:18:52 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr5743435vcb.0.1400869132087; Fri, 23 May 2014 11:18:52 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id wg9si2124804vcb.30.2014.05.23.11.18.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 11:18:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id db12so6674075veb.39 for ; Fri, 23 May 2014 11:18:51 -0700 (PDT) X-Received: by 10.58.34.72 with SMTP id x8mr75059vei.61.1400869131871; Fri, 23 May 2014 11:18:51 -0700 (PDT) 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.220.221.72 with SMTP id ib8csp52386vcb; Fri, 23 May 2014 11:18:51 -0700 (PDT) X-Received: by 10.68.129.99 with SMTP id nv3mr8072542pbb.128.1400869131002; Fri, 23 May 2014 11:18:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sl5si4982191pab.202.2014.05.23.11.18.50; Fri, 23 May 2014 11:18:50 -0700 (PDT) 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 S1751617AbaEWSQz (ORCPT + 27 others); Fri, 23 May 2014 14:16:55 -0400 Received: from service87.mimecast.com ([91.220.42.44]:35932 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263AbaEWSQv (ORCPT ); Fri, 23 May 2014 14:16:51 -0400 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 23 May 2014 19:16:49 +0100 Received: from e103034-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 May 2014 19:16:48 +0100 From: Morten Rasmussen To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, peterz@infradead.org, mingo@kernel.org Cc: rjw@rjwysocki.net, vincent.guittot@linaro.org, daniel.lezcano@linaro.org, preeti@linux.vnet.ibm.com, dietmar.eggemann@arm.com Subject: [RFC PATCH 03/16] sched: Introduce sd energy data structures Date: Fri, 23 May 2014 19:16:30 +0100 Message-Id: <1400869003-27769-4-git-send-email-morten.rasmussen@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400869003-27769-1-git-send-email-morten.rasmussen@arm.com> References: <1400869003-27769-1-git-send-email-morten.rasmussen@arm.com> X-OriginalArrivalTime: 23 May 2014 18:16:48.0416 (UTC) FILETIME=[297AA200:01CF76B3] X-MC-Unique: 114052319164903901 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: morten.rasmussen@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 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: , From: Dietmar Eggemann The struct sched_energy represents the per scheduler group related data which is needed for the energy aware scheduler. It contains a pointer to a struct capacity_state array which contains (compute capacity, power consumption @ this compute capacity) tuples. The struct sched_group_energy wraps struct sched_energy and an atomic reference counter, latter is used for scheduler internal bookkeeping of data allocation and freeing. Allocation and freeing of struct sched_group_energy uses the existing infrastructure of the scheduler which is currently used for the other sd hierarchy data structures (e.g. struct sched_domain). That's why struct sd_data is provisioned with a per cpu struct sched_group_energy double pointer. The struct sched_group gets a pointer to a struct sched_group_energy. The function ptr sched_domain_energy_f is introduced into struct sched_domain_topology_level which will allow the arch to set a pass a particular struct sd_energy from the topology shim layer into the scheduler core. The function ptr sched_domain_energy_f has an 'int cpu' parameter since the folding of two adjacent sd levels via sd degenerate doesn't work for all sd levels. E.g. it is not possible to use this feature to provide per-cpu sd energy in sd level DIE (former CPU) on ARM's TC2 platform. It was discussed that the folding of sd levels approach is preferable over the cpu parameter approach, simply because the user (the arch specifying the sd topology table) can introduce less errors. But since it is not working, the 'int cpu' parameter is the only way out. It's possible to use the folding of sd levels approach for sched_domain_flags_f and the cpu parameter approach for the sched_domain_energy_f at the same time set-up though. With the use of the 'int cpu' parameter, an extra check function has to be provided to make sure that all cpus spanned by a scheduler building block (e.g a sched domain or a group) are provisioned with the same energy data. Signed-off-by: Dietmar Eggemann --- include/linux/sched.h | 24 ++++++++++++++++++++++++ kernel/sched/sched.h | 10 ++++++++++ 2 files changed, 34 insertions(+) diff --git a/include/linux/sched.h b/include/linux/sched.h index 261a419..4eb149b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -909,6 +909,21 @@ struct sched_domain_attr { extern int sched_domain_level_max; +#ifdef CONFIG_SCHED_ENERGY +struct capacity_state { + int cap; /* compute capacity */ + int power; /* power consumption at this compute capacity */ +}; + +struct sched_energy { + long max_capacity; /* maximal compute capacity */ + int idle_power; /* power consumption in idle state */ + int wakeup_energy; /* energy for wakeup->sleep cycle (x1024) */ + int nr_cap_states; /* number of capacity states */ + struct capacity_state *cap_states; /* ptr to capacity state array */ +}; +#endif + struct sched_group; struct sched_domain { @@ -1007,6 +1022,9 @@ bool cpus_share_cache(int this_cpu, int that_cpu); typedef const struct cpumask *(*sched_domain_mask_f)(int cpu); typedef const int (*sched_domain_flags_f)(void); +#ifdef CONFIG_SCHED_ENERGY +typedef const struct sched_energy *(*sched_domain_energy_f)(int cpu); +#endif #define SDTL_OVERLAP 0x01 @@ -1014,11 +1032,17 @@ struct sd_data { struct sched_domain **__percpu sd; struct sched_group **__percpu sg; struct sched_group_power **__percpu sgp; +#ifdef CONFIG_SCHED_ENERGY + struct sched_group_energy **__percpu sge; +#endif }; struct sched_domain_topology_level { sched_domain_mask_f mask; sched_domain_flags_f sd_flags; +#ifdef CONFIG_SCHED_ENERGY + sched_domain_energy_f energy; +#endif int flags; int numa_level; struct sd_data data; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 456e492..c566f5e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -755,12 +755,22 @@ struct sched_group_power { unsigned long cpumask[0]; /* iteration mask */ }; +#ifdef CONFIG_SCHED_ENERGY +struct sched_group_energy { + atomic_t ref; + struct sched_energy data; +}; +#endif + struct sched_group { struct sched_group *next; /* Must be a circular list */ atomic_t ref; unsigned int group_weight; struct sched_group_power *sgp; +#ifdef CONFIG_SCHED_ENERGY + struct sched_group_energy *sge; +#endif /* * The CPUs this group covers.