Skip to contentSkip to conversation

PM: EM: Two cleanups related to em_check_capacity_update()

PATCH In review Rafael J. Wysocki 2 participants 5 messages Jan 27, 2025 – Feb 10, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover PM: EM: Two cleanups related to em_check_capacity_update()

Hi Everyone,

The first of these patches gets rid of an unused function parameter and the other one reduces em_check_capacity_update() a bit.

Thanks!

#1 lore raw

PATCH 1/2 PM: EM: Drop unused parameter from em_adjust_new_capacity()

From: Rafael J. Wysocki <[email protected]>

The max_cap parameter is never used in em_adjust_new_capacity(), so drop it.

No functional impact.

---
 kernel/power/energy_model.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/power/energy_model.c +2 -3
@@ -728,8 +728,7 @@
  * are correctly calculated.
  */
 static void em_adjust_new_capacity(struct device *dev,
-				   struct em_perf_domain *pd,
-				   u64 max_cap)
+				   struct em_perf_domain *pd)
 {
 	struct em_perf_table __rcu *em_table;
 
@@ -800,7 +799,7 @@
 			 cpu, cpu_capacity, em_max_perf);
 
 		dev = get_cpu_device(cpu);
-		em_adjust_new_capacity(dev, pd, cpu_capacity);
+		em_adjust_new_capacity(dev, pd);
 	}
 
 	free_cpumask_var(cpu_done_mask);
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH v1 1/2] PM: EM: Drop unused parameter from em_adjust_new_capacity()

Quoted 28 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The max_cap parameter is never used in em_adjust_new_capacity(), so drop it.

No functional impact.

---
  kernel/power/energy_model.c |    5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
kernel/power/energy_model.c +1 -2
@@ -728,8 +728,7 @@
   * are correctly calculated.
   */
  static void em_adjust_new_capacity(struct device *dev,
-				   struct em_perf_domain *pd,
-				   u64 max_cap)
+				   struct em_perf_domain *pd)
  {
  	struct em_perf_table __rcu *em_table;
 

kernel/power/energy_model.c line 805

Quoted 8 lines
kernel/power/energy_model.c +1 -1
@@ -800,7 +799,7 @@
  			 cpu, cpu_capacity, em_max_perf);
 
  		dev = get_cpu_device(cpu);
-		em_adjust_new_capacity(dev, pd, cpu_capacity);
+		em_adjust_new_capacity(dev, pd);
  	}
 
  	free_cpumask_var(cpu_done_mask);

LGTM

#3 lore raw

PATCH 2/2 PM: EM: Slightly reduce em_check_capacity_update() overhead

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Every iteration of the loop over all possible CPUs in em_check_capacity_update() causes get_cpu_device() to be called twice for the same CPU, once indirectly via em_cpu_get() and once directly.

Get rid of the indirect get_cpu_device() call by moving the direct invocation of it earlier and using em_pd_get() instead of em_cpu_get() to get a pd pointer for the dev one returned by it.

This also exposes the fact that dev is needed to get a pd, so the code becomes somewhat easier to follow after it.

No functional impact.

---
 kernel/power/energy_model.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/power/energy_model.c +2 -2
@@ -774,7 +774,8 @@
 		}
 		cpufreq_cpu_put(policy);
 
-		pd = em_cpu_get(cpu);
+		dev = get_cpu_device(cpu);
+		pd = em_pd_get(dev);
 		if (!pd || em_is_artificial(pd))
 			continue;
 
@@ -798,7 +799,6 @@
 		pr_debug("updating cpu%d cpu_cap=%lu old capacity=%lu\n",
 			 cpu, cpu_capacity, em_max_perf);
 
-		dev = get_cpu_device(cpu);
 		em_adjust_new_capacity(dev, pd);
 	}
 
maintainer Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH v1 2/2] PM: EM: Slightly reduce em_check_capacity_update() overhead

Quoted 36 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Every iteration of the loop over all possible CPUs in em_check_capacity_update() causes get_cpu_device() to be called twice for the same CPU, once indirectly via em_cpu_get() and once directly.

Get rid of the indirect get_cpu_device() call by moving the direct invocation of it earlier and using em_pd_get() instead of em_cpu_get() to get a pd pointer for the dev one returned by it.

This also exposes the fact that dev is needed to get a pd, so the code becomes somewhat easier to follow after it.

No functional impact.

---
  kernel/power/energy_model.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
kernel/power/energy_model.c +2 -1
@@ -774,7 +774,8 @@
  		}
  		cpufreq_cpu_put(policy);
 
-		pd = em_cpu_get(cpu);
+		dev = get_cpu_device(cpu);
+		pd = em_pd_get(dev);
  		if (!pd || em_is_artificial(pd))
  			continue;
 

kernel/power/energy_model.c line 804

Quoted 7 lines
kernel/power/energy_model.c +0 -1
@@ -798,7 +799,6 @@
  		pr_debug("updating cpu%d cpu_cap=%lu old capacity=%lu\n",
  			 cpu, cpu_capacity, em_max_perf);
 
-		dev = get_cpu_device(cpu);
  		em_adjust_new_capacity(dev, pd);
  	}
 

LGTM