From: Heng Qi <hengqi@linux.alibaba.com>
To: Ratheesh Kannoth <rkannoth@marvell.com>
Cc: netdev@vger.kernel.org, virtualization@lists.linux.dev,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Subject: Re: [PATCH net-next v3 2/3] virtio-net: refactor dim initialization/destruction
Date: Wed, 3 Apr 2024 17:43:58 +0800 [thread overview]
Message-ID: <2695ca82-9358-4dbe-a253-e847e51f4a47@linux.alibaba.com> (raw)
In-Reply-To: <20240402123656.GA1648445@maili.marvell.com>
在 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
>>
next prev parent reply other threads:[~2024-04-03 9:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 12:13 [PATCH net-next v3 0/3] ethtool: provide the dim profile fine-tuning channel Heng Qi
2024-04-02 12:13 ` [PATCH net-next v3 1/3] ethtool: provide customized dim profile management Heng Qi
2024-04-02 20:11 ` kernel test robot
2024-04-02 12:13 ` [PATCH net-next v3 2/3] virtio-net: refactor dim initialization/destruction Heng Qi
2024-04-02 12:36 ` Ratheesh Kannoth
2024-04-03 9:43 ` Heng Qi [this message]
2024-04-02 12:13 ` [PATCH net-next v3 3/3] virtio-net: support dim profile fine-tuning Heng Qi
2024-04-02 20:53 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2695ca82-9358-4dbe-a253-e847e51f4a47@linux.alibaba.com \
--to=hengqi@linux.alibaba.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rkannoth@marvell.com \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).