From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: Re: [PATCH][net-next] net: slightly optimize eth_type_trans Date: Sat, 17 Nov 2018 14:37:12 -0800 Message-ID: References: <1542072871-21208-1-git-send-email-lirongqing@baidu.com> <20181115.151131.596213640354724307.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: David Miller , lirongqing@baidu.com Return-path: Received: from mail-pf1-f170.google.com ([209.85.210.170]:38656 "EHLO mail-pf1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725743AbeKRIz1 (ORCPT ); Sun, 18 Nov 2018 03:55:27 -0500 Received: by mail-pf1-f170.google.com with SMTP id q1so5059561pfi.5 for ; Sat, 17 Nov 2018 14:37:15 -0800 (PST) In-Reply-To: <20181115.151131.596213640354724307.davem@davemloft.net> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 11/15/2018 03:11 PM, David Miller wrote: > > Applied. > While reviewing this stuff, I found we have a bug. If napi_reuse_skb() is called, we might inherit from prior skb->pkt_type value. It seems that GRO could aggregate packets with pkt_type != PACKET_HOST, right ? David, any objection if I submit the following fix ? diff --git a/net/core/dev.c b/net/core/dev.c index 5927f6a7c301ed90af21a4b82b443f30f00bb483..f2bfd2eda7b2734d29d30f0e82c1a48c1b5b166a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5664,6 +5664,10 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) __vlan_hwaccel_clear_tag(skb); skb->dev = napi->dev; skb->skb_iif = 0; + + /* eth_type_trans() assumes initial pkt_type is PACKET_HOST */ + skb->pkt_type = PACKET_HOST; + skb->encapsulation = 0; skb_shinfo(skb)->gso_type = 0; skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));