patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues
@ 2020-06-10 12:07 alvinx.zhang
  2020-06-21 13:36 ` Jeff Guo
  2020-07-02  3:26 ` [dpdk-stable] [PATCH v2] net/i40e: fix modify the number of qps in VF alvinx.zhang
  0 siblings, 2 replies; 5+ messages in thread
From: alvinx.zhang @ 2020-06-10 12:07 UTC (permalink / raw)
  To: dev; +Cc: stable, beilei.xing, jia.guo, maox.jiang

From: Alvin Zhang <alvinx.zhang@intel.com>

For the newly created VF, if the number of qps is greater than 4
at startup, it may fail to start. This patch updates the API
`i40evf_dev_configure`.

Fixes: c48eb308ed13 ("net/i40e: support VF request more queues")
Cc: stable@dpdk.org

Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index bb5d28a..7500e0a 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1082,13 +1082,10 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
 	args.out_buffer = vf->aq_resp;
 	args.out_size = I40E_AQ_BUF_SZ;
 
-	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 	err = i40evf_execute_vf_cmd(dev, &args);
 	if (err)
 		PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES");
 
-	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
-			  i40evf_dev_alarm_handler, dev);
 	return err;
 }
 
@@ -1516,7 +1513,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
 	hw->bus.device = pci_dev->addr.devid;
 	hw->bus.func = pci_dev->addr.function;
 	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
