similar to: [PATCH net-next 0/8] virtio_net: refactor xdp codes

Due to historical reasons, the implementation of XDP in virtio-net is relatively chaotic. For example, the processing of XDP actions has two copies of similar code. Such as page, xdp_page processing, etc. The purpose of this patch set is to refactor these code. Reduce the difficulty of subsequent maintenance. Subsequent developers will not introduce new bugs because of some complex logical

Due to historical reasons, the implementation of XDP in virtio-net is relatively chaotic. For example, the processing of XDP actions has two copies of similar code. Such as page, xdp_page processing, etc. The purpose of this patch set is to refactor these code. Reduce the difficulty of subsequent maintenance. Subsequent developers will not introduce new bugs because of some complex logical

On Tue, Mar 28, 2023 at 8:04?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > At present, we have two similar logic to perform the XDP prog. > > Therefore, this PATCH separates the code of executing XDP, which is > conducive to later maintenance. > > Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> > --- > drivers/net/virtio_net.c | 142

virtnet_build_xdp_buff_mrg() and virtnet_xdp_handler() auto release xdp shinfo then the caller no need to careful the xdp shinfo. Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> --- drivers/net/virtio_net.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index

On Tue, 4 Apr 2023 13:04:02 +0800, Jason Wang <jasowang at redhat.com> wrote: > On Mon, Apr 3, 2023 at 12:17?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > > > On Mon, 3 Apr 2023 10:43:03 +0800, Jason Wang <jasowang at redhat.com> wrote: > > > On Tue, Mar 28, 2023 at 8:04?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > >

On Tue, Apr 4, 2023 at 2:22?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > On Tue, 4 Apr 2023 13:04:02 +0800, Jason Wang <jasowang at redhat.com> wrote: > > On Mon, Apr 3, 2023 at 12:17?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > > > > > On Mon, 3 Apr 2023 10:43:03 +0800, Jason Wang <jasowang at redhat.com> wrote: > >

? 2023/3/28 20:04, Xuan Zhuo ??: > virtnet_build_xdp_buff_mrg() and virtnet_xdp_handler() auto I think you meant virtnet_xdp_handler() actually? > release xdp shinfo then the caller no need to careful the xdp shinfo. > > Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> > --- > drivers/net/virtio_net.c | 29 +++++++++++++++++------------ > 1 file changed,

On Tue, Apr 4, 2023 at 2:55?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > On Tue, 4 Apr 2023 14:35:05 +0800, Jason Wang <jasowang at redhat.com> wrote: > > On Tue, Apr 4, 2023 at 2:22?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > > > > > On Tue, 4 Apr 2023 13:04:02 +0800, Jason Wang <jasowang at redhat.com> wrote: > >

Hi, On Tue, 2023-03-28 at 20:04 +0800, Xuan Zhuo wrote: > The purpose of this patch is to simplify the receive_mergeable(). > Separate all the logic of XDP into a function. > > Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> > --- > drivers/net/virtio_net.c | 128 +++++++++++++++++++++++---------------- > 1 file changed, 76 insertions(+), 52 deletions(-) >

This patch introduce a new function that releases the xdp shinfo. The subsequent patch will reuse this function. Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> --- drivers/net/virtio_net.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 72b9d6ee4024..09aed60e2f51 100644 ---

In the xdp implementation of virtio-net mergeable, it always checks whether two page is used and a page is selected to release. This is complicated for the processing of action, and be careful. In the entire process, we have such principles: * If xdp_page is used (PASS, TX, Redirect), then we release the old page. * If it is a drop case, we will release two. The old page obtained from buf is

On Tue, Mar 28, 2023 at 8:04?PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote: > > In the xdp implementation of virtio-net mergeable, it always checks > whether two page is used and a page is selected to release. This is > complicated for the processing of action, and be careful. > > In the entire process, we have such principles: > * If xdp_page is used (PASS, TX,

Commit 5b8f3c8d30a6 ("virtio_net: Add XDP related stats") tries to count TX XDP stats in virtnet_receive(). This will cause several issues: - virtnet_xdp_sq() was called without checking whether or not XDP is set. This may cause out of bound access when there's no enough txq for XDP. - Stats were updated even if there's no XDP/XDP_TX. Fixing this by reusing

Commit 5b8f3c8d30a6 ("virtio_net: Add XDP related stats") tries to count TX XDP stats in virtnet_receive(). This will cause several issues: - virtnet_xdp_sq() was called without checking whether or not XDP is set. This may cause out of bound access when there's no enough txq for XDP. - Stats were updated even if there's no XDP/XDP_TX. Fixing this by reusing

On Wed, 22 Mar 2023 16:22:18 +0800, Yunsheng Lin <linyunsheng at huawei.com> wrote: > On 2023/3/22 11:03, Xuan Zhuo wrote: > > In the xdp implementation of virtio-net mergeable, it always checks > > whether two page is used and a page is selected to release. This is > > complicated for the processing of action, and be careful. > > > > In the entire process,

Separating the logic of preparation for xdp from receive_mergeable. The purpose of this is to simplify the logic of execution of XDP. The main logic here is that when headroom is insufficient, we need to allocate a new page and calculate offset. It should be noted that if there is new page, the variable page will refer to the new page. Signed-off-by: Xuan Zhuo <xuanzhuo at

? 2023/3/28 20:04, Xuan Zhuo ??: > Separating the logic of preparation for xdp from receive_mergeable. > > The purpose of this is to simplify the logic of execution of XDP. > > The main logic here is that when headroom is insufficient, we need to > allocate a new page and calculate offset. It should be noted that if > there is new page, the variable page will refer to the new

Hi: This series tries to re-enable XDP_REDIRECT for mergeable buffer which was removed since commit 7324f5399b06 ("virtio_net: disable XDP_REDIRECT in receive_mergeable() case"). Main concerns are: - not enough tailroom was reserved which breaks cpumap - complex logic like EWMA and linearizing during XDP processing Fix those by: - reserve enough tailroom during refill - disable EWMA

Hi: This series tries to re-enable XDP_REDIRECT for mergeable buffer which was removed since commit 7324f5399b06 ("virtio_net: disable XDP_REDIRECT in receive_mergeable() case"). Main concerns are: - not enough tailroom was reserved which breaks cpumap - complex logic like EWMA and linearizing during XDP processing Fix those by: - reserve enough tailroom during refill - disable EWMA

CC: John Fastabend <john.fastabend at gmail.com> Signed-off-by: Jason Wang <jasowang at redhat.com> --- drivers/net/virtio_net.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 511f833..a0ef4b0 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -373,7 +373,6 @@ static struct sk_buff