Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4281C433F5 for ; Fri, 30 Sep 2022 07:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230204AbiI3HA1 (ORCPT ); Fri, 30 Sep 2022 03:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230126AbiI3HAY (ORCPT ); Fri, 30 Sep 2022 03:00:24 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EFAF580A9 for ; Fri, 30 Sep 2022 00:00:18 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id v186so3465881pfv.11 for ; Fri, 30 Sep 2022 00:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=mcCCCYYMIuK+7UN+/Zbe2o9HY7Kwn36bEy3DrF3VO4w=; b=nxtOxYUg2H27HnXJLQif8wqJT9ZmRGURaVbAR8vdaUKBP16OXa42nt2k4MQb0mv6GF U8nPe9Rm+PKhtUhpw+krmEdfNvDXx714i2YvW1+UgTanjNkh1WeFAFojZyie3CZIncXz zVYi8fByeegZlZTTJ8m375VaPNIKBxE4dwVp5jbVCMZThZ5skSRVbgXYDxcV+qZ+mY6Z NGxUE3+9Dqap0WYiDVZuOIqj1pgJfwvv4MZcRXkXVpXS5QjHrKpXoQ4rEB3pf12RURJ5 CjwLhPv7MYUfIQ8eM/WLbT4RKMA91kKHZAQ2iXiKZGGpIckHId3J8pbi5QnVI0SviRSF QvGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=mcCCCYYMIuK+7UN+/Zbe2o9HY7Kwn36bEy3DrF3VO4w=; b=4k0dNf1+lCcvtG1JEu/BOZUmDXXYI5ycSVA0y2pISVLy/hBYzP6T8lzos53UlAla5Q oySfISQ0GVX8CCRT+yjhlQmA9gG3rukF0bAKwIZK5Ygc24i+BmsZUatWtxDhOpnbtrXS R5iFiH3zjRF0cxz9FrA7qCYk9LueExU1x+8ohjtcGi0Umy8Q/k2Y9QKHx7s9HxsjfMsQ ZiXMNMjuNtX37F2HUVNgQj0RsCJlICrqCbDBb8OOa4HqVXmbDqmrpTb6a3XVBz4vl8Yq evSGpKr7kP38FZ+nKomJn/Eci5N50YXzf60C6QJjVo+OkGF+dYCCvFmWfQn3JjX600Hs ZGmQ== X-Gm-Message-State: ACrzQf2MXXnZNbnVrjqnhV+Ts0Phw2A97wFY3olu49bY/2B7dfabqEYR OVwhu75XbpJMEC4l5xBHMqJrCiVJluMzaQ== X-Google-Smtp-Source: AMsMyM5RqrnOv4WwtuSNoKVAUQUHOXdZ0wG0JSQPhZU2di1rbhz43Y2AEkvftI8Qia4jRkYek6bCGg== X-Received: by 2002:a05:6a00:c86:b0:542:7c38:4a59 with SMTP id a6-20020a056a000c8600b005427c384a59mr7599289pfv.74.1664521218308; Fri, 30 Sep 2022 00:00:18 -0700 (PDT) Received: from Laptop-X1.redhat.com ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id j13-20020a63594d000000b0041c0c9c0072sm998268pgm.64.2022.09.30.00.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 00:00:17 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ido Schimmel , Petr Machata , Florent Fourcot , Nikolay Aleksandrov , Nicolas Dichtel , Guillaume Nault , David Ahern , Hangbin Liu Subject: [PATCHv4 net-next 2/4] net: add new helper unregister_netdevice_many_notify Date: Fri, 30 Sep 2022 14:59:55 +0800 Message-Id: <20220930065957.694263-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220930065957.694263-1-liuhangbin@gmail.com> References: <20220930065957.694263-1-liuhangbin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add new helper unregister_netdevice_many_notify(), pass netlink message header and port id, which could be used to notify userspace when flag NLM_F_ECHO is set. Make the unregister_netdevice_many() as a wrapper of new function unregister_netdevice_many_notify(). Suggested-by: Guillaume Nault Signed-off-by: Hangbin Liu --- include/linux/netdevice.h | 2 ++ net/core/dev.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index a71d378945e3..150d7e90b2fc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3026,6 +3026,8 @@ static inline int dev_direct_xmit(struct sk_buff *skb, u16 queue_id) int register_netdevice(struct net_device *dev); void unregister_netdevice_queue(struct net_device *dev, struct list_head *head); +void unregister_netdevice_many_notify(struct list_head *head, + struct nlmsghdr *nlh, u32 pid); void unregister_netdevice_many(struct list_head *head); static inline void unregister_netdevice(struct net_device *dev) { diff --git a/net/core/dev.c b/net/core/dev.c index 89cf082317dd..7e625b37880f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10779,11 +10779,14 @@ EXPORT_SYMBOL(unregister_netdevice_queue); /** * unregister_netdevice_many - unregister many devices * @head: list of devices + * @nlh: netlink message header + * @pid: destination netlink portid for reports * * Note: As most callers use a stack allocated list_head, * we force a list_del() to make sure stack wont be corrupted later. */ -void unregister_netdevice_many(struct list_head *head) +void unregister_netdevice_many_notify(struct list_head *head, + struct nlmsghdr *nlh, u32 pid) { struct net_device *dev, *tmp; LIST_HEAD(close_head); @@ -10845,7 +10848,8 @@ void unregister_netdevice_many(struct list_head *head) if (!dev->rtnl_link_ops || dev->rtnl_link_state == RTNL_LINK_INITIALIZED) skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0, - GFP_KERNEL, NULL, 0, 0, 0); + GFP_KERNEL, NULL, 0, + pid, nlh ? nlh->nlmsg_seq : 0); /* * Flush the unicast and multicast chains @@ -10860,7 +10864,7 @@ void unregister_netdevice_many(struct list_head *head) dev->netdev_ops->ndo_uninit(dev); if (skb) - rtmsg_ifinfo_send(skb, dev, GFP_KERNEL, 0, NULL); + rtmsg_ifinfo_send(skb, dev, GFP_KERNEL, pid, nlh); /* Notifier chain MUST detach us all upper devices. */ WARN_ON(netdev_has_any_upper_dev(dev)); @@ -10883,6 +10887,12 @@ void unregister_netdevice_many(struct list_head *head) list_del(head); } +EXPORT_SYMBOL(unregister_netdevice_many_notify); + +void unregister_netdevice_many(struct list_head *head) +{ + unregister_netdevice_many_notify(head, NULL, 0); +} EXPORT_SYMBOL(unregister_netdevice_many); /** -- 2.37.2