diff mbox series

[net-next,v3,2/3] virtio-net: refactor dim initialization/destruction

Message ID 1712059988-7705-3-git-send-email-hengqi@linux.alibaba.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series ethtool: provide the dim profile fine-tuning channel | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next, async
netdev/ynl fail Generated files up to date; build failed; build has 3 warnings/errors; GEN HAS DIFF 2 files changed, 12188 deletions(-);
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 943 this patch: 943
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 954 this patch: 954
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 954 this patch: 954
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 81 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Heng Qi April 2, 2024, 12:13 p.m. UTC 
Extract the initialization and destruction actions
of dim for use in the next patch.

Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
---
 drivers/net/virtio_net.c | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

Comments

Ratheesh Kannoth April 2, 2024, 12:36 p.m. UTC | #1 
On 2024-04-02 at 17:43:07, Heng Qi (hengqi@linux.alibaba.com) wrote:
> Extract the initialization and destruction actions
> of dim for use in the next patch.
>
> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
> ---
>  drivers/net/virtio_net.c | 37 ++++++++++++++++++++++++++-----------
>  1 file changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index e709d44..5c56fdc 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2278,6 +2278,13 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)
>  	return err;
>  }
>
> +static void virtnet_dim_clean(struct virtnet_info *vi,
> +			      int start_qnum, int end_qnum)
> +{
> +	for (; start_qnum <= end_qnum; start_qnum++)
> +		cancel_work_sync(&vi->rq[start_qnum].dim.work);
> +}
> +
>  static int virtnet_open(struct net_device *dev)
>  {
>  	struct virtnet_info *vi = netdev_priv(dev);
> @@ -2301,11 +2308,9 @@ static int virtnet_open(struct net_device *dev)
>  err_enable_qp:
>  	disable_delayed_refill(vi);
>  	cancel_delayed_work_sync(&vi->refill);
> -
> -	for (i--; i >= 0; i--) {
> +	virtnet_dim_clean(vi, 0, i);
> +	for (i--; i >= 0; i--)
>  		virtnet_disable_queue_pair(vi, i);
Now function argument is  "i", not "i - 1".
Is it intentional ? commit message did not indicate any fixes.

> -		cancel_work_sync(&vi->rq[i].dim.work);
> -	}
>
>  	return err;
>  }
> @@ -2470,7 +2475,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
>
>  	if (running) {
>  		napi_disable(&rq->napi);
> -		cancel_work_sync(&rq->dim.work);
> +		virtnet_dim_clean(vi, qindex, qindex);
>  	}
>
>  	err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
> @@ -2720,10 +2725,9 @@ static int virtnet_close(struct net_device *dev)
>  	/* Make sure refill_work doesn't re-enable napi! */
>  	cancel_delayed_work_sync(&vi->refill);
>
> -	for (i = 0; i < vi->max_queue_pairs; i++) {
> +	virtnet_dim_clean(vi, 0, vi->max_queue_pairs - 1);
> +	for (i = 0; i < vi->max_queue_pairs; i++)
>  		virtnet_disable_queue_pair(vi, i);
> -		cancel_work_sync(&vi->rq[i].dim.work);
> -	}
>
>  	return 0;
>  }
> @@ -4422,6 +4426,19 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
>  	return ret;
>  }
>
> +static void virtnet_dim_init(struct virtnet_info *vi)
> +{
> +	int i;
> +
> +	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL))
> +		return;
> +
> +	for (i = 0; i < vi->max_queue_pairs; i++) {
> +		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
> +		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> +	}
> +}
> +
>  static int virtnet_alloc_queues(struct virtnet_info *vi)
>  {
>  	int i;
> @@ -4441,6 +4458,7 @@ static int virtnet_alloc_queues(struct virtnet_info *vi)
>  		goto err_rq;
>
>  	INIT_DELAYED_WORK(&vi->refill, refill_work);
> +	virtnet_dim_init(vi);
>  	for (i = 0; i < vi->max_queue_pairs; i++) {
>  		vi->rq[i].pages = NULL;
>  		netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll,
> @@ -4449,9 +4467,6 @@ static int virtnet_alloc_queues(struct virtnet_info *vi)
>  					 virtnet_poll_tx,
>  					 napi_tx ? napi_weight : 0);
>
> -		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
> -		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> -
>  		sg_init_table(vi->rq[i].sg, ARRAY_SIZE(vi->rq[i].sg));
>  		ewma_pkt_len_init(&vi->rq[i].mrg_avg_pkt_len);
>  		sg_init_table(vi->sq[i].sg, ARRAY_SIZE(vi->sq[i].sg));
> --
> 1.8.3.1
>
Heng Qi April 3, 2024, 9:43 a.m. UTC | #2 
在 2024/4/2 下午8:36, Ratheesh Kannoth 写道:
> On 2024-04-02 at 17:43:07, Heng Qi (hengqi@linux.alibaba.com) wrote:
>> Extract the initialization and destruction actions
>> of dim for use in the next patch.
>>
>> Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
>> ---
>>   drivers/net/virtio_net.c | 37 ++++++++++++++++++++++++++-----------
>>   1 file changed, 26 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index e709d44..5c56fdc 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -2278,6 +2278,13 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)
>>   	return err;
>>   }
>>
>> +static void virtnet_dim_clean(struct virtnet_info *vi,
>> +			      int start_qnum, int end_qnum)
>> +{
>> +	for (; start_qnum <= end_qnum; start_qnum++)
>> +		cancel_work_sync(&vi->rq[start_qnum].dim.work);
>> +}
>> +
>>   static int virtnet_open(struct net_device *dev)
>>   {
>>   	struct virtnet_info *vi = netdev_priv(dev);
>> @@ -2301,11 +2308,9 @@ static int virtnet_open(struct net_device *dev)
>>   err_enable_qp:
>>   	disable_delayed_refill(vi);
>>   	cancel_delayed_work_sync(&vi->refill);
>> -
>> -	for (i--; i >= 0; i--) {
>> +	virtnet_dim_clean(vi, 0, i);
>> +	for (i--; i >= 0; i--)
>>   		virtnet_disable_queue_pair(vi, i);
> Now function argument is  "i", not "i - 1".
> Is it intentional ? commit message did not indicate any fixes.

Will fix in next version.

Thanks.

>
>> -		cancel_work_sync(&vi->rq[i].dim.work);
>> -	}
>>
>>   	return err;
>>   }
>> @@ -2470,7 +2475,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
>>
>>   	if (running) {
>>   		napi_disable(&rq->napi);
>> -		cancel_work_sync(&rq->dim.work);
>> +		virtnet_dim_clean(vi, qindex, qindex);
>>   	}
>>
>>   	err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
>> @@ -2720,10 +2725,9 @@ static int virtnet_close(struct net_device *dev)
>>   	/* Make sure refill_work doesn't re-enable napi! */
>>   	cancel_delayed_work_sync(&vi->refill);
>>
>> -	for (i = 0; i < vi->max_queue_pairs; i++) {
>> +	virtnet_dim_clean(vi, 0, vi->max_queue_pairs - 1);
>> +	for (i = 0; i < vi->max_queue_pairs; i++)
>>   		virtnet_disable_queue_pair(vi, i);
>> -		cancel_work_sync(&vi->rq[i].dim.work);
>> -	}
>>
>>   	return 0;
>>   }
>> @@ -4422,6 +4426,19 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
>>   	return ret;
>>   }
>>
>> +static void virtnet_dim_init(struct virtnet_info *vi)
>> +{
>> +	int i;
>> +
>> +	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL))
>> +		return;
>> +
>> +	for (i = 0; i < vi->max_queue_pairs; i++) {
>> +		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
>> +		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
>> +	}
>> +}
>> +
>>   static int virtnet_alloc_queues(struct virtnet_info *vi)
>>   {
>>   	int i;
>> @@ -4441,6 +4458,7 @@ static int virtnet_alloc_queues(struct virtnet_info *vi)
>>   		goto err_rq;
>>
>>   	INIT_DELAYED_WORK(&vi->refill, refill_work);
>> +	virtnet_dim_init(vi);
>>   	for (i = 0; i < vi->max_queue_pairs; i++) {
>>   		vi->rq[i].pages = NULL;
>>   		netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll,
>> @@ -4449,9 +4467,6 @@ static int virtnet_alloc_queues(struct virtnet_info *vi)
>>   					 virtnet_poll_tx,
>>   					 napi_tx ? napi_weight : 0);
>>
>> -		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
>> -		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
>> -
>>   		sg_init_table(vi->rq[i].sg, ARRAY_SIZE(vi->rq[i].sg));
>>   		ewma_pkt_len_init(&vi->rq[i].mrg_avg_pkt_len);
>>   		sg_init_table(vi->sq[i].sg, ARRAY_SIZE(vi->sq[i].sg));
>> --
>> 1.8.3.1
>>
diff mbox series

Patch

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index e709d44..5c56fdc 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2278,6 +2278,13 @@  static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)
 	return err;
 }
 
