Skip to contentSkip to conversation

ACPI: platform_profile: Optimize _aggregate_choices()

PATCH Superseded Kurt Borja 3 participants 4 messages Mar 22, 2025 – Mar 25, 2025 ACPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Kurt Borja

author
#0 lore raw

PATCH 1/1 ACPI: platform_profile: Optimize _aggregate_choices()

Choices aggregates passed to _aggregate_choices() are already filled with ones, therefore we can avoid copying a new bitmap on the first iteration.

This makes setting the PLATFORM_PROFILE_LAST bit on aggregates unnecessary, so drop it as well.

While at it, add a couple empty lines to improve style.

---
 drivers/acpi/platform_profile.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/acpi/platform_profile.c +3 -7
index ef9444482db1982b19d2a17884e1c3ab0e5cb55c..b5b24b075af6dfa612d56eb95342c6af87a60d3e 100644
@@ -256,12 +256,10 @@ static int _aggregate_choices(struct device *dev, void *arg)
 	struct platform_profile_handler *handler;
 
 	lockdep_assert_held(&profile_lock);
+
 	handler = to_pprof_handler(dev);
 	bitmap_or(tmp, handler->choices, handler->hidden_choices, PLATFORM_PROFILE_LAST);
-	if (test_bit(PLATFORM_PROFILE_LAST, data->aggregate))
-		bitmap_copy(data->aggregate, tmp, PLATFORM_PROFILE_LAST);
-	else
-		bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
+	bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
 	data->count++;
 
 	return 0;
@@ -305,7 +303,6 @@ static ssize_t platform_profile_choices_show(struct device *dev,
 	};
 	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
 	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
 		err = class_for_each_device(&platform_profile_class, NULL,
 					    &data, _aggregate_choices);
