diff mbox series

[v2] net/i40e: fix virtual channel confiliction issue

Message ID 20201019022025.1748497-1-yuying.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers show
Series [v2] net/i40e: fix virtual channel confiliction issue | expand

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Functional fail Functional Testing issues
ci/checkpatch success coding style OK

Commit Message

Yuying Zhang Oct. 19, 2020, 2:20 a.m. UTC
i40evf_execute_vf_cmd() uses _atomic_set_cmd() to execute virtual
channel commands safely in multi-process mode and multi-thread mode.
However, it returns -1 when one process or thread is pending. Add
rte_spinlock_trylock() to handle this issue in concurrent scenarios.

Fixes: 4861cde46116 ("i40e: new poll mode driver")
Cc: stable@dpdk.org

Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.h    |  1 +
 drivers/net/i40e/i40e_ethdev_vf.c | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

Comments

Qi Zhang Oct. 22, 2020, 8:54 a.m. UTC | #1
> -----Original Message-----
> From: Zhang, Yuying <yuying.zhang@intel.com>
> Sent: Monday, October 19, 2020 10:20 AM
> To: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>
> Cc: Zhang, Yuying <yuying.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] net/i40e: fix virtual channel confiliction issue
> 
> i40evf_execute_vf_cmd() uses _atomic_set_cmd() to execute virtual channel
> commands safely in multi-process mode and multi-thread mode.
> However, it returns -1 when one process or thread is pending. Add
> rte_spinlock_trylock() to handle this issue in concurrent scenarios.
> 
> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
Ferruh Yigit Oct. 23, 2020, 10:41 a.m. UTC | #2
On 10/19/2020 3:20 AM, Yuying Zhang wrote:
> i40evf_execute_vf_cmd() uses _atomic_set_cmd() to execute virtual
> channel commands safely in multi-process mode and multi-thread mode.
> However, it returns -1 when one process or thread is pending. Add
> rte_spinlock_trylock() to handle this issue in concurrent scenarios.
> 

Should '_atomic_set_cmd()' removed, since spinlock it added?

> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>

<...>
Yuying Zhang Oct. 30, 2020, 5:32 a.m. UTC | #3
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Friday, October 23, 2020 6:42 PM
> To: Zhang, Yuying <yuying.zhang@intel.com>; dev@dpdk.org; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/i40e: fix virtual channel confiliction issue
> 
> On 10/19/2020 3:20 AM, Yuying Zhang wrote:
> > i40evf_execute_vf_cmd() uses _atomic_set_cmd() to execute virtual
> > channel commands safely in multi-process mode and multi-thread mode.
> > However, it returns -1 when one process or thread is pending. Add
> > rte_spinlock_trylock() to handle this issue in concurrent scenarios.
> >
> 
> Should '_atomic_set_cmd()' removed, since spinlock it added?
> 
> > Fixes: 4861cde46116 ("i40e: new poll mode driver")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
> 
> <...>
'_atomic_set_cmd()' is also used for sync with i40evf_handle_aq_msg to handle the request <-> response.
It is not just used for multi-task. I prefer to keep the atomic.
Ferruh Yigit Oct. 30, 2020, 8:30 a.m. UTC | #4
On 10/30/2020 5:32 AM, Zhang, Yuying wrote:
> 
> 
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>> Sent: Friday, October 23, 2020 6:42 PM
>> To: Zhang, Yuying <yuying.zhang@intel.com>; dev@dpdk.org; Zhang, Qi Z
>> <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>
>> Cc: stable@dpdk.org
>> Subject: Re: [dpdk-dev] [PATCH v2] net/i40e: fix virtual channel confiliction issue
>>
>> On 10/19/2020 3:20 AM, Yuying Zhang wrote:
>>> i40evf_execute_vf_cmd() uses _atomic_set_cmd() to execute virtual
>>> channel commands safely in multi-process mode and multi-thread mode.
>>> However, it returns -1 when one process or thread is pending. Add
>>> rte_spinlock_trylock() to handle this issue in concurrent scenarios.
>>>
>>
>> Should '_atomic_set_cmd()' removed, since spinlock it added?
>>
>>> Fixes: 4861cde46116 ("i40e: new poll mode driver")
>>> Cc: stable@dpdk.org
>>>
>>> Signed-off-by: Yuying Zhang <yuying.zhang@intel.com>
>>
>> <...>
> '_atomic_set_cmd()' is also used for sync with i40evf_handle_aq_msg to handle the request <-> response.
> It is not just used for multi-task. I prefer to keep the atomic.
> 

OK
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 1466998aa..508a940dc 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1209,6 +1209,7 @@  struct i40e_vf {
 	bool promisc_unicast_enabled;
 	bool promisc_multicast_enabled;
 
+	rte_spinlock_t cmd_send_lock;
 	uint32_t version_major; /* Major version number */
 	uint32_t version_minor; /* Minor version number */
 	uint16_t promisc_flags; /* Promiscuous setting */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 4d6510d1f..282db4721 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -314,7 +314,7 @@  _atomic_set_cmd(struct i40e_vf *vf, enum virtchnl_ops ops)
 #define ASQ_DELAY_MS  10
 
 static int
-i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
+_i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
 {
 	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
@@ -405,6 +405,19 @@  i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
 	return err | vf->cmd_retval;
 }
 
+static int
+i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
+{
+	struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+	int err;
+
+	while (!rte_spinlock_trylock(&vf->cmd_send_lock))
+		rte_delay_us_sleep(50);
+	err = _i40evf_execute_vf_cmd(dev, args);
+	rte_spinlock_unlock(&vf->cmd_send_lock);
+	return err;
+}
+
 /*
  * Check API version with sync wait until version read or fail from admin queue
  */
@@ -1246,6 +1259,7 @@  i40evf_init_vf(struct rte_eth_dev *dev)
 
 	vf->adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
 	vf->dev_data = dev->data;
+	rte_spinlock_init(&vf->cmd_send_lock);
 	err = i40e_set_mac_type(hw);
 	if (err) {
 		PMD_INIT_LOG(ERR, "set_mac_type failed: %d", err);