From patchwork Thu Sep 14 02:37:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 139675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp460990vqi; Thu, 14 Sep 2023 09:13:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3oS2VD4gQFFQclyRnzXxLGO9qsSr9Y/7HWZ53okygsRtDv90PoKWcTUmmC41iJHA3Hn1f X-Received: by 2002:a17:903:1c5:b0:1c1:fbec:bc3f with SMTP id e5-20020a17090301c500b001c1fbecbc3fmr6640031plh.5.1694708013360; Thu, 14 Sep 2023 09:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694708013; cv=none; d=google.com; s=arc-20160816; b=Y5H2zsods/yHCxO/7Qsnuo9SszxuRTNmEINdFJF3FJZxx6kazSInrZnDx7sGtFXVj1 wJfvkfW2duRnMysALpaUADiFdVt119KIXkCEfeHRCzXhohWFVWeVqfrE+WZ1igAABSiK vySdpB4O/IOOPr2A8mtD1jLfiobaiRQ/EFWBRT3gNxlYcqK5Za/dSn3RRmvNq1eZAGIF gng6KEfMNC8P5m4ZEhjIxqKKUBhsVOjCOmYPI09fZkyYaYAuQqJeIoO+pgleBouzkkpJ SgqQpfBNf14emui/sEXA2nM5vGHjojM1hI36ECfpBlFvq8Goc5K5nCexKDo1PcBv2xMZ /JZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Te0gE8BeL5k2Q4vc+ipCwTlHKBz8UUJL0hd1jH/MhLs=; fh=2PP8OYQ76W9l9KqBwm7TjpATeE6dNexXeM29v+JVGOc=; b=lVmf+iqd1NYz5/IWLV/1zUV+Q5ZdxvN5/bB3m5tTL6VpdvINolKPDKqo/MwDLN04vn KmB1SugW0oJ+5WHLngs9EpnHUJEFuFvygjiU2dU2XY4ypwY9lYKPJzztUbn524axOcEn xiMcytPHHUtv23+cavHXoaYx+cOXkCqRLEBWnc9HqZoDxvHceond/Tzz92O8XfIcGBGE MpgiYTpRy8EmVEV6jSpEGyg6F9OLfF5+CwYlqM9kzDAhVGCYjd/5k5nnN91Ntsr5K16E 7XCOQrVVZvDQ1pd+lr8sTxxG/fsboVfbwLGaOyxxGSAn2MfhFEG0USXN0uP40ZR9Hi3k a3MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=crVwI+AW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id a15-20020a170902eccf00b001c0c4be62basi2000951plh.617.2023.09.14.09.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 09:13:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=crVwI+AW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EE1F281143E0; Wed, 13 Sep 2023 19:37:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233873AbjINCho (ORCPT + 35 others); Wed, 13 Sep 2023 22:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232177AbjINChn (ORCPT ); Wed, 13 Sep 2023 22:37:43 -0400 X-Greylist: delayed 88157 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 13 Sep 2023 19:37:39 PDT Received: from out-219.mta0.migadu.com (out-219.mta0.migadu.com [IPv6:2001:41d0:1004:224b::db]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B7FFCE4; Wed, 13 Sep 2023 19:37:39 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1694659057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Te0gE8BeL5k2Q4vc+ipCwTlHKBz8UUJL0hd1jH/MhLs=; b=crVwI+AWYA3oZM7fC8Ag1jBJoVKS9boqIHQBr8BswPiERQd+vVIZjvr8ur3+8XujCr5AsG 1dFYGaPwEzlQwUQtwheO3HRzjT9Sy8dbY2v4+e3pmi/0oG/t8EfCgy4Kd14W4L+F0aKzGE 9LTPijEW9twBgaNIR9RlzmNh+l4rV7E= From: Yajun Deng To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH net-next v3] net/core: Export dev_core_stats_*_inc() Date: Thu, 14 Sep 2023 10:37:18 +0800 Message-Id: <20230914023718.3854545-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 19:37:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777030149513241519 X-GMAIL-MSGID: 1777030149513241519 Although there is a kfree_skb_reason() helper function that can be used to find the reason why this skb is dropped, but most callers didn't increase one of rx_dropped, tx_dropped, rx_nohandler and rx_otherhost_dropped. For the users, people are more concerned about why the dropped in ip is increasing. So we can export dev_core_stats_rx_dropped_inc sets, which users would trace them know why rx_dropped is increasing. Export dev_core_stats_{rx_dropped, tx_dropped, rx_nohandler, rx_otherhost_dropped}_inc for trace. Also, move dev_core_stats() and netdev_core_stats_alloc() to dev.c, as they are not called externally. Signed-off-by: Yajun Deng --- v3: __cold should be added to the netdev_core_stats_alloc(). v2: use __cold instead of inline in dev_core_stats(). v1: https://lore.kernel.org/netdev/20230911082016.3694700-1-yajun.deng@linux.dev/ --- include/linux/netdevice.h | 32 +++++--------------------------- net/core/dev.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0896aaa91dd7..879b01c85ba4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3954,6 +3954,11 @@ int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb); bool is_skb_forwardable(const struct net_device *dev, const struct sk_buff *skb); +void dev_core_stats_rx_dropped_inc(struct net_device *dev); +void dev_core_stats_tx_dropped_inc(struct net_device *dev); +void dev_core_stats_rx_nohandler_inc(struct net_device *dev); +void dev_core_stats_rx_otherhost_dropped_inc(struct net_device *dev); + static __always_inline bool __is_skb_forwardable(const struct net_device *dev, const struct sk_buff *skb, const bool check_mtu) @@ -3980,33 +3985,6 @@ static __always_inline bool __is_skb_forwardable(const struct net_device *dev, return false; } -struct net_device_core_stats __percpu *netdev_core_stats_alloc(struct net_device *dev); - -static inline struct net_device_core_stats __percpu *dev_core_stats(struct net_device *dev) -{ - /* This READ_ONCE() pairs with the write in netdev_core_stats_alloc() */ - struct net_device_core_stats __percpu *p = READ_ONCE(dev->core_stats); - - if (likely(p)) - return p; - - return netdev_core_stats_alloc(dev); -} - -#define DEV_CORE_STATS_INC(FIELD) \ -static inline void dev_core_stats_##FIELD##_inc(struct net_device *dev) \ -{ \ - struct net_device_core_stats __percpu *p; \ - \ - p = dev_core_stats(dev); \ - if (p) \ - this_cpu_inc(p->FIELD); \ -} -DEV_CORE_STATS_INC(rx_dropped) -DEV_CORE_STATS_INC(tx_dropped) -DEV_CORE_STATS_INC(rx_nohandler) -DEV_CORE_STATS_INC(rx_otherhost_dropped) - static __always_inline int ____dev_forward_skb(struct net_device *dev, struct sk_buff *skb, const bool check_mtu) diff --git a/net/core/dev.c b/net/core/dev.c index ccff2b6ef958..98592e4c1df0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10475,7 +10475,7 @@ void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, } EXPORT_SYMBOL(netdev_stats_to_stats64); -struct net_device_core_stats __percpu *netdev_core_stats_alloc(struct net_device *dev) +static __cold struct net_device_core_stats __percpu *netdev_core_stats_alloc(struct net_device *dev) { struct net_device_core_stats __percpu *p; @@ -10488,7 +10488,35 @@ struct net_device_core_stats __percpu *netdev_core_stats_alloc(struct net_device /* This READ_ONCE() pairs with the cmpxchg() above */ return READ_ONCE(dev->core_stats); } -EXPORT_SYMBOL(netdev_core_stats_alloc); + +static inline struct net_device_core_stats __percpu *dev_core_stats(struct net_device *dev) +{ + /* This READ_ONCE() pairs with the write in netdev_core_stats_alloc() */ + struct net_device_core_stats __percpu *p = READ_ONCE(dev->core_stats); + + if (likely(p)) + return p; + + return netdev_core_stats_alloc(dev); +} + +#define DEV_CORE_STATS_INC(FIELD) \ +void dev_core_stats_##FIELD##_inc(struct net_device *dev) \ +{ \ + struct net_device_core_stats __percpu *p; \ + \ + p = dev_core_stats(dev); \ + if (p) \ + this_cpu_inc(p->FIELD); \ +} \ +EXPORT_SYMBOL(dev_core_stats_##FIELD##_inc) + +DEV_CORE_STATS_INC(rx_dropped); +DEV_CORE_STATS_INC(tx_dropped); +DEV_CORE_STATS_INC(rx_nohandler); +DEV_CORE_STATS_INC(rx_otherhost_dropped); + +#undef DEV_CORE_STATS_INC /** * dev_get_stats - get network device statistics