FAILED: patch "[PATCH] hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 4e4af55aaca7f6d7673d5f9889ad0529db86a048
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026052855-crummy-unequal-904f@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4e4af55aaca7f6d7673d5f9889ad0529db86a048 Mon Sep 17 00:00:00 2001
From: Abdurrahman Hussain <[email protected]>
Date: Mon, 18 May 2026 17:52:32 -0700
Subject: [PATCH] hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read
with pmbus_lock
adm1266_state_read() backs the sequencer_state debugfs entry and issues an i2c_smbus_read_word_data(client, ADM1266_READ_STATE) against the device without taking pmbus_lock. pmbus_core holds pmbus_lock around its own multi-transaction sequences (notably the "set PAGE, then read paged register" pattern used by hwmon attributes), so an unlocked debugfs reader can land between a PAGE write and the subsequent paged read in another thread. READ_STATE itself is not paged, so it cannot corrupt PAGE in flight, but the same defensive serialisation that applies to the GPIO accessors applies here: any direct device access from outside pmbus_core should be ordered with respect to pmbus_core's own.
Take pmbus_lock at the top of adm1266_state_read() via the scope-based guard().
drivers/hwmon/pmbus/adm1266.c +1 -0
@@ -335,6 +335,7 @@ static int adm1266_state_read(struct seq_file *s, void *pdata)struct i2c_client *client =to_i2c_client (dev);int ret; +guard (pmbus_lock)(client); ret =i2c_smbus_read_word_data (client,ADM1266_READ_STATE );if (ret <0 )return ret;
Sasha Levin
maintainerPATCH 1/1 hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read with pmbus_lock
From: Abdurrahman Hussain <[email protected]>
[ Upstream commit 4e4af55aaca7f6d7673d5f9889ad0529db86a048 ]
adm1266_state_read() backs the sequencer_state debugfs entry and issues an i2c_smbus_read_word_data(client, ADM1266_READ_STATE) against the device without taking pmbus_lock. pmbus_core holds pmbus_lock around its own multi-transaction sequences (notably the "set PAGE, then read paged register" pattern used by hwmon attributes), so an unlocked debugfs reader can land between a PAGE write and the subsequent paged read in another thread. READ_STATE itself is not paged, so it cannot corrupt PAGE in flight, but the same defensive serialisation that applies to the GPIO accessors applies here: any direct device access from outside pmbus_core should be ordered with respect to pmbus_core's own.
Take pmbus_lock at the top of adm1266_state_read() via the scope-based guard().
--- drivers/hwmon/pmbus/adm1266.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hwmon/pmbus/adm1266.c +7 -0
@@ -328,7 +328,14 @@ static int adm1266_state_read(struct seq_file *s, void *pdata)struct i2c_client *client =to_i2c_client (dev);int ret; + ret =pmbus_lock_interruptible (client); +if (ret) +return ret; + ret =i2c_smbus_read_word_data (client,ADM1266_READ_STATE ); + +pmbus_unlock (client); +if (ret <0 )return ret;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 1/1 hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read with pmbus_lock
In reply to [email protected]From: Abdurrahman Hussain <[email protected]>
[ Upstream commit 4e4af55aaca7f6d7673d5f9889ad0529db86a048 ]
adm1266_state_read() backs the sequencer_state debugfs entry and issues an i2c_smbus_read_word_data(client, ADM1266_READ_STATE) against the device without taking pmbus_lock. pmbus_core holds pmbus_lock around its own multi-transaction sequences (notably the "set PAGE, then read paged register" pattern used by hwmon attributes), so an unlocked debugfs reader can land between a PAGE write and the subsequent paged read in another thread. READ_STATE itself is not paged, so it cannot corrupt PAGE in flight, but the same defensive serialisation that applies to the GPIO accessors applies here: any direct device access from outside pmbus_core should be ordered with respect to pmbus_core's own.
Take pmbus_lock at the top of adm1266_state_read() via the scope-based guard().
--- drivers/hwmon/pmbus/adm1266.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hwmon/pmbus/adm1266.c +7 -0
@@ -328,7 +328,14 @@ static int adm1266_state_read(struct seq_file *s, void *pdata)struct i2c_client *client =to_i2c_client (dev);int ret; + ret =pmbus_lock_interruptible (client); +if (ret) +return ret; + ret =i2c_smbus_read_word_data (client,ADM1266_READ_STATE ); + +pmbus_unlock (client); +if (ret <0 )return ret;
Signature · 1 line
2.53.0
Re: [PATCH 6.1.y] hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read with pmbus_lock
Quoted 4 lines
[PATCH 6.1.y] hwmon: (pmbus/adm1266) serialize
sequencer_statedebugfs read withpmbus_lock
[ changed guard(pmbus_lock)(client) to manual
pmbus_lock_interruptible()/pmbus_unlock() calls ]
Queued for 6.1.y, thanks.
Signature · 2 lines
Thanks, Sasha