From patchwork Thu Aug 24 04:40:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 805232 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Na95iLXY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdBSN56LXz9s7g for ; Thu, 24 Aug 2017 14:40:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751291AbdHXEkt (ORCPT ); Thu, 24 Aug 2017 00:40:49 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:38675 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbdHXEke (ORCPT ); Thu, 24 Aug 2017 00:40:34 -0400 Received: by mail-pg0-f65.google.com with SMTP id u9so2165673pgn.5 for ; Wed, 23 Aug 2017 21:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:in-reply-to:references :mime-version:content-transfer-encoding; bh=6rNV9QYJ3NRUTd5unLVbY4H8ivoi9LLq+RamrqM2Z54=; b=Na95iLXYrvHY6bcRzRXgWP3FdrqmgWVPv6op/HLYx0JX/2rLoe20wVg9dLbL18QD6x f1iXwCCCqXxe/kkRRyS/JGo7AF14t2DSSBkqPwMEYx9kpE2GAO4f7YVQrvUXyTnv2Zxj LBKTG5n+wkn6SLcCZoZ4IwQlRKPfRdVC11cq0emnmWPI5MjnDu/xemQfpX7o96oVftHE 9nWY5euywptspAdVQ8jPokAP3TeVe6XyYsTCidT2KIrvVGmAch+iVNYLdOq3nCFBkH3O LFPAcdYU5U/dbVGsNECv7SsrsKCfq2ObjFQd+H5A9fzTnePfpNG+I1P5a72qEzrIGOLI TYVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:mime-version:content-transfer-encoding; bh=6rNV9QYJ3NRUTd5unLVbY4H8ivoi9LLq+RamrqM2Z54=; b=jDUb1MNFaNPP0aQD5aSKjT9CDTwUBP97XHnHj/iO1nDm2Uu73ocJrryRICapVJuREE heF3BqzsnsLyUWEtay4RwqPixPu5Qqfzv321iJTXbNW5beJgp9N9cgd7abd5eIpbCtJt g0jQuyT0en9uu8dm5lTPhGSChaHNKsMjK4Q4WhPppXchOJmM8Bl14uNeiVL/252RZ9jS KuTeh7LxxaCbjhZtIBusWOsGkJ337iquYbxK8m8wqrsdQH0ZjQiPv9VM1UCYjoJqo32i QYniPrHx8I35bsphSlfKKvxFs1VJfRd556/iDYinsl/1Gr6kOlsegU760DXoGNE/Ojlp RQmg== X-Gm-Message-State: AHYfb5hV2TyEimkbLRU8l0QJMeGwB/Y5CVw57N8t8QsSzqQf76khzM9b AGg5mzes2m65tw== X-Received: by 10.99.103.68 with SMTP id b65mr4926271pgc.453.1503549634109; Wed, 23 Aug 2017 21:40:34 -0700 (PDT) Received: from [192.168.86.171] (c-67-180-167-114.hsd1.ca.comcast.net. [67.180.167.114]) by smtp.googlemail.com with ESMTPSA id x124sm5288489pfx.65.2017.08.23.21.40.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 21:40:33 -0700 (PDT) Message-ID: <1503549632.2499.77.camel@edumazet-glaptop3.roam.corp.google.com> Subject: [PATCH net] net: dsa: use consume_skb() From: Eric Dumazet To: David Miller Cc: f.fainelli@gmail.com, netdev@vger.kernel.org, vivien.didelot@savoirfairelinux.com, Woojung.Huh@microchip.com, UNGLinuxDriver@microchip.com Date: Wed, 23 Aug 2017 21:40:32 -0700 In-Reply-To: <20170823.203725.2147193612476095021.davem@davemloft.net> References: <20170822221215.16305-1-f.fainelli@gmail.com> <20170823.203725.2147193612476095021.davem@davemloft.net> X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Two kfree_skb() should be consume_skb(), to be friend with drop monitor (perf record ... -e skb:kfree_skb) Signed-off-by: Eric Dumazet --- net/dsa/tag_ksz.c | 2 +- net/dsa/tag_trailer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 3bd6e2a83125..fcd90f79458e 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -67,7 +67,7 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev) if (skb_put_padto(nskb, nskb->len + padlen)) return NULL; - kfree_skb(skb); + consume_skb(skb); } tag = skb_put(nskb, KSZ_INGRESS_TAG_LEN); diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c index b09e56214005..9c7b1d74a5c6 100644 --- a/net/dsa/tag_trailer.c +++ b/net/dsa/tag_trailer.c @@ -40,7 +40,7 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev) skb_set_network_header(nskb, skb_network_header(skb) - skb->head); skb_set_transport_header(nskb, skb_transport_header(skb) - skb->head); skb_copy_and_csum_dev(skb, skb_put(nskb, skb->len)); - kfree_skb(skb); + consume_skb(skb); if (padlen) { skb_put_zero(nskb, padlen);