From patchwork Fri Aug 4 08:57:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 131047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp137876vqb; Fri, 4 Aug 2023 02:32:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYifg+JMwrlBCmerwY7w3W/8pUObA6/JkDVXDZOchX/5u5WwtR09//F0QwxU0vFHvXKIgB X-Received: by 2002:a17:906:2da:b0:992:9756:6a22 with SMTP id 26-20020a17090602da00b0099297566a22mr1116910ejk.48.1691141564696; Fri, 04 Aug 2023 02:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691141564; cv=none; d=google.com; s=arc-20160816; b=XryBclHmvJ/DD2+qDxJOX8qglC+zD6gUkMprB5m+CcawGYc1A7FxoHJxhpXWhEy3wB aNcWyldo7RmkoQVv/Dx7s2staNkXhNxhn7tN1Rek295CwiHY4Eq9lsLAoSuwf3FoWq49 tvXXSEGIDZoF7zu+P7N92wksO52dOq4kLnyQx3pGNMgol9lpIe3FL3h3NLNoS/E7Smtb 99NNveEWIWAaLsqWgv2xSS/tI/xCmXnNDvRsjjmqXSNpJ8dIwuS5YeLZN7vI6hgtB9Wk acRst2CiJAp5NvvnDCO4GwXQpopWwrYqmlyQsRVX7yEV7LDxYN595mxTTauv3AdkHAK+ Il+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=C1FYVca+yH4RtvB/pl3dnI7b6Q6Cw87RgoFk0/Vn0HE=; fh=VX/Ya237jnqve4054D0Ov32VyHUHRsjkplnAOdTxQfQ=; b=aSRnCD63Jn0dqsDXhWnzxbilzJU/jCThu2eOI6rQIUWN/+DjOf4sprbKMpI1dbuP12 qlLpPHr0btbEql/a/dj9pQCey/Avjxr+dsOQezfjHT/lTb6uqJjFJC/21qn9CQYKRsVm zl/LEDotqbHo8vvpOieT2i7llMz5wjlWAvF0p7d2dSy0vIH1DpS+pKkFo9i9ZZTiS8zX nin4FhcCqzu1Ksw1m68HOpb+yHDN4GGPhH5WXrHRbtexzXAs4bL8OQnXTe9vIWdOw20G 1kzU4UEQY9KeskA/5INK9agXKHJeOkCJiLmJkxqw4Ss0y1GjAEFwtnqYJw8Q6ZBYtIAD +bPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a170906780b00b0099bc8f0358asi428913ejm.918.2023.08.04.02.32.20; Fri, 04 Aug 2023 02:32:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229913AbjHDJCu (ORCPT + 99 others); Fri, 4 Aug 2023 05:02:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbjHDJCJ (ORCPT ); Fri, 4 Aug 2023 05:02:09 -0400 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF1534EFC; Fri, 4 Aug 2023 01:58:00 -0700 (PDT) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4RHKP346sGz4xVnh; Fri, 4 Aug 2023 16:57:59 +0800 (CST) Received: from szxlzmapp04.zte.com.cn ([10.5.231.166]) by mse-fl2.zte.com.cn with SMTP id 3748vi7f025316; Fri, 4 Aug 2023 16:57:44 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Fri, 4 Aug 2023 16:57:46 +0800 (CST) Date: Fri, 4 Aug 2023 16:57:46 +0800 (CST) X-Zmail-TransId: 2b0364ccbd8affffffff972-96c06 X-Mailer: Zmail v1.0 Message-ID: <202308041657467504029@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH=5D_net=3A_add_net_device_refcount_tracker_to_pne?= =?utf-8?q?igh=5Fqueue?= X-MAIL: mse-fl2.zte.com.cn 3748vi7f025316 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 64CCBD97.002/4RHKP346sGz4xVnh X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773290457049300948 X-GMAIL-MSGID: 1773290457049300948 From: xu xin Add a static net device refcount tracker to neighbour.c to track dev's refcnt when pneigh enqueuing and dequeuing. Signed-off-by: xu xin Reviewed-by: Yang Yang Cc: Kuang Mingfu --- net/core/neighbour.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index ddd0f32de20e..56e87130fa95 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -61,6 +61,7 @@ static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, static const struct seq_operations neigh_stat_seq_ops; #endif +static netdevice_tracker pneigh_queue_dev_tracker; /* Neighbour hash table buckets are protected with rwlock tbl->lock. @@ -364,7 +365,7 @@ static void pneigh_queue_purge(struct sk_buff_head *list, struct net *net, spin_unlock_irqrestore(&list->lock, flags); while ((skb = __skb_dequeue(&tmp))) { - dev_put(skb->dev); + netdev_put(skb->dev, &pneigh_queue_dev_tracker); kfree_skb(skb); } } @@ -1633,7 +1634,7 @@ static void neigh_proxy_process(struct timer_list *t) kfree_skb(skb); } - dev_put(dev); + netdev_put(skb->dev, &pneigh_queue_dev_tracker); } else if (!sched_next || tdif < sched_next) sched_next = tdif; } @@ -1673,7 +1674,7 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, sched_next = tbl->proxy_timer.expires; } skb_dst_drop(skb); - dev_hold(skb->dev); + netdev_hold(skb->dev, &pneigh_queue_dev_tracker, GFP_KERNEL); __skb_queue_tail(&tbl->proxy_queue, skb); p->qlen++; mod_timer(&tbl->proxy_timer, sched_next);