Skip to content

Commit

Permalink
mctp i3c: fix MCTP I3C driver multi-thread issue
Browse files Browse the repository at this point in the history
We found a timeout problem with the pldm command on our system.  The
reason is that the MCTP-I3C driver has a race condition when receiving
multiple-packet messages in multi-thread, resulting in a wrong packet
order problem.

We identified this problem by adding a debug message to the
mctp_i3c_read function.

According to the MCTP spec, a multiple-packet message must be composed
in sequence, and if there is a wrong sequence, the whole message will be
discarded and wait for the next SOM.
For example, SOM → Pkt Seq #2 → Pkt Seq #1 → Pkt Seq #3 → EOM.

Therefore, we try to solve this problem by adding a mutex to the
mctp_i3c_read function.  Before the modification, when a command
requesting a multiple-packet message response is sent consecutively, an
error usually occurs within 100 loops.  After the mutex, it can go
through 40000 loops without any error, and it seems to run well.

Fixes: c8755b2 ("mctp i3c: MCTP I3C driver")
Signed-off-by: Leo Yang <[email protected]>
Link: https://patch.msgid.link/[email protected]
[[email protected]: dropped already answered question from changelog]
Signed-off-by: Paolo Abeni <[email protected]>
  • Loading branch information
Leo Yang authored and Paolo Abeni committed Jan 9, 2025
1 parent d1bf27c commit 2d2d4f6
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/mctp/mctp-i3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ static int mctp_i3c_read(struct mctp_i3c_device *mi)

xfer.data.in = skb_put(skb, mi->mrl);

/* Make sure netif_rx() is read in the same order as i3c. */
mutex_lock(&mi->lock);
rc = i3c_device_do_priv_xfers(mi->i3c, &xfer, 1);
if (rc < 0)
goto err;
Expand Down Expand Up @@ -166,8 +168,10 @@ static int mctp_i3c_read(struct mctp_i3c_device *mi)
stats->rx_dropped++;
}

mutex_unlock(&mi->lock);
return 0;
err:
mutex_unlock(&mi->lock);
kfree_skb(skb);
return rc;
}
Expand Down

0 comments on commit 2d2d4f6

Please sign in to comment.