-	hw->adapter_stopped = 0;
+	hw->adapter_stopped = 1;
 	hw->adapter_closed = 0;
 
 	/* Pass the information to the rte_eth_dev_close() that it should also
@@ -1612,16 +1609,35 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
 	ad->tx_vec_allowed = true;
 
 	if (num_queue_pairs > vf->vsi_res->num_queue_pairs) {
-		int ret = 0;
+		struct i40e_hw *hw;
+		int ret;
 
+		hw  = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 		PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
 			    vf->vsi_res->num_queue_pairs, num_queue_pairs);
+		if (hw->adapter_stopped == 0) {
+			PMD_DRV_LOG(WARNING, "Device must be stopped first!");
+			return -EINVAL;
+		}
+
+		rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 		ret = i40evf_request_queues(dev, num_queue_pairs);
-		if (ret != 0)
+		if (ret)
 			return ret;
 
-		ret = i40evf_dev_reset(dev);
-		if (ret != 0)
+		/*
+		 * The device must be reinitiated after queue resources
+		 * changed
+		 */
+		i40e_shutdown_adminq(hw);
+		i40evf_disable_irq0(hw);
+		rte_free(vf->vf_res);
+		vf->vf_res = NULL;
+		rte_free(vf->aq_resp);
+		vf->aq_resp = NULL;
+
+		ret = i40evf_dev_init(dev);
+		if (ret)
 			return ret;
 	}
 
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues
  2020-06-10 12:07 [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues alvinx.zhang
@ 2020-06-21 13:36 ` Jeff Guo
  2020-06-29  3:16   ` Zhang, AlvinX
  2020-07-02  3:26 ` [dpdk-stable] [PATCH v2] net/i40e: fix modify the number of qps in VF alvinx.zhang
  1 sibling, 1 reply; 5+ messages in thread
From: Jeff Guo @ 2020-06-21 13:36 UTC (permalink / raw)
  To: alvinx.zhang, dev; +Cc: stable, beilei.xing, maox.jiang

hi, alvin

On 6/10/2020 8:07 PM, alvinx.zhang@intel.com wrote:
> From: Alvin Zhang <alvinx.zhang@intel.com>
>
> For the newly created VF, if the number of qps is greater than 4
> at startup, it may fail to start. This patch updates the API
> `i40evf_dev_configure`.


Could you explicit explain why it limit to 4 qps, and more detail about 
below code change with the purpose of the patch.


> Fixes: c48eb308ed13 ("net/i40e: support VF request more queues")
> Cc: stable@dpdk.org
>
> Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
> ---
>   drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++--------
>   1 file changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
> index bb5d28a..7500e0a 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -1082,13 +1082,10 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
>   	args.out_buffer = vf->aq_resp;
>   	args.out_size = I40E_AQ_BUF_SZ;
>   
> -	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);


Why interrupt handler is no need to cancel here and more why this change 
is related with this patch according with the commit log?


>   	err = i40evf_execute_vf_cmd(dev, &args);
>   	if (err)
>   		PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES");
>   
> -	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
> -			  i40evf_dev_alarm_handler, dev);
>   	return err;
>   }
>   
> @@ -1516,7 +1513,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
>   	hw->bus.device = pci_dev->addr.devid;
>   	hw->bus.func = pci_dev->addr.function;
>   	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
> -	hw->adapter_stopped = 0;
> +	hw->adapter_stopped = 1;


Why it should be set stopped when init dev?


>   	hw->adapter_closed = 0;
>   
>   	/* Pass the information to the rte_eth_dev_close() that it should also
> @@ -1612,16 +1609,35 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
>   	ad->tx_vec_allowed = true;
>   
>   	if (num_queue_pairs > vf->vsi_res->num_queue_pairs) {
> -		int ret = 0;
> +		struct i40e_hw *hw;
> +		int ret;
>   
> +		hw  = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>   		PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
>   			    vf->vsi_res->num_queue_pairs, num_queue_pairs);
> +		if (hw->adapter_stopped == 0) {
> +			PMD_DRV_LOG(WARNING, "Device must be stopped first!");
> +			return -EINVAL;
> +		}
> +
> +		rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
>   		ret = i40evf_request_queues(dev, num_queue_pairs);
> -		if (ret != 0)
> +		if (ret)
>   			return ret;
>   
> -		ret = i40evf_dev_reset(dev);
> -		if (ret != 0)
> +		/*
> +		 * The device must be reinitiated after queue resources
> +		 * changed
> +		 */


Should you check below part is reinitialize process according to exist 
dev_close and dev_init.


> +		i40e_shutdown_adminq(hw);
> +		i40evf_disable_irq0(hw);
> +		rte_free(vf->vf_res);
> +		vf->vf_res = NULL;
> +		rte_free(vf->aq_resp);
> +		vf->aq_resp = NULL;
> +
> +		ret = i40evf_dev_init(dev);
> +		if (ret)
>   			return ret;
>   	}
>   

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues
  2020-06-21 13:36 ` Jeff Guo
@ 2020-06-29  3:16   ` Zhang, AlvinX
  2020-06-30  3:13     ` Jeff Guo
  0 siblings, 1 reply; 5+ messages in thread
From: Zhang, AlvinX @ 2020-06-29  3:16 UTC (permalink / raw)
  To: Guo, Jia, dev; +Cc: stable, Xing, Beilei, Jiang, MaoX

Hi Jia,

> -----Original Message-----
> From: Guo, Jia
> Sent: Sunday, June 21, 2020 9:36 PM
> To: Zhang, AlvinX <alvinx.zhang@intel.com>; dev@dpdk.org
> Cc: stable@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Jiang, MaoX
> <maox.jiang@intel.com>
> Subject: Re: [PATCH] net/i40e: fix modifying the number of queues
> 
> hi, alvin
> 
> On 6/10/2020 8:07 PM, alvinx.zhang@intel.com wrote:
> > From: Alvin Zhang <alvinx.zhang@intel.com>
> >
> > For the newly created VF, if the number of qps is greater than 4 at
> > startup, it may fail to start. This patch updates the API
> > `i40evf_dev_configure`.
> 
> 
> Could you explicit explain why it limit to 4 qps, and more detail about below
> code change with the purpose of the patch.

For each VF, the kernel PF driver assign 4 qps when the VF be created.

> 
> 
> > Fixes: c48eb308ed13 ("net/i40e: support VF request more queues")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
> > ---
> >   drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++---
> -----
> >   1 file changed, 24 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> > index bb5d28a..7500e0a 100644
> > --- a/drivers/net/i40e/i40e_ethdev_vf.c
> > +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> > @@ -1082,13 +1082,10 @@ static int i40evf_dev_xstats_get(struct
> rte_eth_dev *dev,
> >   	args.out_buffer = vf->aq_resp;
> >   	args.out_size = I40E_AQ_BUF_SZ;
> >
> > -	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
> 
> 
> Why interrupt handler is no need to cancel here and more why this change
> is related with this patch according with the commit log?

Here, the handler has been cancecled by the caller.

> 
> 
> >   	err = i40evf_execute_vf_cmd(dev, &args);
> >   	if (err)
> >   		PMD_DRV_LOG(ERR, "fail to execute command
> OP_REQUEST_QUEUES");
> >
> > -	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
> > -			  i40evf_dev_alarm_handler, dev);
> >   	return err;
> >   }
> >
> > @@ -1516,7 +1513,7 @@ static int i40evf_dev_xstats_get(struct
> rte_eth_dev *dev,
> >   	hw->bus.device = pci_dev->addr.devid;
> >   	hw->bus.func = pci_dev->addr.function;
> >   	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
> > -	hw->adapter_stopped = 0;
> > +	hw->adapter_stopped = 1;
> 
> 
> Why it should be set stopped when init dev?

The Device has not been started until the API ` i40evf_dev_start ` been called.
Here we just initiate the device, so it should be set to 1. 

> 
> 
> >   	hw->adapter_closed = 0;
> >
> >   	/* Pass the information to the rte_eth_dev_close() that it should
> also
> > @@ -1612,16 +1609,35 @@ static int eth_i40evf_pci_remove(struct
> rte_pci_device *pci_dev)
> >   	ad->tx_vec_allowed = true;
> >
> >   	if (num_queue_pairs > vf->vsi_res->num_queue_pairs) {
> > -		int ret = 0;
> > +		struct i40e_hw *hw;
> > +		int ret;
> >
> > +		hw  = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> >   		PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
> >   			    vf->vsi_res->num_queue_pairs,
> num_queue_pairs);
> > +		if (hw->adapter_stopped == 0) {
> > +			PMD_DRV_LOG(WARNING, "Device must be
> stopped first!");
> > +			return -EINVAL;
> > +		}
> > +
> > +		rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
> >   		ret = i40evf_request_queues(dev, num_queue_pairs);
> > -		if (ret != 0)
> > +		if (ret)
> >   			return ret;
> >
> > -		ret = i40evf_dev_reset(dev);
> > -		if (ret != 0)
> > +		/*
> > +		 * The device must be reinitiated after queue resources
> > +		 * changed
> > +		 */
> 
> 
> Should you check below part is reinitialize process according to exist
> dev_close and dev_init.

Yes, it stops and reinitializes the device , but if call the dev_close to do, some process is no needed and should report errors.

> 
> 
> > +		i40e_shutdown_adminq(hw);
> > +		i40evf_disable_irq0(hw);
> > +		rte_free(vf->vf_res);
> > +		vf->vf_res = NULL;
> > +		rte_free(vf->aq_resp);
> > +		vf->aq_resp = NULL;
> > +
> > +		ret = i40evf_dev_init(dev);
> > +		if (ret)
> >   			return ret;
> >   	}
> >

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues
  2020-06-29  3:16   ` Zhang, AlvinX
@ 2020-06-30  3:13     ` Jeff Guo
  0 siblings, 0 replies; 5+ messages in thread
From: Jeff Guo @ 2020-06-30  3:13 UTC (permalink / raw)
  To: Zhang, AlvinX, dev; +Cc: stable, Xing, Beilei, Jiang, MaoX

hi, alvin

On 6/29/2020 11:16 AM, Zhang, AlvinX wrote:
> Hi Jia,
>
>> -----Original Message-----
>> From: Guo, Jia
>> Sent: Sunday, June 21, 2020 9:36 PM
>> To: Zhang, AlvinX <alvinx.zhang@intel.com>; dev@dpdk.org
>> Cc: stable@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Jiang, MaoX
>> <maox.jiang@intel.com>
>> Subject: Re: [PATCH] net/i40e: fix modifying the number of queues
>>
>> hi, alvin
>>
>> On 6/10/2020 8:07 PM, alvinx.zhang@intel.com wrote:
>>> From: Alvin Zhang <alvinx.zhang@intel.com>
>>>
>>> For the newly created VF, if the number of qps is greater than 4 at
>>> startup, it may fail to start. This patch updates the API
>>> `i40evf_dev_configure`.
>>
>> Could you explicit explain why it limit to 4 qps, and more detail about below
>> code change with the purpose of the patch.
> For each VF, the kernel PF driver assign 4 qps when the VF be created.


It would be better also add the detail info replace of "updates".


>>
>>> Fixes: c48eb308ed13 ("net/i40e: support VF request more queues")
>>> Cc: stable@dpdk.org
>>>
>>> Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
>>> ---
>>>    drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++---
>> -----
>>>    1 file changed, 24 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
>> b/drivers/net/i40e/i40e_ethdev_vf.c
>>> index bb5d28a..7500e0a 100644
>>> --- a/drivers/net/i40e/i40e_ethdev_vf.c
>>> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
>>> @@ -1082,13 +1082,10 @@ static int i40evf_dev_xstats_get(struct
>> rte_eth_dev *dev,
>>>    	args.out_buffer = vf->aq_resp;
>>>    	args.out_size = I40E_AQ_BUF_SZ;
>>>
>>> -	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
>>
>> Why interrupt handler is no need to cancel here and more why this change
>> is related with this patch according with the commit log?
> Here, the handler has been cancecled by the caller.


  If it related with this patch please add the fix info into the commit 
log and delete the useless statement in the begin.


>>
>>>    	err = i40evf_execute_vf_cmd(dev, &args);
>>>    	if (err)
>>>    		PMD_DRV_LOG(ERR, "fail to execute command
>> OP_REQUEST_QUEUES");
>>> -	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
>>> -			  i40evf_dev_alarm_handler, dev);
>>>    	return err;
>>>    }
>>>
>>> @@ -1516,7 +1513,7 @@ static int i40evf_dev_xstats_get(struct
>> rte_eth_dev *dev,
>>>    	hw->bus.device = pci_dev->addr.devid;
>>>    	hw->bus.func = pci_dev->addr.function;
>>>    	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
>>> -	hw->adapter_stopped = 0;
>>> +	hw->adapter_stopped = 1;
>>
>> Why it should be set stopped when init dev?
> The Device has not been started until the API ` i40evf_dev_start ` been called.
> Here we just initiate the device, so it should be set to 1.


make sense, and what about below "hw->adapter_closed = 0;", should it be 
after the success of the init process.


>>
>>>    	hw->adapter_closed = 0;
>>>
>>>    	/* Pass the information to the rte_eth_dev_close() that it should
>> also
>>> @@ -1612,16 +1609,35 @@ static int eth_i40evf_pci_remove(struct
>> rte_pci_device *pci_dev)
>>>    	ad->tx_vec_allowed = true;
>>>
>>>    	if (num_queue_pairs > vf->vsi_res->num_queue_pairs) {
>>> -		int ret = 0;
>>> +		struct i40e_hw *hw;
>>> +		int ret;
>>>
>>> +		hw  = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>>>    		PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
>>>    			    vf->vsi_res->num_queue_pairs,
>> num_queue_pairs);
>>> +		if (hw->adapter_stopped == 0) {
>>> +			PMD_DRV_LOG(WARNING, "Device must be
>> stopped first!");
>>> +			return -EINVAL;
>>> +		}
>>> +
>>> +		rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
>>>    		ret = i40evf_request_queues(dev, num_queue_pairs);
>>> -		if (ret != 0)
>>> +		if (ret)
>>>    			return ret;
>>>
>>> -		ret = i40evf_dev_reset(dev);
>>> -		if (ret != 0)
>>> +		/*
>>> +		 * The device must be reinitiated after queue resources
>>> +		 * changed
>>> +		 */
>>
>> Should you check below part is reinitialize process according to exist
>> dev_close and dev_init.
> Yes, it stops and reinitializes the device , but if call the dev_close to do, some process is no needed and should report errors.


When close dev, it will stop dev and free queues, but you don't involve 
the process of free queues here,  and you check the 
"hw->adapter_stopped" before, so if it had stopped and then close, why 
it will report some errors of some useless process?


>>
>>> +		i40e_shutdown_adminq(hw);
>>> +		i40evf_disable_irq0(hw);
>>> +		rte_free(vf->vf_res);
>>> +		vf->vf_res = NULL;
>>> +		rte_free(vf->aq_resp);
>>> +		vf->aq_resp = NULL;
>>> +
>>> +		ret = i40evf_dev_init(dev);
>>> +		if (ret)
>>>    			return ret;
>>>    	}
>>>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dpdk-stable] [PATCH v2] net/i40e: fix modify the number of qps in VF
  2020-06-10 12:07 [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues alvinx.zhang
  2020-06-21 13:36 ` Jeff Guo
@ 2020-07-02  3:26 ` alvinx.zhang
  1 sibling, 0 replies; 5+ messages in thread
From: alvinx.zhang @ 2020-07-02  3:26 UTC (permalink / raw)
  To: dev; +Cc: stable, beilei.xing, jia.guo, maox.jiang

From: Alvin Zhang <alvinx.zhang@intel.com>

For a VF, if the number of request queue pairs is greater than that
has been allocated by the kernel driver, the app may fail to start.
This patch modify the request queue process.

Fixes: c48eb308ed13 ("net/i40e: support VF request more queues")
Fixes: dbda2092deb5 ("net/i40e: fix request queue in VF")
Cc: stable@dpdk.org

Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
---

V2: Update git log and modify codes according to comments.
---
 drivers/net/i40e/i40e_ethdev_vf.c | 57 +++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index eca716a..55dd237 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -90,6 +90,7 @@ static int i40evf_dev_xstats_get_names(struct rte_eth_dev *dev,
 static int i40evf_vlan_filter_set(struct rte_eth_dev *dev,
 				  uint16_t vlan_id, int on);
 static int i40evf_vlan_offload_set(struct rte_eth_dev *dev, int mask);
+static void i40evf_dev_release(struct rte_eth_dev *dev);
 static void i40evf_dev_close(struct rte_eth_dev *dev);
 static int  i40evf_dev_reset(struct rte_eth_dev *dev);
 static int i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev);
@@ -1080,13 +1081,10 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
 	args.out_buffer = vf->aq_resp;
 	args.out_size = I40E_AQ_BUF_SZ;
 
-	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 	err = i40evf_execute_vf_cmd(dev, &args);
 	if (err)
 		PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES");
 
-	rte_eal_alarm_set(I40EVF_ALARM_INTERVAL,
-			  i40evf_dev_alarm_handler, dev);
 	return err;
 }
 
