Commit 722d8283 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller

virtio_net: remove duplicate queue pair binding in XDP

Factor out qp assignment.
Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0354e4d1
...@@ -340,15 +340,19 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, ...@@ -340,15 +340,19 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
static bool virtnet_xdp_xmit(struct virtnet_info *vi, static bool virtnet_xdp_xmit(struct virtnet_info *vi,
struct receive_queue *rq, struct receive_queue *rq,
struct send_queue *sq,
struct xdp_buff *xdp, struct xdp_buff *xdp,
void *data) void *data)
{ {
struct virtio_net_hdr_mrg_rxbuf *hdr; struct virtio_net_hdr_mrg_rxbuf *hdr;
unsigned int num_sg, len; unsigned int num_sg, len;
struct send_queue *sq;
unsigned int qp;
void *xdp_sent; void *xdp_sent;
int err; int err;
qp = vi->curr_queue_pairs - vi->xdp_queue_pairs + smp_processor_id();
sq = &vi->sq[qp];
/* Free up any pending old buffers before queueing new ones. */ /* Free up any pending old buffers before queueing new ones. */
while ((xdp_sent = virtqueue_get_buf(sq->vq, &len)) != NULL) { while ((xdp_sent = virtqueue_get_buf(sq->vq, &len)) != NULL) {
if (vi->mergeable_rx_bufs) { if (vi->mergeable_rx_bufs) {
...@@ -414,7 +418,6 @@ static struct sk_buff *receive_small(struct net_device *dev, ...@@ -414,7 +418,6 @@ static struct sk_buff *receive_small(struct net_device *dev,
if (xdp_prog) { if (xdp_prog) {
struct virtio_net_hdr_mrg_rxbuf *hdr = buf; struct virtio_net_hdr_mrg_rxbuf *hdr = buf;
struct xdp_buff xdp; struct xdp_buff xdp;
unsigned int qp;
u32 act; u32 act;
if (unlikely(hdr->hdr.gso_type || hdr->hdr.flags)) if (unlikely(hdr->hdr.gso_type || hdr->hdr.flags))
...@@ -428,11 +431,7 @@ static struct sk_buff *receive_small(struct net_device *dev, ...@@ -428,11 +431,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
case XDP_PASS: case XDP_PASS:
break; break;
case XDP_TX: case XDP_TX:
qp = vi->curr_queue_pairs - if (unlikely(!virtnet_xdp_xmit(vi, rq, &xdp, skb)))
vi->xdp_queue_pairs +
smp_processor_id();
if (unlikely(!virtnet_xdp_xmit(vi, rq, &vi->sq[qp],
&xdp, skb)))
trace_xdp_exception(vi->dev, xdp_prog, act); trace_xdp_exception(vi->dev, xdp_prog, act);
rcu_read_unlock(); rcu_read_unlock();
goto xdp_xmit; goto xdp_xmit;
...@@ -559,7 +558,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, ...@@ -559,7 +558,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
if (xdp_prog) { if (xdp_prog) {
struct page *xdp_page; struct page *xdp_page;
struct xdp_buff xdp; struct xdp_buff xdp;
unsigned int qp;
void *data; void *data;
u32 act; u32 act;
...@@ -601,11 +599,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, ...@@ -601,11 +599,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
} }
break; break;
case XDP_TX: case XDP_TX:
qp = vi->curr_queue_pairs - if (unlikely(!virtnet_xdp_xmit(vi, rq, &xdp, data)))
vi->xdp_queue_pairs +
smp_processor_id();
if (unlikely(!virtnet_xdp_xmit(vi, rq, &vi->sq[qp],
&xdp, data)))
trace_xdp_exception(vi->dev, xdp_prog, act); trace_xdp_exception(vi->dev, xdp_prog, act);
ewma_pkt_len_add(&rq->mrg_avg_pkt_len, len); ewma_pkt_len_add(&rq->mrg_avg_pkt_len, len);
if (unlikely(xdp_page != page)) if (unlikely(xdp_page != page))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment