From patchwork Mon Sep 18 02:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 141254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2461165vqi; Sun, 17 Sep 2023 23:20:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELa/ahwRL5dRqqovNF0rNPtaaHuCHQIWv+WvbRBBHfrox7xAmCXxn71fwc9sGQJxX2EldM X-Received: by 2002:a54:4087:0:b0:3a4:8ac7:3407 with SMTP id i7-20020a544087000000b003a48ac73407mr8746200oii.42.1695018008306; Sun, 17 Sep 2023 23:20:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695018008; cv=none; d=google.com; s=arc-20160816; b=Pbos0zsRaKkxtLMrM8s7CGEs9CsTDC7ekwv8borlUhSnrs798EPxfwAV4X4seVf64g qB25EQ+SNR5vNCZVmETJhxv397elo9o2ObW4hplEjafSYAC0ZTgCDTPXHmkykdz7yH7t IOQLFR+KO6wMnQPGEUj5SuVkOiVowdMpBoGOz0WzCZSCeBxJE1kVGbxMeOP0BVxMjW4v usYOkJZ8g6moiP1Dh+9IsiOOl1bz/P3Fd1nsUBICVndRz8SEOlwYvg8vRbiFYJKJZ/Cy ZS/NjkHhDkeBOAuGmRZ82zaq3BfNRMrqDdZR9uJqtwkbzvoDQAZsoBJyiTaaq4mMMuS4 H/oQ== 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=kCSUcAtTd0hKjmGAppoVTb+EEz2LPzSDyK6JtUSP2o4=; fh=lPJiu6jmd/PNYSA7f4FGF2uZajnQY6Tjd56Vq6QWJeE=; b=MCa6CWsiOQ2eyix5jpWr9KaqIwYC71Ljy8DcEYz5uwMldKG8QgM20JPZK2PjL7fetE FS+jhO7+ev5yAz8xMsIhMW1msUpauMh3DqHtVki8EmyqwF0KxSC/nbaizYLVkdR4u4JN tjhNV8y5I4rWrsnetiQgU5PNefxSXg5Nd2ub0eWB19/YFLwSKEJUMqUh5a5Za37CQBYy haEXV2iZF/tQF4tTxpKESZg+ED55hrSJyhZI33rbAIr1Q+V1LsS1QK1CG2XfkYQUe3J+ 24OY+kvxRULmveALMSNA/zmSfRweqwZrTVmT4rnSkKUBEcr+xYLTwK8yqUrZq4iiyVQI MYXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=mU27p+F3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id by14-20020a056a02058e00b0056fbf327dd5si7787088pgb.131.2023.09.17.23.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 23:20:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=mU27p+F3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id AE19681A2345; Sun, 17 Sep 2023 19:42:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236717AbjIRCly (ORCPT + 28 others); Sun, 17 Sep 2023 22:41:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbjIRCl2 (ORCPT ); Sun, 17 Sep 2023 22:41:28 -0400 Received: from out-215.mta0.migadu.com (out-215.mta0.migadu.com [91.218.175.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBC12102 for ; Sun, 17 Sep 2023 19:41:21 -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=1695004880; 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=kCSUcAtTd0hKjmGAppoVTb+EEz2LPzSDyK6JtUSP2o4=; b=mU27p+F3UEK7SyGBy8bwlgUd8sVCSmLkTmvLW1oO4Vr4mS4A+p80U8AMgKlCyPrfpaPUqf Zhk7+t/zCrlOXBQUqE/tj6MiTeKL+wNs+c6Lkuxm45ZBh/hGQvcCea0e292hKekQNJnl2B 63qp/wsAN8neRPsKuwf/Mwjb5hIR72k= From: Yajun Deng To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yajun Deng , Alexander Lobakin Subject: [PATCH net-next v4] net/core: Introduce netdev_core_stats_inc() for trace Date: Mon, 18 Sep 2023 10:40:55 +0800 Message-Id: <20230918024055.221900-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Sun, 17 Sep 2023 19:42:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777355202982897595 X-GMAIL-MSGID: 1777355202982897595 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. Introduce netdev_core_stats_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 Suggested-by: Alexander Lobakin --- v4: Introduce netdev_core_stats_inc() instead of export dev_core_stats_*_inc() 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 | 21 ++++----------------- net/core/dev.c | 26 ++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0896aaa91dd7..cddd4873b5b0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3980,32 +3980,19 @@ 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); -} +void netdev_core_stats_inc(struct net_device *dev, u32 offset); #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); \ + netdev_core_stats_inc(dev, \ + offsetof(struct net_device_core_stats, 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) +#undef DEV_CORE_STATS_INC static __always_inline int ____dev_forward_skb(struct net_device *dev, struct sk_buff *skb, diff --git a/net/core/dev.c b/net/core/dev.c index ccff2b6ef958..f4cccdf05450 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10475,7 +10475,8 @@ 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 +10489,28 @@ 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 *netdev_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); +} + +void netdev_core_stats_inc(struct net_device *dev, u32 offset) +{ + struct net_device_core_stats __percpu *p; + + p = netdev_core_stats(dev); + if (p) + this_cpu_inc(*(unsigned long *)((void *)p + offset)); +} +EXPORT_SYMBOL_GPL(netdev_core_stats_inc); /** * dev_get_stats - get network device statistics