From: "Michael S. Tsirkin" <mst@redhat.com>
To: John Fastabend <john.fastabend@gmail.com>
Cc: daniel@iogearbox.net, shm@cumulusnetworks.com,
davem@davemloft.net, tgraf@suug.ch, alexei.starovoitov@gmail.com,
john.r.fastabend@intel.com, netdev@vger.kernel.org,
brouer@redhat.com
Subject: Re: [net-next PATCH v5 5/6] virtio_net: add XDP_TX support
Date: Thu, 8 Dec 2016 23:08:07 +0200 [thread overview]
Message-ID: <20161208230616-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <5849A3EE.7090603@gmail.com>
On Thu, Dec 08, 2016 at 10:18:22AM -0800, John Fastabend wrote:
> On 16-12-07 10:11 PM, Michael S. Tsirkin wrote:
> > On Wed, Dec 07, 2016 at 12:12:45PM -0800, John Fastabend wrote:
> >> This adds support for the XDP_TX action to virtio_net. When an XDP
> >> program is run and returns the XDP_TX action the virtio_net XDP
> >> implementation will transmit the packet on a TX queue that aligns
> >> with the current CPU that the XDP packet was processed on.
> >>
> >> Before sending the packet the header is zeroed. Also XDP is expected
> >> to handle checksum correctly so no checksum offload support is
> >> provided.
> >>
> >> Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
> >> ---
> >> drivers/net/virtio_net.c | 99 +++++++++++++++++++++++++++++++++++++++++++---
> >> 1 file changed, 92 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> >> index 28b1196..8e5b13c 100644
> >> --- a/drivers/net/virtio_net.c
> >> +++ b/drivers/net/virtio_net.c
> >> @@ -330,12 +330,57 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
> >> return skb;
> >> }
> >>
> >> +static void virtnet_xdp_xmit(struct virtnet_info *vi,
> >> + struct receive_queue *rq,
> >> + struct send_queue *sq,
> >> + struct xdp_buff *xdp)
> >> +{
> >> + struct page *page = virt_to_head_page(xdp->data);
> >> + struct virtio_net_hdr_mrg_rxbuf *hdr;
> >> + unsigned int num_sg, len;
> >> + void *xdp_sent;
> >> + int err;
> >> +
> >> + /* Free up any pending old buffers before queueing new ones. */
> >> + while ((xdp_sent = virtqueue_get_buf(sq->vq, &len)) != NULL) {
> >> + struct page *sent_page = virt_to_head_page(xdp_sent);
> >> +
> >> + if (vi->mergeable_rx_bufs)
> >> + put_page(sent_page);
> >> + else
> >> + give_pages(rq, sent_page);
> >> + }
> >
> > Looks like this is the only place where you do virtqueue_get_buf.
> > No interrupt handler?
> > This means that if you fill up the queue, nothing will clean it
> > and things will get stuck.
>
> hmm OK so the callbacks should be implemented to do this and a pair
> of virtqueue_enable_cb_prepare()/virtqueue_disable_cb() used to enable
> and disable callbacks if packets are enqueued.
Oh I didn't realize XDP never stops processing packets,
even if they are never freed.
In that case you do not need callbacks.
> Also in the normal xmit path via start_xmit() will the same condition
> happen? It looks like free_old_xmit_skbs for example is only called if
> a packet is sent could we end up holding on to skbs in this case? I
> don't see free_old_xmit_skbs being called from any callbacks?
Right - all it does is restart the queue. That's why we don't support
BQL right now.
> > Can this be the issue you saw?
>
> nope see below I was mishandling the big_packets page cleanup path in
> the error case.
>
> >
> >
> >> +
> >> + /* Zero header and leave csum up to XDP layers */
> >> + hdr = xdp->data;
> >> + memset(hdr, 0, vi->hdr_len);
> >> +
> >> + nu_sg = 1;
> >> + sg_init_one(sq->sg, xdp->data, xdp->data_end - xdp->data);
> >> + err = virtqueue_add_outbuf(sq->vq, sq->sg, num_sg,
> >> + xdp->data, GFP_ATOMIC);
> >> + if (unlikely(err)) {
> >> + if (vi->mergeable_rx_bufs)
> >> + put_page(page);
> >> + else
> >> + give_pages(rq, page);
> >> + } else if (!vi->mergeable_rx_bufs) {
> >> + /* If not mergeable bufs must be big packets so cleanup pages */
> >> + give_pages(rq, (struct page *)page->private);
> >> + page->private = 0;
> >> + }
> >> +
> >> + virtqueue_kick(sq->vq);
> >
> > Is this unconditional kick a work-around for hang
> > we could not figure out yet?
>
> I tracked the original issue down to how I handled the big_packet page
> cleanups.
>
> > I guess this helps because it just slows down the guest.
> > I don't much like it ...
>
> I left it like this copying the pattern in balloon and input drivers. I
> can change it back to the previous pattern where it is only called if
> there is no errors. It has been running fine with the old pattern now
> for an hour or so.
>
> .John
OK makes sense.
next prev parent reply other threads:[~2016-12-08 21:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 20:10 [net-next PATCH v5 0/6] XDP for virtio_net John Fastabend
2016-12-07 20:11 ` [net-next PATCH v5 1/6] net: virtio dynamically disable/enable LRO John Fastabend
2016-12-08 21:36 ` Michael S. Tsirkin
2016-12-09 0:04 ` John Fastabend
2016-12-09 3:05 ` Michael S. Tsirkin
2016-12-14 13:31 ` Michael S. Tsirkin
2016-12-14 17:01 ` John Fastabend
2016-12-15 16:35 ` Michael S. Tsirkin
2016-12-07 20:11 ` [net-next PATCH v5 2/6] net: xdp: add invalid buffer warning John Fastabend
2016-12-07 20:11 ` [net-next PATCH v5 3/6] virtio_net: Add XDP support John Fastabend
2016-12-08 4:48 ` Michael S. Tsirkin
2016-12-08 5:14 ` John Fastabend
2016-12-08 5:54 ` Michael S. Tsirkin
2016-12-07 20:12 ` [net-next PATCH v5 4/6] virtio_net: add dedicated XDP transmit queues John Fastabend
2016-12-08 5:59 ` Michael S. Tsirkin
2016-12-08 17:10 ` John Fastabend
2016-12-07 20:12 ` [net-next PATCH v5 5/6] virtio_net: add XDP_TX support John Fastabend
2016-12-08 6:11 ` Michael S. Tsirkin
2016-12-08 18:18 ` John Fastabend
2016-12-08 21:08 ` Michael S. Tsirkin [this message]
2016-12-08 21:18 ` Michael S. Tsirkin
2016-12-08 21:25 ` John Fastabend
2016-12-08 21:45 ` Michael S. Tsirkin
2016-12-08 21:51 ` John Fastabend
2016-12-07 20:13 ` [net-next PATCH v5 6/6] virtio_net: xdp, add slowpath case for non contiguous buffers John Fastabend
2016-12-08 19:17 ` [net-next PATCH v5 0/6] XDP for virtio_net David Miller
2016-12-08 19:38 ` Alexei Starovoitov
2016-12-08 20:46 ` John Fastabend
2016-12-08 20:58 ` Michael S. Tsirkin
2016-12-08 21:10 ` Michael S. Tsirkin
2016-12-08 21:08 ` Alexei Starovoitov
2016-12-08 22:16 ` David Miller
2016-12-09 3:01 ` Michael S. Tsirkin
2016-12-13 8:46 ` XDP_DROP and XDP_TX (Was: Re: [net-next PATCH v5 0/6] XDP for virtio_net) Jesper Dangaard Brouer
2016-12-08 21:16 ` [net-next PATCH v5 0/6] XDP for virtio_net Michael S. Tsirkin
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=20161208230616-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=alexei.starovoitov@gmail.com \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=john.r.fastabend@intel.com \
--cc=netdev@vger.kernel.org \
--cc=shm@cumulusnetworks.com \
--cc=tgraf@suug.ch \
/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 NNTP newsgroup(s).