Commit d0ea9eba authored by Manoj Vishwanathan's avatar Manoj Vishwanathan Committed by Tony Nguyen
Browse files

idpf: add more info during virtchnl transaction timeout/salt mismatch 



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: default avatarManoj Vishwanathan <manojvishy@google.com>
Signed-off-by: default avatarBrian Vazquez <brianvv@google.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarPavan Kumar Linga <pavan.kumar.linga@intel.com>
Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9a5b021c

drivers/net/ethernet/intel/idpf/idpf_virtchnl.c

+7 −4
Original line number Diff line number Diff line
@@ -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;

	}