Message ID | 20241216162735.2047544-4-brianvv@google.com |
---|---|
State | Accepted |
Delegated to: | Anthony Nguyen |
Headers | show |
Series | IDPF Virtchnl: Enhance error reporting & fix locking/workqueue issues | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Brian Vazquez > Sent: Monday, December 16, 2024 8:28 AM > To: Brian Vazquez <brianvv.kernel@gmail.com>; Nguyen, Anthony L > <anthony.l.nguyen@intel.com>; Kitszel, Przemyslaw > <przemyslaw.kitszel@intel.com>; David S. Miller <davem@davemloft.net>; > Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; > Paolo Abeni <pabeni@redhat.com>; intel-wired-lan@lists.osuosl.org > Cc: David Decotigny <decot@google.com>; Vivek Kumar > <vivekmr@google.com>; Singhai, Anjali <anjali.singhai@intel.com>; > Samudrala, Sridhar <sridhar.samudrala@intel.com>; linux- > kernel@vger.kernel.org; netdev@vger.kernel.org; Tantilov, Emil S > <emil.s.tantilov@intel.com>; Manoj Vishwanathan > <manojvishy@google.com>; Brian Vazquez <brianvv@google.com>; Keller, > Jacob E <jacob.e.keller@intel.com>; Linga, Pavan Kumar > <pavan.kumar.linga@intel.com>; Paul Menzel <pmenzel@molgen.mpg.de> > Subject: [Intel-wired-lan] [iwl-next PATCH v4 3/3] idpf: add more info during > virtchnl transaction timeout/salt mismatch > > From: Manoj Vishwanathan <manojvishy@google.com> > > 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) > ------------------- > > before it was: > > ------------------- > (op 5015, 60000ms) > ------------------- > > Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> > Signed-off-by: Brian Vazquez <brianvv@google.com> > Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > Reviewed-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com> > Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> > --- > drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c index 13274544f7f4..fe5468f226f7 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -517,8 +517,10 @@ 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 +617,9 @@ 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; }