+static void virtnet_dim_clean(struct virtnet_info *vi,
+			      int start_qnum, int end_qnum)
+{
+	for (; start_qnum <= end_qnum; start_qnum++)
+		cancel_work_sync(&vi->rq[start_qnum].dim.work);
+}
+
 static int virtnet_open(struct net_device *dev)
 {
 	struct virtnet_info *vi = netdev_priv(dev);
@@ -2301,11 +2308,9 @@  static int virtnet_open(struct net_device *dev)
 err_enable_qp:
 	disable_delayed_refill(vi);
 	cancel_delayed_work_sync(&vi->refill);
-
-	for (i--; i >= 0; i--) {
+	virtnet_dim_clean(vi, 0, i);
+	for (i--; i >= 0; i--)
 		virtnet_disable_queue_pair(vi, i);
-		cancel_work_sync(&vi->rq[i].dim.work);
-	}
 
 	return err;
 }
@@ -2470,7 +2475,7 @@  static int virtnet_rx_resize(struct virtnet_info *vi,
 
 	if (running) {
 		napi_disable(&rq->napi);
-		cancel_work_sync(&rq->dim.work);
+		virtnet_dim_clean(vi, qindex, qindex);
 	}
 
 	err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
@@ -2720,10 +2725,9 @@  static int virtnet_close(struct net_device *dev)
 	/* Make sure refill_work doesn't re-enable napi! */
 	cancel_delayed_work_sync(&vi->refill);
 
-	for (i = 0; i < vi->max_queue_pairs; i++) {
+	virtnet_dim_clean(vi, 0, vi->max_queue_pairs - 1);
+	for (i = 0; i < vi->max_queue_pairs; i++)
 		virtnet_disable_queue_pair(vi, i);
-		cancel_work_sync(&vi->rq[i].dim.work);
-	}
 
 	return 0;
 }