@@ -1514,7 +1512,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
 	hw->bus.device = pci_dev->addr.devid;
 	hw->bus.func = pci_dev->addr.function;
 	hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
-	hw->adapter_stopped = 0;
+	hw->adapter_stopped = 1;
 	hw->adapter_closed = 0;
 
 	/* Pass the information to the rte_eth_dev_close() that it should also
@@ -1610,16 +1608,39 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
 	ad->tx_vec_allowed = true;
 
 	if (num_queue_pairs > vf->vsi_res->num_queue_pairs) {
-		int ret = 0;
+		struct i40e_hw *hw;
+		int ret;
+
+		/*
+		 * All VF resources will be reallocated, so change queue pairs
+		 * in secondary processes is forbidden.
+		 */
+		if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+			PMD_DRV_LOG(ERR,
+				"For secondary processes, change queue pairs is forbidden!");
+			return -ENOTSUP;
+		}
 
+		hw  = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 		PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
 			    vf->vsi_res->num_queue_pairs, num_queue_pairs);
+		if (hw->adapter_stopped == 0) {
+			PMD_DRV_LOG(WARNING, "Device must be stopped first!");
+			return -EINVAL;
+		}
+
+		rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 		ret = i40evf_request_queues(dev, num_queue_pairs);
-		if (ret != 0)
+		if (ret)
 			return ret;
 
