s390/ism: fix concurrency management in ism_cmd()
Subsystems (4)
PATCH 1/1 s390/ism: fix concurrency management in ism_cmd()
The s390x ISM device data sheet clearly states that only one request-response sequence is allowable per ISM function at any point in time. Unfortunately as of today the s390/ism driver in Linux does not honor that requirement. This patch aims to rectify that.
This problem was discovered based on Aliaksei's bug report which states that for certain workloads the ISM functions end up entering error state (with PEC 2 as seen from the logs) after a while and as a consequence connections handled by the respective function break, and for future connection requests the ISM device is not considered -- given it is in a dysfunctional state. During further debugging PEC 31 was observed as well.
The kernel message
zpci: XXXX:00:00.0: Event 0x2 reports an error for PCI function XXXX
is a reliable indicator of the stated function entering error state
with PEC 2. Let me also point out that the kernel message
zpci: XXXX:00:00.0: The ism driver bound to the device does not support error recovery is a reliable indicator that the ISM function won't be auto-recovered because the ISM driver currently lacks support for it.
On a technical level, without this synchronization, commands (inputs to the FW) may be partially or fully overwritten (corrupted) by another CPU trying to issue commands on the same function. There is hard evidence that this can lead to DMB token values being used as DMB IOVAs, leading to PEC 2 PCI events indicating invalid DMA. But this is only one of the failure modes imaginable. In theory even completely losing one command and executing another one twice and then trying to interpret the outputs as if the command we intended to execute was actually executed and not the other one is also possible. Frankly I don't feel confident about providing an exhaustive list of possible consequences.
--- drivers/s390/net/ism_drv.c | 4 ++++ include/linux/ism.h | 1 + 2 files changed, 5 insertions(+)
drivers/s390/net/ism_drv.c +4 -0
@@ -129,7 +129,9 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) {struct ism_req_hdr *req = cmd;struct ism_resp_hdr *resp = cmd; +unsigned long flags; +spin_lock_irqsave (&ism->cmd_lock, flags);__ism_write_cmd (ism, req +1 ,sizeof (*req), req->len -sizeof (*req));__ism_write_cmd (ism, req,0 ,sizeof (*req));
@@ -143,6 +145,7 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) }__ism_read_cmd (ism, resp +1 ,sizeof (*resp), resp->len -sizeof (*resp)); out: +spin_unlock_irqrestore (&ism->cmd_lock, flags);return resp->ret; }
@@ -606,6 +609,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)return -ENOMEM ;spin_lock_init (&ism->lock); +spin_lock_init (&ism->cmd_lock);dev_set_drvdata (&pdev->dev, ism); ism->pdev = pdev; ism->dev.parent = &pdev->dev;
include/linux/ism.h +1 -0
@@ -28,6 +28,7 @@ struct ism_dmb {struct ism_dev {spinlock_t lock;/* protects the ism device */ +spinlock_t cmd_lock;/* serializes cmds */ struct list_head list;struct pci_dev *pdev;
base-commit: 07fa9cad54609df3eea00cd5b167df6088ce01a6
Signature · 1 line
2.48.1
Alexander Gordeev
maintainerOn Sun, Jul 20, 2025 at 11:11:09PM +0200, Halil Pasic wrote:
Hi Halil,
...
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 134
Quoted 7 lines
drivers/s390/net/ism_drv.c +2
-0@@ -129,7 +129,9 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) {struct ism_req_hdr *req = cmd;struct ism_resp_hdr *resp = cmd; +unsigned long flags; +spin_lock_irqsave (&ism->cmd_lock, flags);
I only found smcd_handle_irq() scheduling a tasklet, but no commands issued. Do we really need disable interrupts?
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 151
Quoted 11 lines
drivers/s390/net/ism_drv.c +1
-0__ism_write_cmd (ism, req +1 ,sizeof (*req), req->len -sizeof (*req));__ism_write_cmd (ism, req,0 ,sizeof (*req));@@ -143,6 +145,7 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) }__ism_read_cmd (ism, resp +1 ,sizeof (*resp), resp->len -sizeof (*resp)); out: +spin_unlock_irqrestore (&ism->cmd_lock, flags);return resp->ret; }
...
Thanks!
Alexandra Winter
maintainerQuoted 11 lines · Alexander Gordeev
On Sun, Jul 20, 2025 at 11:11:09PM +0200, Halil Pasic wrote:
Hi Halil,
...
Quoted 6 lines
drivers/s390/net/ism_drv.c +1
-0@@ -129,7 +129,9 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) {struct ism_req_hdr *req = cmd;struct ism_resp_hdr *resp = cmd; +unsigned long flags;
Quoted 4 lines
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 134
Quoted 1 line
drivers/s390/net/ism_drv.c +1
-0+spin_lock_irqsave (&ism->cmd_lock, flags);I only found
smcd_handle_irq()scheduling a tasklet, but no commands issued. Do we really need disable interrupts?
You are right in current code, the interrupt and event handlers of ism and smcd never issue a control command that calls ism_cmd().
OTOH, future ism clients could do that.
The control commands are not part of the data path, but of connection establish. So I don't really expect a performance impact.
I have it on my ToDo list, to change this to threaded interrupts in the future. So no strong opinion on my side.
Simple spin_lock is fine with me.
Quoted 16 lines
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 151
Quoted 12 lines
drivers/s390/net/ism_drv.c +1
-0__ism_write_cmd (ism, req +1 ,sizeof (*req), req->len -sizeof (*req));__ism_write_cmd (ism, req,0 ,sizeof (*req));@@ -143,6 +145,7 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) }__ism_read_cmd (ism, resp +1 ,sizeof (*resp), resp->len -sizeof (*resp)); out: +spin_unlock_irqrestore (&ism->cmd_lock, flags);return resp->ret; }...
Thanks!
Simon Horman
reviewerQuoted 19 lines · Alexandra Winter
Quoted 11 lines · Alexander Gordeev
On Sun, Jul 20, 2025 at 11:11:09PM +0200, Halil Pasic wrote:
Hi Halil,
...
Quoted 6 lines
drivers/s390/net/ism_drv.c +1
-0@@ -129,7 +129,9 @@ static int ism_cmd(struct ism_dev *ism, void *cmd) {struct ism_req_hdr *req = cmd;struct ism_resp_hdr *resp = cmd; +unsigned long flags;Quoted 4 lines
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 134
Quoted 1 line
drivers/s390/net/ism_drv.c +1
-0+spin_lock_irqsave (&ism->cmd_lock, flags);I only found
smcd_handle_irq()scheduling a tasklet, but no commands issued. Do we really need disable interrupts?
Quoted 8 lines
You are right in current code, the interrupt and event handlers of ism and smcd never issue a control command that calls
ism_cmd().
OTOH, future ism clients could do that.
The control commands are not part of the data path, but of connection establish. So I don't really expect a performance impact.
I have it on my ToDo list, to change this to threaded interrupts in the future. So no strong opinion on my side.
Simplespin_lockis fine with me.
I would suggest using spin_lock() if it is sufficient.
I think it is generally assumed that the minimal locking primitive is used given the context code is executed in. And we can it can always be updated if the contexts in which this code executes subsequently changes.
IOW, I'm suggesting avoiding confusion if someone looks over this code.
...
Quoted 5 lines · On Mon, 21 Jul 2025 10:17:30 +0200 Alexandra Winter <[email protected]>…
Quoted 4 lines
drivers/s390/net/ism_drv.c static int ism_cmd(struct ism_dev *ism, void *cmd) · line 134
Quoted 1 line
drivers/s390/net/ism_drv.c +1
-0+spin_lock_irqsave (&ism->cmd_lock, flags);I only found
smcd_handle_irq()scheduling a tasklet, but no commands issued. Do we really need disable interrupts?
Quoted 8 lines
You are right in current code, the interrupt and event handlers of ism and smcd never issue a control command that calls
ism_cmd().
OTOH, future ism clients could do that.
The control commands are not part of the data path, but of connection establish. So I don't really expect a performance impact.
I have it on my ToDo list, to change this to threaded interrupts in the future. So no strong opinion on my side.
Simplespin_lockis fine with me.
I agree!
My train of thought was, lets go with the safe option and look if the maintainers want something different. I didn't feel confident about trying to understand the details including the contract between the clients and the driver.
I will change to simple spin_lock() at the end of the day if nobody objects since the sentiment seems to be going into this direction and spin a v2 no later than on Wed.
Thanks for having a look!
Regards,
Halil