@@ -4422,6 +4426,19 @@  static int virtnet_find_vqs(struct virtnet_info *vi)
 	return ret;
 }
 
+static void virtnet_dim_init(struct virtnet_info *vi)
+{
+	int i;
+
+	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL))
+		return;
+
+	for (i = 0; i < vi->max_queue_pairs; i++) {
+		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
+		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+	}
+}
+
 static int virtnet_alloc_queues(struct virtnet_info *vi)
 {
 	int i;
@@ -4441,6 +4458,7 @@  static int virtnet_alloc_queues(struct virtnet_info *vi)
 		goto err_rq;
 
 	INIT_DELAYED_WORK(&vi->refill, refill_work);
+	virtnet_dim_init(vi);
 	for (i = 0; i < vi->max_queue_pairs; i++) {
 		vi->rq[i].pages = NULL;
 		netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll,
@@ -4449,9 +4467,6 @@  static int virtnet_alloc_queues(struct virtnet_info *vi)
 					 virtnet_poll_tx,
 					 napi_tx ? napi_weight : 0);
 
-		INIT_WORK(&vi->rq[i].dim.work, virtnet_rx_dim_work);
-		vi->rq[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
-
 		sg_init_table(vi->rq[i].sg, ARRAY_SIZE(vi->rq[i].sg));
 		ewma_pkt_len_init(&vi->rq[i].mrg_avg_pkt_len);
 		sg_init_table(vi->sq[i].sg, ARRAY_SIZE(vi->sq[i].sg));