From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CDBBC43331 for ; Mon, 11 Nov 2019 14:12:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 798D221925 for ; Mon, 11 Nov 2019 14:12:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726989AbfKKOMN (ORCPT ); Mon, 11 Nov 2019 09:12:13 -0500 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:39595 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726832AbfKKOMN (ORCPT ); Mon, 11 Nov 2019 09:12:13 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=tonylu@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0Tho9KK0_1573481523; Received: from localhost(mailfrom:tonylu@linux.alibaba.com fp:SMTPD_---0Tho9KK0_1573481523) by smtp.aliyun-inc.com(127.0.0.1); Mon, 11 Nov 2019 22:12:03 +0800 From: Tony Lu To: davem@davemloft.net Cc: shemminger@osdl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: remove static inline from dev_put/dev_hold Date: Mon, 11 Nov 2019 22:05:03 +0800 Message-Id: <20191111140502.17541-1-tonylu@linux.alibaba.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch removes static inline from dev_put/dev_hold in order to help trace the pcpu_refcnt leak of net_device. We have sufferred this kind of issue for several times during manipulating NIC between different net namespaces. It prints this log in dmesg: unregister_netdevice: waiting for eth0 to become free. Usage count = 1 However, it is hard to find out who called and leaked refcnt in time. It only left the crime scene but few evidence. Once leaked, it is not safe to fix it up on the running host. We can't trace dev_put/dev_hold directly, for the functions are inlined and used wildly amoung modules. And this issue is common, there are tens of patches fix net_device refcnt leak for various causes. To trace the refcnt manipulating, this patch removes static inline from dev_put/dev_hold. We can use handy tools, such as eBPF with kprobe, to find out who holds but forgets to put refcnt. This will not be called frequently, so the overhead is limited. Signed-off-by: Tony Lu --- include/linux/netdevice.h | 24 ++++-------------------- net/core/dev.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c20f190b4c18..872d266c6da5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3720,27 +3720,11 @@ extern unsigned int netdev_budget_usecs; /* Called by rtnetlink.c:rtnl_unlock() */ void netdev_run_todo(void); -/** - * dev_put - release reference to device - * @dev: network device - * - * Release reference to device to allow it to be freed. - */ -static inline void dev_put(struct net_device *dev) -{ - this_cpu_dec(*dev->pcpu_refcnt); -} +/* Release reference to device to allow it to be freed. */ +void dev_put(struct net_device *dev); -/** - * dev_hold - get reference to device - * @dev: network device - * - * Hold reference to device to keep it from being freed. - */ -static inline void dev_hold(struct net_device *dev) -{ - this_cpu_inc(*dev->pcpu_refcnt); -} +/* Hold reference to device to keep it from being freed. */ +void dev_hold(struct net_device *dev); /* Carrier loss detection, dial on demand. The functions netif_carrier_on * and _off may be called from IRQ context, but it is caller diff --git a/net/core/dev.c b/net/core/dev.c index 99ac84ff398f..620fb3d6718a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1294,6 +1294,30 @@ void netdev_notify_peers(struct net_device *dev) } EXPORT_SYMBOL(netdev_notify_peers); +/** + * dev_put - release reference to device + * @dev: network device + * + * Release reference to device to allow it to be freed. + */ +void dev_put(struct net_device *dev) +{ + this_cpu_dec(*dev->pcpu_refcnt); +} +EXPORT_SYMBOL(dev_put); + +/** + * dev_hold - get reference to device + * @dev: network device + * + * Hold reference to device to keep it from being freed. + */ +void dev_hold(struct net_device *dev) +{ + this_cpu_inc(*dev->pcpu_refcnt); +} +EXPORT_SYMBOL(dev_hold); + static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack) { const struct net_device_ops *ops = dev->netdev_ops; -- 2.24.0