From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932901AbcJZRIg (ORCPT <rfc822;w@1wt.eu>);
        Wed, 26 Oct 2016 13:08:36 -0400
Received: from mail-pf0-f173.google.com ([209.85.192.173]:34710 "EHLO
        mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752642AbcJZRId (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 26 Oct 2016 13:08:33 -0400
Message-ID: <1477501711.7065.198.camel@edumazet-glaptop3.roam.corp.google.com>
Subject: Re: [PATCH] net: Reset skb to network header in neigh_hh_output
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Abdelrhman Ahmed <ab@abahmed.com>
Cc: davem <davem@davemloft.net>, netdev <netdev@vger.kernel.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
Date: Wed, 26 Oct 2016 10:08:31 -0700
In-Reply-To: <15801e95765.f826e84d266359.4807464957002677781@abahmed.com>
References: <1579f7f0f4f.114457ec828613.4349884782265574217@abahmed.com>
         <1475874656.28155.268.camel@edumazet-glaptop3.roam.corp.google.com>
         <157fe46f382.10e50a6d8188917.494328765811573491@abahmed.com>
         <1477440742.7065.161.camel@edumazet-glaptop3.roam.corp.google.com>
         <15801e95765.f826e84d266359.4807464957002677781@abahmed.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.10.4-0ubuntu2 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 2016-10-26 at 18:53 +0200, Abdelrhman Ahmed wrote:
> I think it's at the right place as the current one is a little different from the
> commit e1f165032c8bade3a6bdf546f8faf61fda4dd01c.
> 
> In the next lines, skb_push is called after copying the hardware header and there
> is no change to the data pointer inside the retry loop. We only need to reset
> before this loop.
> 
> __skb_pull(skb, skb_network_offset(skb));
> 
> do {
> 	seq = read_seqbegin(&hh->hh_lock);
> 	hh_len = hh->hh_len;
> 	if (likely(hh_len <= HH_DATA_MOD)) {
> 		/* this is inlined by gcc */
> 		memcpy(skb->data - HH_DATA_MOD, hh->hh_data, HH_DATA_MOD);
> 	} else {
> 		int hh_alen = HH_DATA_ALIGN(hh_len);
> 
> 		memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
> 	}
> } while (read_seqretry(&hh->hh_lock, seq));
> 
> skb_push(skb, hh_len);
> 
> In the commit e1f165032c8bade3a6bdf546f8faf61fda4dd01c, dev_hard_header which
> calls create method for adding hardware header (uses skb_push) so it was
> required to reset to network header in the beginning of the retry loop.

Right you are, thanks for the clarification !

Back to the cause of the bug then.

If netfilter is the only case this might be needed, can't this be fixed
in netfilter ?

neigh_hh_output() is in fast path, it is quite annoying adding this
operation.