search for: virtio_xdp_headroom

...want to bother users who are + * using xdp normally. + */ + if (!xdp_prog->aux->xdp_has_frags && + (*num_buf > 1 || headroom < virtnet_get_headroom(vi))) { + /* linearize data for XDP */ + xdp_page = xdp_linearize_page(rq, num_buf, + *page, offset, + VIRTIO_XDP_HEADROOM, + len); + + if (!xdp_page) + return NULL; + } else if (unlikely(headroom < virtnet_get_headroom(vi))) { + xdp_room = SKB_DATA_ALIGN(VIRTIO_XDP_HEADROOM + + sizeof(struct skb_shared_info)); + if (*len + xdp_room > PAGE_SIZE) + return NULL; + + xdp_page = alloc_page(GFP...

...using xdp normally. > + */ > + if (!xdp_prog->aux->xdp_has_frags && > + (*num_buf > 1 || headroom < virtnet_get_headroom(vi))) { > + /* linearize data for XDP */ > + xdp_page = xdp_linearize_page(rq, num_buf, > + *page, offset, > + VIRTIO_XDP_HEADROOM, > + len); > + > + if (!xdp_page) > + return NULL; > + } else if (unlikely(headroom < virtnet_get_headroom(vi))) { > + xdp_room = SKB_DATA_ALIGN(VIRTIO_XDP_HEADROOM + > + sizeof(struct skb_shared_info)); > + if (*len + xdp_room > PAGE_SIZE) > +...

...--git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e2560b6f7980..4d2bf1ce0730 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1245,6 +1245,9 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, if (!xdp_page) goto err_xdp; offset = VIRTIO_XDP_HEADROOM; + + put_page(page); + page = xdp_page; } else if (unlikely(headroom < virtnet_get_headroom(vi))) { xdp_room = SKB_DATA_ALIGN(VIRTIO_XDP_HEADROOM + sizeof(struct skb_shared_info)); @@ -1259,6 +1262,9 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,...

...44 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1245,6 +1245,9 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > if (!xdp_page) > goto err_xdp; > offset = VIRTIO_XDP_HEADROOM; > + > + put_page(page); > + page = xdp_page; > } else if (unlikely(headroom < virtnet_get_headroom(vi))) { > xdp_room = SKB_DATA_ALIGN(VIRTIO_XDP_HEADROOM + >...

....data + len; xdp.data_meta = xdp.data; xdp.rxq = &rq->xdp_rxq; @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, * the descriptor on if we get an XDP_TX return code. */ data = page_address(xdp_page) + offset; - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; xdp.data = data + vi->hdr_len; xdp.data_end = xdp.data + (len - vi->hdr_len); xdp.data_meta = xdp.data; -- 2.20.1

....data + len; xdp.data_meta = xdp.data; xdp.rxq = &rq->xdp_rxq; @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, * the descriptor on if we get an XDP_TX return code. */ data = page_address(xdp_page) + offset; - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; xdp.data = data + vi->hdr_len; xdp.data_end = xdp.data + (len - vi->hdr_len); xdp.data_meta = xdp.data; -- 2.20.1

...index e2560b6f7980..4d2bf1ce0730 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -1245,6 +1245,9 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > > if (!xdp_page) > > goto err_xdp; > > offset = VIRTIO_XDP_HEADROOM; > > + > > + put_page(page); > > the error handling of xdp_linearize_page() does not seems self contained. > Does it not seem better? > 1. if xdp_linearize_page() succesed, call put_page() for first buffer just > as put_page() is call for other buffer > 2. or call...

...f --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index e31b5b2..e732bd6 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -407,6 +407,67 @@ static unsigned int virtnet_get_headroom(struct virtnet_info *vi) > return vi->xdp_queue_pairs ? VIRTIO_XDP_HEADROOM : 0; > } > > +/* We copy and linearize packet in the following cases: > + * > + * 1) Packet across multiple buffers, this happens normally when rx > + * buffer size is underestimated. Rarely, since spec does not > + * forbid using more than one buffer even if a single...

...f --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index e31b5b2..e732bd6 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -407,6 +407,67 @@ static unsigned int virtnet_get_headroom(struct virtnet_info *vi) > return vi->xdp_queue_pairs ? VIRTIO_XDP_HEADROOM : 0; > } > > +/* We copy and linearize packet in the following cases: > + * > + * 1) Packet across multiple buffers, this happens normally when rx > + * buffer size is underestimated. Rarely, since spec does not > + * forbid using more than one buffer even if a single...

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

...+), 125 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e31b5b2..e732bd6 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -407,6 +407,67 @@ static unsigned int virtnet_get_headroom(struct virtnet_info *vi) return vi->xdp_queue_pairs ? VIRTIO_XDP_HEADROOM : 0; } +/* We copy and linearize packet in the following cases: + * + * 1) Packet across multiple buffers, this happens normally when rx + * buffer size is underestimated. Rarely, since spec does not + * forbid using more than one buffer even if a single buffer is + * sufficient for the...

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

....rxq = &rq->xdp_rxq; >> @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, >> * the descriptor on if we get an XDP_TX return code. >> */ >> data = page_address(xdp_page) + offset; >> - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; >> + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; >> xdp.data = data + vi->hdr_len; >> xdp.data_end = xdp.data + (len - vi->hdr_len); >> xdp.data_meta = xdp.data; >> -- >> 2.20.1

....rxq = &rq->xdp_rxq; >> @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, >> * the descriptor on if we get an XDP_TX return code. >> */ >> data = page_address(xdp_page) + offset; >> - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; >> + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; >> xdp.data = data + vi->hdr_len; >> xdp.data_end = xdp.data + (len - vi->hdr_len); >> xdp.data_meta = xdp.data; >> -- >> 2.20.1

...;>> --- a/drivers/net/virtio_net.c > >>> +++ b/drivers/net/virtio_net.c > >>> @@ -1245,6 +1245,9 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > >>> if (!xdp_page) > >>> goto err_xdp; > >>> offset = VIRTIO_XDP_HEADROOM; > >>> + > >>> + put_page(page); > >> > >> the error handling of xdp_linearize_page() does not seems self contained. > >> Does it not seem better? > >> 1. if xdp_linearize_page() succesed, call put_page() for first buffer just > >&...

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

....rxq = &rq->xdp_rxq; >> @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, >> * the descriptor on if we get an XDP_TX return code. >> */ >> data = page_address(xdp_page) + offset; >> - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; >> + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; >> xdp.data = data + vi->hdr_len; >> xdp.data_end = xdp.data + (len - vi->hdr_len); >> xdp.data_meta = xdp.data; > >

....rxq = &rq->xdp_rxq; >> @@ -845,7 +845,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, >> * the descriptor on if we get an XDP_TX return code. >> */ >> data = page_address(xdp_page) + offset; >> - xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM + vi->hdr_len; >> + xdp.data_hard_start = data - VIRTIO_XDP_HEADROOM; >> xdp.data = data + vi->hdr_len; >> xdp.data_end = xdp.data + (len - vi->hdr_len); >> xdp.data_meta = xdp.data; > >