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: 13384282 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19A137F for ; Thu, 14 Sep 2023 02:37:39 +0000 (UTC) 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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Patchwork-Delegate: kuba@kernel.org 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