-		ret = i40evf_dev_reset(dev);
-		if (ret != 0)
+		/*
+		 * The device has been reseted after queue resources changed
+		 * and must be reinitiated.
+		 */
+		i40evf_dev_release(dev);
+		ret = i40evf_dev_init(dev);
+		if (ret)
 			return ret;
 	}
 
@@ -2356,10 +2377,7 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
 i40evf_dev_close(struct rte_eth_dev *dev)
 {
 	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);
-
 	i40evf_dev_stop(dev);
-	i40e_dev_free_queues(dev);
 	/*
 	 * disable promiscuous mode before reset vf
 	 * it is a workaround solution when work with kernel driver
@@ -2370,19 +2388,30 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
 	rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
 
 	i40evf_reset_vf(dev);
-	i40e_shutdown_adminq(hw);
-	i40evf_disable_irq0(hw);
+	i40evf_dev_release(dev);
 
 	dev->dev_ops = NULL;
 	dev->rx_pkt_burst = NULL;
 	dev->tx_pkt_burst = NULL;
 
+	hw->adapter_closed = 1;
+}
+
+static void
+i40evf_dev_release(struct rte_eth_dev *dev)
+{
+	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);
+
+	i40e_shutdown_adminq(hw);
+	i40evf_disable_irq0(hw);
+
 	rte_free(vf->vf_res);
 	vf->vf_res = NULL;
 	rte_free(vf->aq_resp);
 	vf->aq_resp = NULL;
 
-	hw->adapter_closed = 1;
+	i40e_dev_free_queues(dev);
 }
 
 /*
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-07-02  3:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-10 12:07 [dpdk-stable] [PATCH] net/i40e: fix modifying the number of queues alvinx.zhang
2020-06-21 13:36 ` Jeff Guo
2020-06-29  3:16   ` Zhang, AlvinX
2020-06-30  3:13     ` Jeff Guo
2020-07-02  3:26 ` [dpdk-stable] [PATCH v2] net/i40e: fix modify the number of qps in VF alvinx.zhang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).