| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7708886.EvYhyI6sBW@rjwysocki.net>
Date: Tue, 10 Sep 2024 11:33:08 +0200
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Linux PM <linux-pm@...r.kernel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Lukasz Luba <lukasz.luba@....com>, Zhang Rui <rui.zhang@...el.com>
Subject:
[PATCH for 6.13 v1 6/8] thermal: core: Add function for moving trips to
sorted lists
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Subsequently, trips will be moved between sorted lists in multiple
places, so replace add_trip_to_sorted_list() with an analogous function
that will move a given trip to a given sorted list.
Call the new function thermal_trip_move_to_sorted_list() and put it into
the trips-related part of the code.
To allow list_move() used in the new function to work, initialize the
list_node fields of trip descriptors so they are always valid.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
---
drivers/thermal/thermal_core.c | 30 ++++++++++--------------------
drivers/thermal/thermal_core.h | 2 ++
drivers/thermal/thermal_trip.c | 15 +++++++++++++++
3 files changed, 27 insertions(+), 20 deletions(-)
Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -420,21 +420,6 @@ static void handle_critical_trips(struct
tz->ops.hot(tz);
}
-static void add_trip_to_sorted_list(struct thermal_trip_desc *td,
- struct list_head *list)
-{
- struct thermal_trip_desc *entry;
-
- /* Assume that the new entry is likely to be the last one. */
- list_for_each_entry_reverse(entry, list, list_node) {
- if (entry->notify_temp <= td->notify_temp) {
- list_add(&td->list_node, &entry->list_node);
- return;
- }
- }
- list_add(&td->list_node, list);
-}
-
static void handle_thermal_trip(struct thermal_zone_device *tz,
struct thermal_trip_desc *td,
struct list_head *way_up_list,
@@ -465,7 +450,7 @@ static void handle_thermal_trip(struct t
*/
if (tz->temperature < trip->temperature - trip->hysteresis) {
td->notify_temp = trip->temperature - trip->hysteresis;
- add_trip_to_sorted_list(td, way_down_list);
+ thermal_trip_move_to_sorted_list(td, way_down_list);
if (trip->type == THERMAL_TRIP_PASSIVE) {
tz->passive--;
@@ -481,7 +466,7 @@ static void handle_thermal_trip(struct t
* threshold is then set to the low temperature of the trip.
*/
td->notify_temp = trip->temperature;
- add_trip_to_sorted_list(td, way_up_list);
+ thermal_trip_move_to_sorted_list(td, way_up_list);
td->threshold -= trip->hysteresis;
@@ -550,7 +535,7 @@ void __thermal_zone_device_update(struct
enum thermal_notify_event event)
{
struct thermal_governor *governor = thermal_get_tz_governor(tz);
- struct thermal_trip_desc *td;
+ struct thermal_trip_desc *td, *next;
LIST_HEAD(way_down_list);
LIST_HEAD(way_up_list);
int low = -INT_MAX, high = INT_MAX;
@@ -596,11 +581,15 @@ void __thermal_zone_device_update(struct
thermal_zone_set_trips(tz, low, high);
- list_for_each_entry(td, &way_up_list, list_node)
+ list_for_each_entry_safe(td, next, &way_up_list, list_node) {
thermal_trip_crossed(tz, &td->trip, governor, true);
+ list_del_init(&td->list_node);
+ }
- list_for_each_entry_reverse(td, &way_down_list, list_node)
+ list_for_each_entry_safe_reverse(td, next, &way_down_list, list_node) {
thermal_trip_crossed(tz, &td->trip, governor, false);
+ list_del_init(&td->list_node);
+ }
if (governor->manage)
governor->manage(tz);
@@ -1443,6 +1432,7 @@ thermal_zone_device_register_with_trips(
for_each_trip_desc(tz, td) {
td->trip = *trip++;
INIT_LIST_HEAD(&td->thermal_instances);
+ INIT_LIST_HEAD(&td->list_node);
/*
* Mark all thresholds as invalid to start with even though
* this only matters for the trips that start as invalid and
Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -256,6 +256,8 @@ const char *thermal_trip_type_name(enum
void thermal_zone_set_trips(struct thermal_zone_device *tz, int low, int high);
int thermal_zone_trip_id(const struct thermal_zone_device *tz,
const struct thermal_trip *trip);
+void thermal_trip_move_to_sorted_list(struct thermal_trip_desc *td,
+ struct list_head *list);
int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
void thermal_zone_trip_down(struct thermal_zone_device *tz,
const struct thermal_trip *trip);
Index: linux-pm/drivers/thermal/thermal_trip.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_trip.c
+++ linux-pm/drivers/thermal/thermal_trip.c
@@ -93,6 +93,21 @@ int thermal_zone_trip_id(const struct th
return trip_to_trip_desc(trip) - tz->trips;
}
+void thermal_trip_move_to_sorted_list(struct thermal_trip_desc *td,
+ struct list_head *list)
+{
+ struct thermal_trip_desc *entry;
+
+ /* Assume that the new entry is likely to be the last one. */
+ list_for_each_entry_reverse(entry, list, list_node) {
+ if (entry->notify_temp <= td->notify_temp) {
+ list_move(&td->list_node, &entry->list_node);
+ return;
+ }
+ }
+ list_move(&td->list_node, list);
+}
+
void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,
struct thermal_trip *trip, int hyst)
{
Powered by blists - more mailing lists