From: Xuan Zhuo <xuanzhuo@linux.alibaba.com> To: netdev@vger.kernel.org Cc: "David S. Miller" <davem@davemloft.net>, "Jakub Kicinski" <kuba@kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>, "Jason Wang" <jasowang@redhat.com>, "Björn Töpel" <bjorn@kernel.org>, "Magnus Karlsson" <magnus.karlsson@intel.com>, "Jonathan Lemon" <jonathan.lemon@gmail.com>, "Alexei Starovoitov" <ast@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Jesper Dangaard Brouer" <hawk@kernel.org>, "John Fastabend" <john.fastabend@gmail.com>, "Andrii Nakryiko" <andrii@kernel.org>, "Martin KaFai Lau" <kafai@fb.com>, "Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>, "KP Singh" <kpsingh@kernel.org>, "Xuan Zhuo" <xuanzhuo@linux.alibaba.com>, virtualization@lists.linux-foundation.org, bpf@vger.kernel.org, "dust . li" <dust.li@linux.alibaba.com> Subject: [PATCH net-next v5 09/15] virtio-net: virtnet_poll_tx support budget check Date: Thu, 10 Jun 2021 16:22:03 +0800 [thread overview] Message-ID: <20210610082209.91487-10-xuanzhuo@linux.alibaba.com> (raw) In-Reply-To: <20210610082209.91487-1-xuanzhuo@linux.alibaba.com> virtnet_poll_tx() check the work done like other network card drivers. When work < budget, napi_poll() in dev.c will exit directly. And virtqueue_napi_complete() will be called to close napi. If closing napi fails or there is still data to be processed, virtqueue_napi_complete() will make napi schedule again, and no conflicts with the logic of napi_poll(). When work == budget, virtnet_poll_tx() will return the var 'work', and the napi_poll() in dev.c will re-add napi to the queue. The purpose of this patch is to support xsk xmit in virtio_poll_tx for subsequent patch. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> --- drivers/net/virtio_net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 989aba600e63..953739860563 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1634,6 +1634,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) struct virtnet_info *vi = sq->vq->vdev->priv; unsigned int index = vq2txq(sq->vq); struct netdev_queue *txq; + int work_done = 0; if (unlikely(is_xdp_raw_buffer_queue(vi, index))) { /* We don't need to enable cb for XDP */ @@ -1646,12 +1647,13 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) free_old_xmit(sq, true); __netif_tx_unlock(txq); - virtqueue_napi_complete(napi, sq->vq, 0); + if (work_done < budget) + virtqueue_napi_complete(napi, sq->vq, 0); if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) netif_tx_wake_queue(txq); - return 0; + return work_done; } static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) -- 2.31.0
WARNING: multiple messages have this Message-ID (diff)
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com> To: netdev@vger.kernel.org Cc: "Song Liu" <songliubraving@fb.com>, "Martin KaFai Lau" <kafai@fb.com>, "Jesper Dangaard Brouer" <hawk@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Michael S. Tsirkin" <mst@redhat.com>, "Yonghong Song" <yhs@fb.com>, "John Fastabend" <john.fastabend@gmail.com>, "Alexei Starovoitov" <ast@kernel.org>, "Andrii Nakryiko" <andrii@kernel.org>, "Björn Töpel" <bjorn@kernel.org>, "dust . li" <dust.li@linux.alibaba.com>, "Jonathan Lemon" <jonathan.lemon@gmail.com>, "KP Singh" <kpsingh@kernel.org>, "Jakub Kicinski" <kuba@kernel.org>, bpf@vger.kernel.org, virtualization@lists.linux-foundation.org, "David S. Miller" <davem@davemloft.net>, "Magnus Karlsson" <magnus.karlsson@intel.com> Subject: [PATCH net-next v5 09/15] virtio-net: virtnet_poll_tx support budget check Date: Thu, 10 Jun 2021 16:22:03 +0800 [thread overview] Message-ID: <20210610082209.91487-10-xuanzhuo@linux.alibaba.com> (raw) In-Reply-To: <20210610082209.91487-1-xuanzhuo@linux.alibaba.com> virtnet_poll_tx() check the work done like other network card drivers. When work < budget, napi_poll() in dev.c will exit directly. And virtqueue_napi_complete() will be called to close napi. If closing napi fails or there is still data to be processed, virtqueue_napi_complete() will make napi schedule again, and no conflicts with the logic of napi_poll(). When work == budget, virtnet_poll_tx() will return the var 'work', and the napi_poll() in dev.c will re-add napi to the queue. The purpose of this patch is to support xsk xmit in virtio_poll_tx for subsequent patch. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> --- drivers/net/virtio_net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 989aba600e63..953739860563 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1634,6 +1634,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) struct virtnet_info *vi = sq->vq->vdev->priv; unsigned int index = vq2txq(sq->vq); struct netdev_queue *txq; + int work_done = 0; if (unlikely(is_xdp_raw_buffer_queue(vi, index))) { /* We don't need to enable cb for XDP */ @@ -1646,12 +1647,13 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) free_old_xmit(sq, true); __netif_tx_unlock(txq); - virtqueue_napi_complete(napi, sq->vq, 0); + if (work_done < budget) + virtqueue_napi_complete(napi, sq->vq, 0); if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) netif_tx_wake_queue(txq); - return 0; + return work_done; } static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) -- 2.31.0 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-06-10 8:22 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-10 8:21 [PATCH net-next v5 00/15] virtio-net: support xdp socket zero copy Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-10 8:21 ` [PATCH net-next v5 01/15] netdevice: priv_flags extend to 64bit Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-10 8:21 ` [PATCH net-next v5 02/15] netdevice: add priv_flags IFF_NOT_USE_DMA_ADDR Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-10 8:21 ` [PATCH net-next v5 03/15] virtio-net: " Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-16 9:27 ` Jason Wang 2021-06-16 9:27 ` Jason Wang 2021-06-16 10:27 ` Xuan Zhuo 2021-06-10 8:21 ` [PATCH net-next v5 04/15] xsk: XDP_SETUP_XSK_POOL support option IFF_NOT_USE_DMA_ADDR Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-10 8:21 ` [PATCH net-next v5 05/15] virtio: support virtqueue_detach_unused_buf_ctx Xuan Zhuo 2021-06-10 8:21 ` Xuan Zhuo 2021-06-17 2:48 ` kernel test robot 2021-06-17 2:48 ` kernel test robot 2021-06-10 8:22 ` [PATCH net-next v5 06/15] virtio-net: unify the code for recycling the xmit ptr Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 2:42 ` Jason Wang 2021-06-16 2:42 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 07/15] virtio-net: standalone virtnet_aloc_frag function Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 2:45 ` Jason Wang 2021-06-16 2:45 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 08/15] virtio-net: split the receive_mergeable function Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 7:33 ` Jason Wang 2021-06-16 7:33 ` Jason Wang 2021-06-16 7:52 ` Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo [this message] 2021-06-10 8:22 ` [PATCH net-next v5 09/15] virtio-net: virtnet_poll_tx support budget check Xuan Zhuo 2021-06-10 8:22 ` [PATCH net-next v5 10/15] virtio-net: independent directory Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 7:34 ` Jason Wang 2021-06-16 7:34 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 11/15] virtio-net: move to virtio_net.h Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 7:35 ` Jason Wang 2021-06-16 7:35 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 12/15] virtio-net: support AF_XDP zc tx Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-16 9:26 ` Jason Wang 2021-06-16 9:26 ` Jason Wang 2021-06-16 10:10 ` Magnus Karlsson 2021-06-16 10:19 ` Xuan Zhuo 2021-06-16 12:51 ` Jason Wang 2021-06-16 12:51 ` Jason Wang 2021-06-16 12:57 ` Xuan Zhuo 2021-06-17 2:36 ` Jason Wang 2021-06-17 2:36 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 13/15] virtio-net: support AF_XDP zc rx Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-17 2:48 ` kernel test robot 2021-06-17 2:48 ` kernel test robot 2021-06-17 3:23 ` Jason Wang 2021-06-17 3:23 ` Jason Wang 2021-06-17 5:53 ` Xuan Zhuo 2021-06-17 6:03 ` Jason Wang 2021-06-17 6:03 ` Jason Wang 2021-06-17 6:37 ` Xuan Zhuo 2021-06-17 6:58 ` Jason Wang 2021-06-17 6:58 ` Jason Wang 2021-06-21 3:26 ` kernel test robot 2021-06-21 3:26 ` kernel test robot 2021-06-10 8:22 ` [PATCH net-next v5 14/15] virtio-net: xsk direct xmit inside xsk wakeup Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-17 3:07 ` Jason Wang 2021-06-17 3:07 ` Jason Wang 2021-06-17 5:55 ` Xuan Zhuo 2021-06-17 6:01 ` Jason Wang 2021-06-17 6:01 ` Jason Wang 2021-06-10 8:22 ` [PATCH net-next v5 15/15] virtio-net: xsk zero copy xmit kick by threshold Xuan Zhuo 2021-06-10 8:22 ` Xuan Zhuo 2021-06-17 3:08 ` Jason Wang 2021-06-17 3:08 ` Jason Wang 2021-06-17 5:56 ` Xuan Zhuo 2021-06-17 6:00 ` Jason Wang 2021-06-17 6:00 ` Jason Wang 2021-06-17 6:43 ` Xuan Zhuo
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=20210610082209.91487-10-xuanzhuo@linux.alibaba.com \ --to=xuanzhuo@linux.alibaba.com \ --cc=andrii@kernel.org \ --cc=ast@kernel.org \ --cc=bjorn@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=dust.li@linux.alibaba.com \ --cc=hawk@kernel.org \ --cc=jasowang@redhat.com \ --cc=john.fastabend@gmail.com \ --cc=jonathan.lemon@gmail.com \ --cc=kafai@fb.com \ --cc=kpsingh@kernel.org \ --cc=kuba@kernel.org \ --cc=magnus.karlsson@intel.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=songliubraving@fb.com \ --cc=virtualization@lists.linux-foundation.org \ --cc=yhs@fb.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.