| Message ID | 20240826181032.3042222-5-manojvishy@google.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [[PATCH,v2,iwl-next] v2 4/4] idpf: add more info during virtchnl transaction time out | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 8/26/2024 11:10 AM, Manoj Vishwanathan wrote: > Add more information related to the transaction like cookie, vc_op, > salt when transaction times out and include similar information > when transaction salt does not match. > > Info output for transaction timeout: > ------------------- > (op:5015 cookie:45fe vc_op:5015 salt:45 timeout:60000ms) > ------------------- > > Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> > --- Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
On 8/26/2024 11:10 AM, Manoj Vishwanathan wrote: > Add more information related to the transaction like cookie, vc_op, > salt when transaction times out and include similar information > when transaction salt does not match. > > Info output for transaction timeout: > ------------------- > (op:5015 cookie:45fe vc_op:5015 salt:45 timeout:60000ms) > ------------------- > > Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> Reviewed-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com> > --- > drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > index 30eec674d594..d8294f31fdf9 100644 > --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c > @@ -517,8 +517,9 @@ static ssize_t idpf_vc_xn_exec(struct idpf_adapter *adapter, > retval = -ENXIO; > goto only_unlock; > case IDPF_VC_XN_WAITING: > - dev_notice_ratelimited(&adapter->pdev->dev, "Transaction timed-out (op %d, %dms)\n", > - params->vc_op, params->timeout_ms); > + dev_notice_ratelimited(&adapter->pdev->dev, > + "Transaction timed-out (op:%d cookie:%04x vc_op:%d salt:%02x timeout:%dms)\n", > + params->vc_op, cookie, xn->vc_op, xn->salt, params->timeout_ms); > retval = -ETIME; > break; > case IDPF_VC_XN_COMPLETED_SUCCESS: > @@ -615,8 +616,8 @@ idpf_vc_xn_forward_reply(struct idpf_adapter *adapter, > idpf_vc_xn_lock(xn); > salt = FIELD_GET(IDPF_VC_XN_SALT_M, msg_info); > if (xn->salt != salt) { > - dev_err_ratelimited(&adapter->pdev->dev, "Transaction salt does not match (%02x != %02x)\n", > - xn->salt, salt); > + dev_err_ratelimited(&adapter->pdev->dev, "Transaction salt does not match (exp:%d@%02x(%d) != got:%d@%02x)\n", > + xn->vc_op, xn->salt, xn->state, ctlq_msg->cookie.mbx.chnl_opcode, salt); > idpf_vc_xn_unlock(xn); > return -EINVAL; > }
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c index 30eec674d594..d8294f31fdf9 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -517,8 +517,9 @@ static ssize_t idpf_vc_xn_exec(struct idpf_adapter *adapter, retval = -ENXIO; goto only_unlock; case IDPF_VC_XN_WAITING: - dev_notice_ratelimited(&adapter->pdev->dev, "Transaction timed-out (op %d, %dms)\n", - params->vc_op, params->timeout_ms); + dev_notice_ratelimited(&adapter->pdev->dev, + "Transaction timed-out (op:%d cookie:%04x vc_op:%d salt:%02x timeout:%dms)\n", + params->vc_op, cookie, xn->vc_op, xn->salt, params->timeout_ms); retval = -ETIME; break; case IDPF_VC_XN_COMPLETED_SUCCESS: @@ -615,8 +616,8 @@ idpf_vc_xn_forward_reply(struct idpf_adapter *adapter, idpf_vc_xn_lock(xn); salt = FIELD_GET(IDPF_VC_XN_SALT_M, msg_info); if (xn->salt != salt) { - dev_err_ratelimited(&adapter->pdev->dev, "Transaction salt does not match (%02x != %02x)\n", - xn->salt, salt); + dev_err_ratelimited(&adapter->pdev->dev, "Transaction salt does not match (exp:%d@%02x(%d) != got:%d@%02x)\n", + xn->vc_op, xn->salt, xn->state, ctlq_msg->cookie.mbx.chnl_opcode, salt); idpf_vc_xn_unlock(xn); return -EINVAL; }
Add more information related to the transaction like cookie, vc_op, salt when transaction times out and include similar information when transaction salt does not match. Info output for transaction timeout: ------------------- (op:5015 cookie:45fe vc_op:5015 salt:45 timeout:60000ms) ------------------- Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> --- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)