netdev - Re: [PATCH 2/2] IB/ipoib: fix GRO merge failure for IPoIB originated TCP streams

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 2 Feb 2012 23:42:44 +0200
From:	Or Gerlitz <or.gerlitz@...il.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	netdev@...r.kernel.org, linux-rdma <linux-rdma@...r.kernel.org>
Subject: Re: [PATCH 2/2] IB/ipoib: fix GRO merge failure for IPoIB originated
 TCP streams

On Thu, Feb 2, 2012 at 4:44 PM, Eric Dumazet <eric.dumazet@...il.com> wrote:
> > I guess changing hard_header_len might be difficult (for you).
> > Adding gro_mac_header_len sounds the easy way.
> > [ You'll need to set it in your device setup() ]

> Something like :

Hi Eric,

I will test this patch along with setting gro_mac_header_len in ipoib
and let you know

Or.

>
>  include/linux/netdevice.h |    2 +-
>  net/core/dev.c            |   11 +++++++++--
>  2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 0eac07c..99b12c4 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -1095,7 +1095,7 @@ struct net_device {
>        unsigned int            mtu;    /* interface MTU value          */
>        unsigned short          type;   /* interface hardware type      */
>        unsigned short          hard_header_len;        /* hardware hdr length  */
> -
> +       unsigned int            gro_mac_header_len;
>        /* extra head- and tailroom the hardware may need, but not in all cases
>         * can this be guaranteed, especially tailroom. Some cases also use
>         * LL_MAX_HEADER instead to allocate the skb.
> diff --git a/net/core/dev.c b/net/core/dev.c
> index f124947..a3af7bc 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -3491,14 +3491,20 @@ static inline gro_result_t
>  __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
>  {
>        struct sk_buff *p;
> +       unsigned int maclen = skb->dev->gro_mac_header_len;
>
>        for (p = napi->gro_list; p; p = p->next) {
>                unsigned long diffs;
>
>                diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
>                diffs |= p->vlan_tci ^ skb->vlan_tci;
> -               diffs |= compare_ether_header(skb_mac_header(p),
> -                                             skb_gro_mac_header(skb));
> +               if (maclen == ETH_HLEN)
> +                       diffs |= compare_ether_header(skb_mac_header(p),
> +                                                     skb_gro_mac_header(skb));
> +               else if (!diffs)
> +                       diffs = memcmp(skb_mac_header(p),
> +                                       skb_gro_mac_header(skb),
> +                                       maclen);
>                NAPI_GRO_CB(p)->same_flow = !diffs;
>                NAPI_GRO_CB(p)->flush = 0;
>        }
> @@ -5962,6 +5968,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
>        INIT_LIST_HEAD(&dev->unreg_list);
>        INIT_LIST_HEAD(&dev->link_watch_list);
>        dev->priv_flags = IFF_XMIT_DST_RELEASE;
> +       dev->gro_mac_header_len = ETH_HLEN;
>        setup(dev);
>
>        dev->num_tx_queues = txqs;
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html