From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Jason Wang <jasowang@redhat.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, mst@redhat.com,
Richard Cochran <richardcochran@gmail.com>
Subject: Re: [PATCH net-next 2/2] tuntap: orphan frags before trying to set tx timestamp
Date: Wed, 04 Sep 2013 17:27:01 +0400 [thread overview]
Message-ID: <52273525.7090501@cogentembedded.com> (raw)
In-Reply-To: <1378269226-5969-2-git-send-email-jasowang@redhat.com>
Hello.
On 04-09-2013 8:33, Jason Wang wrote:
> sock_tx_timestamp() will clear all zerocopy flags of skb which may lead the
> frags never to be orphaned. This will break guest to guest traffic when zerocopy
> is enabled. Fix this by orphaning the frags before trying to set tx time stamp.
> The issue were introduced by commit eda297729171fe16bf34fe5b0419dfb69060f623
> (tun: Support software transmit time stamping).
> Cc: Richard Cochran <richardcochran@gmail.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/net/tun.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 2dddb1b..af9a096 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -749,15 +749,16 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
> >= dev->tx_queue_len / tun->numqueues)
> goto drop;
>
> + /* Orphan the skb - required as we might hang on to it
> + * for indefinite time. */
You could fix the comment style to the networking code default, while at: it:
/* bla
* bla
*/
> + if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
> + goto drop;
> +
> if (skb->sk) {
> sock_tx_timestamp(skb->sk, &skb_shinfo(skb)->tx_flags);
> sw_tx_timestamp(skb);
> }
>
> - /* Orphan the skb - required as we might hang on to it
> - * for indefinite time. */
> - if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
> - goto drop;
WBR, Sergei
next prev parent reply other threads:[~2013-09-04 13:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 4:33 [PATCH net-next 1/2] tuntap: purge socket error queue on detach Jason Wang
2013-09-04 4:33 ` [PATCH net-next 2/2] tuntap: orphan frags before trying to set tx timestamp Jason Wang
2013-09-04 13:27 ` Sergei Shtylyov [this message]
2013-09-05 9:59 ` Jason Wang
2013-09-04 15:57 ` Richard Cochran
2013-09-04 15:56 ` [PATCH net-next 1/2] tuntap: purge socket error queue on detach Richard Cochran
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=52273525.7090501@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
/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