Skip to content

Commit

Permalink
OPP: Protect lazy_opp_tables list with opp_table_lock
Browse files Browse the repository at this point in the history
The `opp_table_lock` lock is already used to protect the list elsewhere,
use it while adding or removing entries from it.

Reported-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
  • Loading branch information
Viresh Kumar committed Jun 14, 2023
1 parent 167eb2b commit 64aaeb7
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/opp/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "opp.h"

/* OPP tables with uninitialized required OPPs */
/* OPP tables with uninitialized required OPPs, protected by opp_table_lock */
static LIST_HEAD(lazy_opp_tables);

/*
Expand Down Expand Up @@ -148,7 +148,10 @@ static void _opp_table_free_required_tables(struct opp_table *opp_table)

opp_table->required_opp_count = 0;
opp_table->required_opp_tables = NULL;

mutex_lock(&opp_table_lock);
list_del(&opp_table->lazy);
mutex_unlock(&opp_table_lock);
}

/*
Expand Down Expand Up @@ -197,8 +200,15 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
}

/* Let's do the linking later on */
if (lazy)
if (lazy) {
/*
* The OPP table is not held while allocating the table, take it
* now to avoid corruption to the lazy_opp_tables list.
*/
mutex_lock(&opp_table_lock);
list_add(&opp_table->lazy, &lazy_opp_tables);
mutex_unlock(&opp_table_lock);
}
else
_update_set_required_opps(opp_table);

Expand Down

0 comments on commit 64aaeb7

Please sign in to comment.