@@ -422,7 +419,7 @@ static ssize_t platform_profile_store(struct device *dev,
 	i = sysfs_match_string(profile_names, buf);
 	if (i < 0 || i == PLATFORM_PROFILE_CUSTOM)
 		return -EINVAL;
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
+
 	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
 		ret = class_for_each_device(&platform_profile_class, NULL,
 					    &data, _aggregate_choices);
@@ -502,7 +499,6 @@ int platform_profile_cycle(void)
 	enum platform_profile_option profile = PLATFORM_PROFILE_LAST;
 	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
 	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
 		err = class_for_each_device(&platform_profile_class, NULL,
 					    &profile, _aggregate_profiles);

---
base-commit: 9a43102daf64dd0d172d8b39836dbc1dba4da1ea
change-id: 20250322-pprof-opt-caa7f7f349b8

Best regards,

Signature · 1 line
Kurt Borja <[email protected]>
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Kurt Borja

Choices aggregates passed to _aggregate_choices() are already filled with ones, therefore we can avoid copying a new bitmap on the first iteration.

This makes setting the PLATFORM_PROFILE_LAST bit on aggregates unnecessary, so drop it as well.

While at it, add a couple empty lines to improve style.

Good find! This optimization is valid because of the changes in

commit 778b94d7ac17b ("ACPI: platform_profile: Add support for hidden choices")

Quoted 54 lines
---
  drivers/acpi/platform_profile.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/acpi/platform_profile.c +3 -8
index ef9444482db1982b19d2a17884e1c3ab0e5cb55c..b5b24b075af6dfa612d56eb95342c6af87a60d3e 100644
@@ -256,12 +256,10 @@ static int _aggregate_choices(struct device *dev, void *arg)
  	struct platform_profile_handler *handler;
 
  	lockdep_assert_held(&profile_lock);
+
  	handler = to_pprof_handler(dev);
  	bitmap_or(tmp, handler->choices, handler->hidden_choices, PLATFORM_PROFILE_LAST);
-	if (test_bit(PLATFORM_PROFILE_LAST, data->aggregate))
-		bitmap_copy(data->aggregate, tmp, PLATFORM_PROFILE_LAST);
-	else
-		bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
+	bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
  	data->count++;
 
  	return 0;
@@ -305,7 +303,6 @@ static ssize_t platform_profile_choices_show(struct device *dev,
  	};
  	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		err = class_for_each_device(&platform_profile_class, NULL,
  					    &data, _aggregate_choices);
@@ -422,7 +419,7 @@ static ssize_t platform_profile_store(struct device *dev,
  	i = sysfs_match_string(profile_names, buf);
  	if (i < 0 || i == PLATFORM_PROFILE_CUSTOM)
  		return -EINVAL;
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
+
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		ret = class_for_each_device(&platform_profile_class, NULL,
  					    &data, _aggregate_choices);
@@ -502,7 +499,6 @@ int platform_profile_cycle(void)
  	enum platform_profile_option profile = PLATFORM_PROFILE_LAST;
  	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		err = class_for_each_device(&platform_profile_class, NULL,
  					    &profile, _aggregate_profiles);
 
---

base-commit: 9a43102daf64dd0d172d8b39836dbc1dba4da1ea
change-id: 20250322-pprof-opt-caa7f7f349b8

Best regards,

Reviewed-by on v1 1/1
#2 lore raw
In reply to Kurt Borja

Am 22.03.25 um 22:03 schrieb Kurt Borja:

Quoted 9 lines

Choices aggregates passed to _aggregate_choices() are already filled with ones, therefore we can avoid copying a new bitmap on the first iteration.

This makes setting the PLATFORM_PROFILE_LAST bit on aggregates unnecessary, so drop it as well.

While at it, add a couple empty lines to improve style.

Please add a comment to signal future developers that the bitmap needs to be filled with ones before being passed to _aggregate_choices().

With this being addressed:

Quoted 55 lines
---
  drivers/acpi/platform_profile.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/acpi/platform_profile.c +3 -8
index ef9444482db1982b19d2a17884e1c3ab0e5cb55c..b5b24b075af6dfa612d56eb95342c6af87a60d3e 100644
@@ -256,12 +256,10 @@ static int _aggregate_choices(struct device *dev, void *arg)
  	struct platform_profile_handler *handler;
 
  	lockdep_assert_held(&profile_lock);
+
  	handler = to_pprof_handler(dev);
  	bitmap_or(tmp, handler->choices, handler->hidden_choices, PLATFORM_PROFILE_LAST);
-	if (test_bit(PLATFORM_PROFILE_LAST, data->aggregate))
-		bitmap_copy(data->aggregate, tmp, PLATFORM_PROFILE_LAST);
-	else
-		bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
+	bitmap_and(data->aggregate, tmp, data->aggregate, PLATFORM_PROFILE_LAST);
  	data->count++;
 
  	return 0;
@@ -305,7 +303,6 @@ static ssize_t platform_profile_choices_show(struct device *dev,
  	};
  	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		err = class_for_each_device(&platform_profile_class, NULL,
  					    &data, _aggregate_choices);
@@ -422,7 +419,7 @@ static ssize_t platform_profile_store(struct device *dev,
  	i = sysfs_match_string(profile_names, buf);
  	if (i < 0 || i == PLATFORM_PROFILE_CUSTOM)
  		return -EINVAL;
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
+
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		ret = class_for_each_device(&platform_profile_class, NULL,
  					    &data, _aggregate_choices);
@@ -502,7 +499,6 @@ int platform_profile_cycle(void)
  	enum platform_profile_option profile = PLATFORM_PROFILE_LAST;
  	int err;
 
-	set_bit(PLATFORM_PROFILE_LAST, data.aggregate);
  	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
  		err = class_for_each_device(&platform_profile_class, NULL,
  					    &profile, _aggregate_profiles);
 
---

base-commit: 9a43102daf64dd0d172d8b39836dbc1dba4da1ea
change-id: 20250322-pprof-opt-caa7f7f349b8

Best regards,

author
#3 lore raw
Quoted 6 lines · Armin Wolf

Am 22.03.25 um 22:03 schrieb Kurt Borja:

Quoted 4 lines

Choices aggregates passed to _aggregate_choices() are already filled with ones, therefore we can avoid copying a new bitmap on the first iteration.

Quoted 7 lines
Quoted 5 lines

This makes setting the PLATFORM_PROFILE_LAST bit on aggregates unnecessary, so drop it as well.

While at it, add a couple empty lines to improve style.

Please add a comment to signal future developers that the bitmap needs to be filled with ones before being passed to _aggregate_choices().

Sure, I'll mention it in the kernel-doc for v2.

Quoted 4 lines

With this being addressed:

Thank you Mario and Armin for the reviews!

Signature · 1 line
 ~ Kurt