From: Lukasz Luba <lukasz.luba@arm.com>
To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
rafael@kernel.org
Cc: lukasz.luba@arm.com, dietmar.eggemann@arm.com,
rui.zhang@intel.com, amit.kucheria@verdurent.com,
amit.kachhap@gmail.com, daniel.lezcano@linaro.org,
viresh.kumar@linaro.org, len.brown@intel.com, pavel@ucw.cz,
mhiramat@kernel.org, qyousef@layalina.io, wvw@google.com
Subject: [PATCH v5 21/23] PM: EM: Remove old table
Date: Wed, 29 Nov 2023 11:08:51 +0000 [thread overview]
Message-ID: <20231129110853.94344-22-lukasz.luba@arm.com> (raw)
In-Reply-To: <20231129110853.94344-1-lukasz.luba@arm.com>
Remove the old EM table which wasn't able to modify the data. Clean the
unneeded function and refactor the code a bit.
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
---
include/linux/energy_model.h | 2 --
kernel/power/energy_model.c | 47 ++++++------------------------------
2 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
index 0f5621898a81..9c47388482a0 100644
--- a/include/linux/energy_model.h
+++ b/include/linux/energy_model.h
@@ -53,7 +53,6 @@ struct em_perf_table {
/**
* struct em_perf_domain - Performance domain
- * @table: List of performance states, in ascending order
* @runtime_table: Pointer to the runtime modifiable em_perf_table
* @nr_perf_states: Number of performance states
* @flags: See "em_perf_domain flags"
@@ -69,7 +68,6 @@ struct em_perf_table {
* field is unused.
*/
struct em_perf_domain {
- struct em_perf_state *table;
struct em_perf_table __rcu *runtime_table;
int nr_perf_states;
unsigned long flags;
diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index cc47993b4d64..234823c0e59d 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -286,17 +286,6 @@ static int em_compute_costs(struct device *dev, struct em_perf_state *table,
return 0;
}
-static int em_allocate_perf_table(struct em_perf_domain *pd,
- int nr_states)
-{
- pd->table = kcalloc(nr_states, sizeof(struct em_perf_state),
- GFP_KERNEL);
- if (!pd->table)
- return -ENOMEM;
-
- return 0;
-}
-
/**
* em_dev_update_perf_domain() - Update runtime EM table for a device
* @dev : Device for which the EM is to be updated
@@ -343,24 +332,6 @@ int em_dev_update_perf_domain(struct device *dev,
}
EXPORT_SYMBOL_GPL(em_dev_update_perf_domain);
-static int em_create_runtime_table(struct em_perf_domain *pd)
-{
- struct em_perf_table __rcu *runtime_table;
- int table_size;
-
- runtime_table = em_allocate_table(pd);
- if (!runtime_table)
- return -ENOMEM;
-
- /* Initialize runtime table with existing data */
- table_size = sizeof(struct em_perf_state) * pd->nr_perf_states;
- memcpy(runtime_table->state, pd->table, table_size);
-
- rcu_assign_pointer(pd->runtime_table, runtime_table);
-
- return 0;
-}
-
static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd,
struct em_perf_state *table,
int nr_states, struct em_data_callback *cb,
@@ -420,6 +391,7 @@ static int em_create_pd(struct device *dev, int nr_states,
struct em_data_callback *cb, cpumask_t *cpus,
unsigned long flags)
{
+ struct em_perf_table __rcu *runtime_table;
struct em_perf_domain *pd;
struct device *cpu_dev;
int cpu, ret, num_cpus;
@@ -446,17 +418,16 @@ static int em_create_pd(struct device *dev, int nr_states,
pd->nr_perf_states = nr_states;
- ret = em_allocate_perf_table(pd, nr_states);
- if (ret)
+ runtime_table = em_allocate_table(pd);
+ if (!runtime_table)
goto free_pd;
- ret = em_create_perf_table(dev, pd, pd->table, nr_states, cb, flags);
+ ret = em_create_perf_table(dev, pd, runtime_table->state,
+ nr_states, cb, flags);
if (ret)
goto free_pd_table;
- ret = em_create_runtime_table(pd);
- if (ret)
- goto free_pd_table;
+ rcu_assign_pointer(pd->runtime_table, runtime_table);
if (_is_cpu_device(dev))
for_each_cpu(cpu, cpus) {
@@ -469,7 +440,7 @@ static int em_create_pd(struct device *dev, int nr_states,
return 0;
free_pd_table:
- kfree(pd->table);
+ kfree(runtime_table);
free_pd:
kfree(pd);
return -EINVAL;
@@ -640,7 +611,7 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
dev->em_pd->flags |= flags;
- em_cpufreq_update_efficiencies(dev, dev->em_pd->table);
+ em_cpufreq_update_efficiencies(dev, dev->em_pd->runtime_table->state);
em_debug_create_pd(dev);
dev_info(dev, "EM: created perf domain\n");
@@ -677,8 +648,6 @@ void em_dev_unregister_perf_domain(struct device *dev)
mutex_lock(&em_pd_mutex);
em_debug_remove_pd(dev);
- kfree(dev->em_pd->table);
-
em_free_table(dev->em_pd->runtime_table);
kfree(dev->em_pd);
--
2.25.1
next prev parent reply other threads:[~2023-11-29 11:11 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 11:08 [PATCH v5 00/23] Introduce runtime modifiable Energy Model Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 01/23] PM: EM: Add missing newline for the message log Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 02/23] PM: EM: Refactor em_cpufreq_update_efficiencies() arguments Lukasz Luba
2023-12-17 17:58 ` Qais Yousef
2023-12-19 10:30 ` Lukasz Luba
2023-12-28 16:59 ` Qais Yousef
2024-01-02 9:40 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 03/23] PM: EM: Find first CPU active while updating OPP efficiency Lukasz Luba
2023-12-17 17:58 ` Qais Yousef
2023-12-19 10:53 ` Lukasz Luba
2023-12-28 17:13 ` Qais Yousef
2024-01-02 9:42 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 04/23] PM: EM: Refactor em_pd_get_efficient_state() to be more flexible Lukasz Luba
2023-12-12 18:49 ` Dietmar Eggemann
2023-12-19 10:58 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 05/23] PM: EM: Refactor a new function em_compute_costs() Lukasz Luba
2023-12-17 17:58 ` Qais Yousef
2023-12-19 10:59 ` Lukasz Luba
2023-12-28 17:14 ` Qais Yousef
2024-01-02 9:43 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 06/23] PM: EM: Check if the get_cost() callback is present in em_compute_costs() Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 07/23] PM: EM: Refactor how the EM table is allocated and populated Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-19 13:19 ` Lukasz Luba
2023-12-17 17:59 ` Qais Yousef
2023-11-29 11:08 ` [PATCH v5 08/23] PM: EM: Introduce runtime modifiable table Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-19 11:33 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 09/23] PM: EM: Use runtime modified EM for CPUs energy estimation in EAS Lukasz Luba
2023-12-17 17:59 ` Qais Yousef
2023-12-19 4:03 ` Xuewen Yan
2023-12-19 8:32 ` Lukasz Luba
2023-12-28 17:32 ` Qais Yousef
2024-01-02 11:17 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 10/23] PM: EM: Add API for memory allocations for new tables Lukasz Luba
2023-12-17 17:59 ` Qais Yousef
2023-12-19 8:45 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 11/23] PM: EM: Add API for updating the runtime modifiable EM Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-20 8:06 ` Lukasz Luba
2024-01-04 15:45 ` Dietmar Eggemann
2024-01-04 16:55 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 12/23] PM: EM: Add helpers to read under RCU lock the EM table Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 13/23] PM: EM: Add performance field to struct em_perf_state Lukasz Luba
2023-12-17 18:00 ` Qais Yousef
2023-12-20 8:21 ` Lukasz Luba
2023-12-28 17:45 ` Qais Yousef
2023-11-29 11:08 ` [PATCH v5 14/23] PM: EM: Support late CPUs booting and capacity adjustment Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-20 8:23 ` Lukasz Luba
2023-12-17 18:00 ` Qais Yousef
2024-01-02 11:39 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 15/23] PM: EM: Optimize em_cpu_energy() and remove division Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-20 8:42 ` Lukasz Luba
2024-01-04 16:30 ` Dietmar Eggemann
2024-01-04 16:56 ` Lukasz Luba
2023-12-28 18:06 ` Qais Yousef
2024-01-02 11:47 ` Lukasz Luba
2024-01-04 19:23 ` Qais Yousef
2024-01-10 13:53 ` Lukasz Luba
2024-01-15 12:21 ` Qais Yousef
2024-01-15 12:36 ` Lukasz Luba
2024-01-16 13:10 ` Qais Yousef
2024-01-16 15:34 ` Lukasz Luba
2024-01-16 19:33 ` Qais Yousef
2023-11-29 11:08 ` [PATCH v5 16/23] powercap/dtpm_cpu: Use new Energy Model interface to get table Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 17/23] powercap/dtpm_devfreq: " Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 18/23] drivers/thermal/cpufreq_cooling: Use new Energy Model interface Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 19/23] drivers/thermal/devfreq_cooling: " Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 20/23] PM: EM: Change debugfs configuration to use runtime EM table data Lukasz Luba
2023-11-29 11:08 ` Lukasz Luba [this message]
2023-11-29 11:08 ` [PATCH v5 22/23] PM: EM: Add em_dev_compute_costs() as API for device drivers Lukasz Luba
2023-12-12 18:50 ` Dietmar Eggemann
2023-12-17 18:03 ` Qais Yousef
2023-12-18 11:56 ` Lukasz Luba
2023-12-20 11:14 ` Lukasz Luba
2023-11-29 11:08 ` [PATCH v5 23/23] Documentation: EM: Update with runtime modification design Lukasz Luba
2023-12-12 18:51 ` Dietmar Eggemann
2023-12-19 9:35 ` Lukasz Luba
2023-12-19 4:42 ` Xuewen Yan
2023-12-19 8:47 ` Lukasz Luba
2023-12-19 6:22 ` Xuewen Yan
2023-12-19 9:32 ` Lukasz Luba
2023-12-20 2:08 ` Xuewen Yan
2023-12-20 7:57 ` Lukasz Luba
2023-12-12 18:48 ` [PATCH v5 00/23] Introduce runtime modifiable Energy Model Dietmar Eggemann
2023-12-13 9:23 ` Lukasz Luba
2023-12-13 11:34 ` Dietmar Eggemann
2023-12-13 11:45 ` Rafael J. Wysocki
2023-12-13 12:20 ` Lukasz Luba
2023-12-12 18:49 ` Rafael J. Wysocki
2023-12-13 9:32 ` Lukasz Luba
2023-12-13 13:40 ` Hongyan Xia
2023-12-13 13:16 ` Lukasz Luba
2023-12-17 18:22 ` Qais Yousef
2023-12-19 10:22 ` Lukasz Luba
2023-12-28 18:41 ` Qais Yousef
2024-01-02 12:12 ` Lukasz Luba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129110853.94344-22-lukasz.luba@arm.com \
--to=lukasz.luba@arm.com \
--cc=amit.kachhap@gmail.com \
--cc=amit.kucheria@verdurent.com \
--cc=daniel.lezcano@linaro.org \
--cc=dietmar.eggemann@arm.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=pavel@ucw.cz \
--cc=qyousef@layalina.io \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=viresh.kumar@linaro.org \
--cc=wvw@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®