From: "Michael S. Tsirkin" <mst@redhat•com>
To: Euan Kemp <euan.kemp@coreos•com>
Cc: seth.forshee@canonical•com, netdev@vger•kernel.org
Subject: Re: Performance regression with virtio_net
Date: Mon, 31 Jul 2017 16:26:08 +0300 [thread overview]
Message-ID: <20170731161903-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20170730222552.4fxxnx3jxg4yv65g@multivac.euank.com>
On Sun, Jul 30, 2017 at 03:25:52PM -0700, Euan Kemp wrote:
> I've also observed this performance regression.
>
> The minimal fix for me is removing the two
> > if (unlikely(len > (unsigned long)ctx))
> checks added in 680557c.
>
> After digging a little more, the reason that check can fail appears to
> be that add_recvbuf_mergeable sometimes includes a hole at the end,
> which is included in len but not ctx.
>
> I'd send a patch removing those conditions, but I'm not certain
> whether "truesize" in receive_mergeable should also be changed back to
> be the max of len/ctx, or should remain as-is.
>
> - Euan
Thanks a lot for looking into it!
I kept this around unchanged from
ab7db91705e95ed1bba1304388936fccfa58c992. That commit had an internal
reason not to account for that space: not enough bits to do it. No
longer true so let's account for length exactly. I'll send a proper
patch after a bit of testing, would appreciate reports reports of
whether this helps very much.
Signed-off-by: Michael S. Tsirkin <mst@redhat•com>
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f41ab0e..782c33f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -889,7 +889,6 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi,
buf = (char *)page_address(alloc_frag->page) + alloc_frag->offset;
buf += headroom; /* advance address leaving hole at front of pkt */
- ctx = (void *)(unsigned long)len;
get_page(alloc_frag->page);
alloc_frag->offset += len + headroom;
hole = alloc_frag->size - alloc_frag->offset;
@@ -904,6 +903,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi,
}
sg_init_one(rq->sg, buf, len);
+ ctx = (void *)(unsigned long)len;
err = virtqueue_add_inbuf_ctx(rq->vq, rq->sg, 1, buf, ctx, gfp);
if (err < 0)
put_page(virt_to_head_page(buf));
--
MST
next prev parent reply other threads:[~2017-07-31 13:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-30 22:25 Performance regression with virtio_net Euan Kemp
2017-07-31 13:26 ` Michael S. Tsirkin [this message]
2017-07-31 14:29 ` Seth Forshee
2017-07-31 18:38 ` Euan Kemp
2017-07-31 18:50 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2017-07-27 17:09 Seth Forshee
2017-07-27 20:38 ` Michael S. Tsirkin
2017-07-27 21:14 ` Seth Forshee
2017-07-27 21:30 ` Michael S. Tsirkin
2017-07-28 13:12 ` Seth Forshee
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=20170731161903-mutt-send-email-mst@kernel.org \
--to=mst@redhat$(echo .)com \
--cc=euan.kemp@coreos$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=seth.forshee@canonical$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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