From: ebiederm@xmission•com (Eric W. Biederman)
To: Daniel Lezcano <daniel.lezcano@free•fr>
Cc: Eric Dumazet <eric.dumazet@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, greearb@candelatech•com, arnd@arndb•de,
kaber@trash•net
Subject: Re: [PATCH] net: Handle gso packets in dev_forward_skb
Date: Tue, 29 Mar 2011 14:02:58 -0700 [thread overview]
Message-ID: <m1aagdhc71.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <4D91D693.1070202@free.fr> (Daniel Lezcano's message of "Tue, 29 Mar 2011 14:54:43 +0200")
Daniel Lezcano <daniel.lezcano@free•fr> writes:
> On 03/28/2011 09:20 PM, Eric Dumazet wrote:
>> Le dimanche 27 mars 2011 à 18:09 -0700, David Miller a écrit :
>>> From: ebiederm@xmission•com (Eric W. Biederman)
>>> Date: Mon, 21 Mar 2011 15:00:56 -0700
>>>
>>>> Eric Dumazet<eric.dumazet@gmail•com> writes:
>>>>
>>>>> Hmm, did you follow http://patchwork.ozlabs.org/patch/86815/
>>>>> discussion ?
>>>> No. It seems I missed it, but I do have the same problem, and
>>>> essentially the same fix.
>>> Can someone work on getting this straightened out and resubmit the
>>> final patch so I can apply something?
>>>
>> Apparently Daniel is busy.
>
> Yes, sorry for the delay.
> I would like to fix it but I am not sure to understand the different solutions
> proposed.
>
> On 03/28/2011 09:20 PM, Eric Dumazet wrote:
>> Le dimanche 27 mars 2011 à 18:09 -0700, David Miller a écrit :
>>> From: ebiederm@xmission•com (Eric W. Biederman)
>>> Date: Mon, 21 Mar 2011 15:00:56 -0700
>>>
>>>> Eric Dumazet<eric.dumazet@gmail•com> writes:
>>>>
>>>>> Hmm, did you follow http://patchwork.ozlabs.org/patch/86815/
>>>>> discussion ?
>>>> No. It seems I missed it, but I do have the same problem, and
>>>> essentially the same fix.
>>> Can someone work on getting this straightened out and resubmit the
>>> final patch so I can apply something?
>>>
>> Apparently Daniel is busy.
>
> Yes, sorry for the delay.
> I would like to fix it, but my knowledge in limited on offloading.
>
> I did the following patch, it fixes the problem. If it looks good I can resend
> it in patch format:
It looks fine to me. I would resubmit it so that if anyone else has
complaints they will be jolted into looking at the patch again.
Acked-by: "Eric W. Biederman" <ebiederm@xmission•com>
Eric
>
> Index: net-2.6/net/core/dev.c
> ===================================================================
> --- net-2.6.orig/net/core/dev.c 2011-03-29 14:50:00.047646000 +0200
> +++ net-2.6/net/core/dev.c 2011-03-29 14:50:35.587646000 +0200
> @@ -1454,6 +1454,27 @@ static inline void net_timestamp_check(s
> __net_timestamp(skb);
> }
>
> +static inline bool is_skb_forwardable(struct net_device *dev,
> + struct sk_buff *skb)
> +{
> + unsigned int len;
> +
> + if (!(dev->flags & IFF_UP))
> + return false;
> +
> + len = dev->mtu + dev->hard_header_len + VLAN_HLEN;
> + if (skb->len <= len)
> + return true;
> +
> + /* if TSO is enabled, we don't care about the length as the packet
> + * could be forwarded without being segmented before
> + */
> + if (skb_is_gso(skb))
> + return true;
> +
> + return false;
> +}
> +
> /**
> * dev_forward_skb - loopback an skb to another netif
> *
> @@ -1477,8 +1498,7 @@ int dev_forward_skb(struct net_device *d
> skb_orphan(skb);
> nf_reset(skb);
>
> - if (unlikely(!(dev->flags & IFF_UP) ||
> - (skb->len > (dev->mtu + dev->hard_header_len +
> VLAN_HLEN)))) {
> + if (unlikely(!is_skb_forwardable(dev, skb))) {
> atomic_long_inc(&dev->rx_dropped);
> kfree_skb(skb);
> return NET_RX_DROP;
next prev parent reply other threads:[~2011-03-29 21:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 21:25 [PATCH] net: Handle gso packets in dev_forward_skb Eric W. Biederman
2011-03-21 21:42 ` Eric Dumazet
2011-03-21 22:00 ` Eric W. Biederman
2011-03-28 1:09 ` David Miller
2011-03-28 19:20 ` Eric Dumazet
2011-03-28 19:36 ` Eric W. Biederman
2011-03-29 12:54 ` Daniel Lezcano
2011-03-29 21:02 ` Eric W. Biederman [this message]
2011-03-30 7:06 ` David Miller
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=m1aagdhc71.fsf@fess.ebiederm.org \
--to=ebiederm@xmission$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=daniel.lezcano@free$(echo .)fr \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=greearb@candelatech$(echo .)com \
--cc=kaber@trash$(echo .)net \
--cc=netdev@vger$(echo .)kernel.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