From: Rusty Russell <rusty@rustcorp•com.au>
To: Michael Dalton <mwdalton@google•com>,
"David S. Miller" <davem@davemloft•net>
Cc: Andrey Vagin <avagin@openvz•org>,
"Michael S. Tsirkin" <mst@redhat•com>,
netdev@vger•kernel.org,
virtualization@lists•linux-foundation.org,
Eric Dumazet <edumazet@google•com>,
Michael Dalton <mwdalton@google•com>
Subject: Re: [PATCH v2] virtio-net: free bufs correctly on invalid packet length
Date: Sat, 07 Dec 2013 11:06:23 +1030 [thread overview]
Message-ID: <87zjod4hvc.fsf@rustcorp.com.au> (raw)
In-Reply-To: <1386278045-23542-1-git-send-email-mwdalton@google.com>
Michael Dalton <mwdalton@google•com> writes:
> When a packet with invalid length arrives, ensure that the packet
> is freed correctly if mergeable packet buffers and big packets
> (GUEST_TSO4) are both enabled.
>
> Signed-off-by: Michael Dalton <mwdalton@google•com>
Acked-by: Rusty Russell <rusty@rustcorp•com.au>
Thanks!
> ---
> drivers/net/virtio_net.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 916241d..6a4665c 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -426,10 +426,10 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
> if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) {
> pr_debug("%s: short packet %i\n", dev->name, len);
> dev->stats.rx_length_errors++;
> - if (vi->big_packets)
> - give_pages(rq, buf);
> - else if (vi->mergeable_rx_bufs)
> + if (vi->mergeable_rx_bufs)
> put_page(virt_to_head_page(buf));
> + else if (vi->big_packets)
> + give_pages(rq, buf);
> else
> dev_kfree_skb(buf);
> return;
> --
> 1.8.5.1
prev parent reply other threads:[~2013-12-07 0:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 21:14 [PATCH v2] virtio-net: free bufs correctly on invalid packet length Michael Dalton
2013-12-06 0:09 ` Michael Dalton
2013-12-06 4:20 ` Jason Wang
2013-12-06 5:09 ` Andrew Vagin
2013-12-06 21:32 ` David Miller
2013-12-06 23:32 ` Michael Dalton
2013-12-07 0:36 ` Rusty Russell [this message]
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=87zjod4hvc.fsf@rustcorp.com.au \
--to=rusty@rustcorp$(echo .)com.au \
--cc=avagin@openvz$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=mst@redhat$(echo .)com \
--cc=mwdalton@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/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