From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8764C00A89 for ; Fri, 30 Oct 2020 15:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 27FD322246 for ; Fri, 30 Oct 2020 15:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604071607; bh=xizciLElFY0hheUECrq1f6y1JFeVpY5fGnk8GNPHSUE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=fEW9+ZrIZUjihds4SomYiy5VkgHYnruwcOwmQ8mV0h96Ykhxl0TKdxf+tL9PZFkr7 SjNSrkaN9ahMlYDxCXT5CfJqmejkVdyEKGfzx7uqkTZ0tkzQ75s12TW32Vg9DdZxRW dC/4AyE1FLu8hF+FdaLenKhsk/z4fIGQ9lWig204= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726999AbgJ3P0q (ORCPT ); Fri, 30 Oct 2020 11:26:46 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:41240 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbgJ3P0p (ORCPT ); Fri, 30 Oct 2020 11:26:45 -0400 Received: by mail-oi1-f196.google.com with SMTP id k65so7006156oih.8; Fri, 30 Oct 2020 08:26:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5EQDzHk8IlUo/Q7O0mgQPpOp0accA5iV/LrucZmEgdc=; b=pTBE+rdeElribli3O1mXJSvpsmu8m3VTqFPjKvs9txjTVcgNRV0ukviu1lD4fudUsK bLwrhMIKeS4hnhRvLL6QM/hm0CgU2Lvaw8nmOnibQcuGISF0kiBTc0jDwmUavs5d02Em xmc0BFXofJtb0lmehWiPZG+x3JjQBKOaC1Blbw9HB7WoZqhP/amwalFKq6X89wBhHITl cyd6GjWTLg+7bCfzvsSPRbhOA51H2fKeNhIWSe0Y0XRAS3JMyxMrxJ55oDWeDfXF+21g lvDT6rjhmxdk3geW3GzJ/wcS4j2KlOVQhnNjbZg22PedLFPrHjGVtKbQv+dfVHFZ1fYt AdPw== X-Gm-Message-State: AOAM530datHPvv3GDWvN2KiK1+LhZeFNY1LGvKGmog7JGZEAWGgRZoXR dC1j5Vvft3yP8+H0lgproESJp0gtXWlU5v9whJs= X-Google-Smtp-Source: ABdhPJy7JKMNayUP87P7qDpr/wye21t/8MnbLwLaIOORhFEMPPcV2Ss8hvjhOf3vRORYXAYPbAwsiFVFdFJjEI6t+SQ= X-Received: by 2002:aca:30d7:: with SMTP id w206mr2012412oiw.69.1604071603323; Fri, 30 Oct 2020 08:26:43 -0700 (PDT) MIME-Version: 1.0 References: <20201027180713.7642-1-ionela.voinescu@arm.com> <20201027180713.7642-2-ionela.voinescu@arm.com> In-Reply-To: <20201027180713.7642-2-ionela.voinescu@arm.com> From: "Rafael J. Wysocki" Date: Fri, 30 Oct 2020 16:26:32 +0100 Message-ID: Subject: Re: [PATCH RESEND v2 1/3] sched/topology,schedutil: wrap sched domains rebuild To: Ionela Voinescu Cc: Ingo Molnar , Peter Zijlstra , Vincent Guittot , Catalin Marinas , Will Deacon , "Rafael J. Wysocki" , Viresh Kumar , Dietmar Eggemann , Quentin Perret , Valentin Schneider , Linux PM , Linux ARM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 27, 2020 at 7:08 PM Ionela Voinescu wrote: > > Add the rebuild_sched_domains_energy() function to wrap the functionality > that rebuilds the scheduling domains if any of the Energy Aware Scheduling > (EAS) initialisation conditions change. This functionality is used when > schedutil is added or removed or when EAS is enabled or disabled > through the sched_energy_aware sysctl. > > Therefore, create a single function that is used in both these cases and > that can be later reused. > > Signed-off-by: Ionela Voinescu > Acked-by: Quentin Perret > Cc: Ingo Molnar > Cc: Peter Zijlstra > Cc: Rafael J. Wysocki > Cc: Viresh Kumar For the schedutil part: Acked-by: Rafael J. Wysocki and I'm assuming the patch to be taken care of by Peter. > --- > include/linux/sched/topology.h | 8 ++++++++ > kernel/sched/cpufreq_schedutil.c | 9 +-------- > kernel/sched/topology.c | 18 +++++++++++------- > 3 files changed, 20 insertions(+), 15 deletions(-) > > diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h > index 9ef7bf686a9f..8f0f778b7c91 100644 > --- a/include/linux/sched/topology.h > +++ b/include/linux/sched/topology.h > @@ -225,6 +225,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) > > #endif /* !CONFIG_SMP */ > > +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) > +extern void rebuild_sched_domains_energy(void); > +#else > +static inline void rebuild_sched_domains_energy(void) > +{ > +} > +#endif > + > #ifndef arch_scale_cpu_capacity > /** > * arch_scale_cpu_capacity - get the capacity scale factor of a given CPU. > diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c > index e254745a82cb..37b303890336 100644 > --- a/kernel/sched/cpufreq_schedutil.c > +++ b/kernel/sched/cpufreq_schedutil.c > @@ -899,16 +899,9 @@ struct cpufreq_governor *cpufreq_default_governor(void) > cpufreq_governor_init(schedutil_gov); > > #ifdef CONFIG_ENERGY_MODEL > -extern bool sched_energy_update; > -extern struct mutex sched_energy_mutex; > - > static void rebuild_sd_workfn(struct work_struct *work) > { > - mutex_lock(&sched_energy_mutex); > - sched_energy_update = true; > - rebuild_sched_domains(); > - sched_energy_update = false; > - mutex_unlock(&sched_energy_mutex); > + rebuild_sched_domains_energy(); > } > static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn); > > diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c > index dd7770226086..270bafb73506 100644 > --- a/kernel/sched/topology.c > +++ b/kernel/sched/topology.c > @@ -211,6 +211,15 @@ unsigned int sysctl_sched_energy_aware = 1; > DEFINE_MUTEX(sched_energy_mutex); > bool sched_energy_update; > > +void rebuild_sched_domains_energy(void) > +{ > + mutex_lock(&sched_energy_mutex); > + sched_energy_update = true; > + rebuild_sched_domains(); > + sched_energy_update = false; > + mutex_unlock(&sched_energy_mutex); > +} > + > #ifdef CONFIG_PROC_SYSCTL > int sched_energy_aware_handler(struct ctl_table *table, int write, > void *buffer, size_t *lenp, loff_t *ppos) > @@ -223,13 +232,8 @@ int sched_energy_aware_handler(struct ctl_table *table, int write, > ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); > if (!ret && write) { > state = static_branch_unlikely(&sched_energy_present); > - if (state != sysctl_sched_energy_aware) { > - mutex_lock(&sched_energy_mutex); > - sched_energy_update = 1; > - rebuild_sched_domains(); > - sched_energy_update = 0; > - mutex_unlock(&sched_energy_mutex); > - } > + if (state != sysctl_sched_energy_aware) > + rebuild_sched_domains_energy(); > } > > return ret; > -- > 2.17.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C408DC4363A for ; Fri, 30 Oct 2020 15:27:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2564C20791 for ; Fri, 30 Oct 2020 15:27:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ta4x+RN3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2564C20791 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CCak4xdNXuyO/XKORz/xpuzGLyLdmd5CLumsjF07SPE=; b=Ta4x+RN36qyr3dn2vxYGbLakC /1S9J95DqU5igDepsnbYRanaSQS2Zf+qubP/3hj5tiV06zw1EP0fLT8TfgJ3o4UDYRtzZXQTjDEGi 2Eui+SuU/OEQYaTEaesaDGT1gQ0IqHe2kC3f9U6xYYlbjufhg/B+kNanoU/F9O5tdTE8NbvjI+/XW iChn4wt91LBNnTktX91rsr4FWrxYSQJ970e2+Ab42ih6uz0lVbkjlixXCesKxHqjGtLhvzVehilCK 3U/ltCBU7xTle/3K7P95y7claHZvP1p4gWMqg0Y2kHdDTw9TQsGCrGSfcgrcaq7CZynPVoxBRdIsX YVpxnJ9EQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYWIr-0005uW-0T; Fri, 30 Oct 2020 15:26:57 +0000 Received: from mail-oi1-f196.google.com ([209.85.167.196]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYWIf-0005qe-JS for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 15:26:47 +0000 Received: by mail-oi1-f196.google.com with SMTP id w145so1355608oie.9 for ; Fri, 30 Oct 2020 08:26:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5EQDzHk8IlUo/Q7O0mgQPpOp0accA5iV/LrucZmEgdc=; b=QGdiE1VYlVTEhrqmq4Py36Hjlq0gO2Dm0hFOeJOTW1PClTU6oFV4LLN+ZUCjwNr2gn dnsktLmV74X/gGabQT7HRf3IFhAvzF+mYiMcJ5LINy8+rYSv+HQyhilv3cVRTJIOn1jd gRExUQGTuebm/nuBOCkiot5IiOm2YVJZZN9QABWcMGSOo+Wd+tCOvcYQCUyW27b1DAE8 Egk2Mr5FMUNIq991mFMXDWNqyEvNjYtfQbTMcTnh1idMVn8RG9YgWQq5m6Ffnamziamv kWa6Qme7r3HZjbpzqClG9NMcv3tibbzYj6+HMD+u/zOunjeloNBybck87jOp86TTqJ/L HnAA== X-Gm-Message-State: AOAM532v5VqKoYFKVgRPVS2YHWYJRjiVz6HPMXrDNn3J1f/Na+JIZLqB T5a1ZG2OyAyYpNBeVcq3hB3MiSQ8H6iPJSEw8h8= X-Google-Smtp-Source: ABdhPJy7JKMNayUP87P7qDpr/wye21t/8MnbLwLaIOORhFEMPPcV2Ss8hvjhOf3vRORYXAYPbAwsiFVFdFJjEI6t+SQ= X-Received: by 2002:aca:30d7:: with SMTP id w206mr2012412oiw.69.1604071603323; Fri, 30 Oct 2020 08:26:43 -0700 (PDT) MIME-Version: 1.0 References: <20201027180713.7642-1-ionela.voinescu@arm.com> <20201027180713.7642-2-ionela.voinescu@arm.com> In-Reply-To: <20201027180713.7642-2-ionela.voinescu@arm.com> From: "Rafael J. Wysocki" Date: Fri, 30 Oct 2020 16:26:32 +0100 Message-ID: Subject: Re: [PATCH RESEND v2 1/3] sched/topology,schedutil: wrap sched domains rebuild To: Ionela Voinescu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_112645_791535_D7E11D54 X-CRM114-Status: GOOD ( 24.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Guittot , Quentin Perret , Peter Zijlstra , Catalin Marinas , Linux PM , "Rafael J. Wysocki" , Linux Kernel Mailing List , Valentin Schneider , Ingo Molnar , Viresh Kumar , Will Deacon , Dietmar Eggemann , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Oct 27, 2020 at 7:08 PM Ionela Voinescu wrote: > > Add the rebuild_sched_domains_energy() function to wrap the functionality > that rebuilds the scheduling domains if any of the Energy Aware Scheduling > (EAS) initialisation conditions change. This functionality is used when > schedutil is added or removed or when EAS is enabled or disabled > through the sched_energy_aware sysctl. > > Therefore, create a single function that is used in both these cases and > that can be later reused. > > Signed-off-by: Ionela Voinescu > Acked-by: Quentin Perret > Cc: Ingo Molnar > Cc: Peter Zijlstra > Cc: Rafael J. Wysocki > Cc: Viresh Kumar For the schedutil part: Acked-by: Rafael J. Wysocki and I'm assuming the patch to be taken care of by Peter. > --- > include/linux/sched/topology.h | 8 ++++++++ > kernel/sched/cpufreq_schedutil.c | 9 +-------- > kernel/sched/topology.c | 18 +++++++++++------- > 3 files changed, 20 insertions(+), 15 deletions(-) > > diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h > index 9ef7bf686a9f..8f0f778b7c91 100644 > --- a/include/linux/sched/topology.h > +++ b/include/linux/sched/topology.h > @@ -225,6 +225,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) > > #endif /* !CONFIG_SMP */ > > +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) > +extern void rebuild_sched_domains_energy(void); > +#else > +static inline void rebuild_sched_domains_energy(void) > +{ > +} > +#endif > + > #ifndef arch_scale_cpu_capacity > /** > * arch_scale_cpu_capacity - get the capacity scale factor of a given CPU. > diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c > index e254745a82cb..37b303890336 100644 > --- a/kernel/sched/cpufreq_schedutil.c > +++ b/kernel/sched/cpufreq_schedutil.c > @@ -899,16 +899,9 @@ struct cpufreq_governor *cpufreq_default_governor(void) > cpufreq_governor_init(schedutil_gov); > > #ifdef CONFIG_ENERGY_MODEL > -extern bool sched_energy_update; > -extern struct mutex sched_energy_mutex; > - > static void rebuild_sd_workfn(struct work_struct *work) > { > - mutex_lock(&sched_energy_mutex); > - sched_energy_update = true; > - rebuild_sched_domains(); > - sched_energy_update = false; > - mutex_unlock(&sched_energy_mutex); > + rebuild_sched_domains_energy(); > } > static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn); > > diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c > index dd7770226086..270bafb73506 100644 > --- a/kernel/sched/topology.c > +++ b/kernel/sched/topology.c > @@ -211,6 +211,15 @@ unsigned int sysctl_sched_energy_aware = 1; > DEFINE_MUTEX(sched_energy_mutex); > bool sched_energy_update; > > +void rebuild_sched_domains_energy(void) > +{ > + mutex_lock(&sched_energy_mutex); > + sched_energy_update = true; > + rebuild_sched_domains(); > + sched_energy_update = false; > + mutex_unlock(&sched_energy_mutex); > +} > + > #ifdef CONFIG_PROC_SYSCTL > int sched_energy_aware_handler(struct ctl_table *table, int write, > void *buffer, size_t *lenp, loff_t *ppos) > @@ -223,13 +232,8 @@ int sched_energy_aware_handler(struct ctl_table *table, int write, > ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); > if (!ret && write) { > state = static_branch_unlikely(&sched_energy_present); > - if (state != sysctl_sched_energy_aware) { > - mutex_lock(&sched_energy_mutex); > - sched_energy_update = 1; > - rebuild_sched_domains(); > - sched_energy_update = 0; > - mutex_unlock(&sched_energy_mutex); > - } > + if (state != sysctl_sched_energy_aware) > + rebuild_sched_domains_energy(); > } > > return ret; > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel