Message ID | 20241216162735.2047544-2-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> > Subject: [Intel-wired-lan] [iwl-next PATCH v4 1/3] idpf: Acquire the lock before > accessing the xn->salt > > From: Manoj Vishwanathan <manojvishy@google.com> > > The transaction salt was being accessed before acquiring the > idpf_vc_xn_lock when idpf has to forward the virtchnl reply. > > Fixes: 34c21fa894a1 ("idpf: implement virtchnl transaction manager") > Signed-off-by: Manoj Vishwanathan <manojvishy@google.com> > Signed-off-by: David Decotigny <decot@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> > --- > drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > 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 d46c95f91b0d..13274544f7f4 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -612,14 +612,15 @@ idpf_vc_xn_forward_reply(struct idpf_adapter *adapter, return -EINVAL; } xn = &adapter->vcxn_mngr->ring[xn_idx]; + 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); + idpf_vc_xn_unlock(xn); return -EINVAL; } - idpf_vc_xn_lock(xn); switch (xn->state) { case IDPF_VC_XN_WAITING: /* success */