git: 801cf532e70f - main - LinuxKPI: add KPI for netdev_notifier_info returning ifp

[Bjoern A. Zeeb]

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=801cf532e70f6b0ebfb2d536b235f166b2e6f0a4

commit 801cf532e70f6b0ebfb2d536b235f166b2e6f0a4
Author:     Bjoern A. Zeeb <bz at FreeBSD.org>
AuthorDate: 2021-05-28 12:44:16 +0000
Commit:     Bjoern A. Zeeb <bz at FreeBSD.org>
CommitDate: 2021-06-18 17:55:30 +0000

    LinuxKPI: add KPI for netdev_notifier_info returning ifp
    
    While currently the ifp gets cast to a net_device and then returned
    and consumers are expecting an ifp again, allow parallel usage now and
    in the future by extending and also passing the ifp directly back in
    the netdev_notifier_info.  Add a function to return the ifp instead of
    the net_device.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      10 days
    Suggested by:   hselasky
    Reviewed by:    hselasky
    Differential Revision: https://reviews.freebsd.org/D30522
---
 sys/compat/linuxkpi/common/include/linux/netdevice.h | 7 +++++++
 sys/compat/linuxkpi/common/src/linux_compat.c        | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h
index faff2fde5f32..1de31b3fa156 100644
--- a/sys/compat/linuxkpi/common/include/linux/netdevice.h
+++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h
@@ -59,6 +59,7 @@
 /* According to linux::ipoib_main.c. */
 struct netdev_notifier_info {
 	struct net_device	*dev;
+	struct ifnet		*ifp;
 };
 
 static inline struct net_device *
@@ -67,6 +68,12 @@ netdev_notifier_info_to_dev(struct netdev_notifier_info *ni)
 	return (ni->dev);
 }
 
+static inline struct ifnet *
+netdev_notifier_info_to_ifp(struct netdev_notifier_info *ni)
+{
+	return (ni->ifp);
+}
+
 int	register_netdevice_notifier(struct notifier_block *);
 int	register_inetaddr_notifier(struct notifier_block *);
 int	unregister_netdevice_notifier(struct notifier_block *);
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
index ef570dda542c..d4571173f93d 100644
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -2315,6 +2315,7 @@ linux_handle_ifnet_link_event(void *arg, struct ifnet *ifp, int linkstate)
 	struct netdev_notifier_info ni;
 
 	nb = arg;
+	ni.ifp = ifp;
 	ni.dev = (struct net_device *)ifp;
 	if (linkstate == LINK_STATE_UP)
 		nb->notifier_call(nb, NETDEV_UP, &ni);
@@ -2329,6 +2330,7 @@ linux_handle_ifnet_arrival_event(void *arg, struct ifnet *ifp)
 	struct netdev_notifier_info ni;
 
 	nb = arg;
+	ni.ifp = ifp;
 	ni.dev = (struct net_device *)ifp;
 	nb->notifier_call(nb, NETDEV_REGISTER, &ni);
 }
@@ -2340,6 +2342,7 @@ linux_handle_ifnet_departure_event(void *arg, struct ifnet *ifp)
 	struct netdev_notifier_info ni;
 
 	nb = arg;
+	ni.ifp = ifp;
 	ni.dev = (struct net_device *)ifp;
 	nb->notifier_call(nb, NETDEV_UNREGISTER, &ni);
 }
@@ -2351,6 +2354,7 @@ linux_handle_iflladdr_event(void *arg, struct ifnet *ifp)
 	struct netdev_notifier_info ni;
 
 	nb = arg;
+	ni.ifp = ifp;
 	ni.dev = (struct net_device *)ifp;
 	nb->notifier_call(nb, NETDEV_CHANGEADDR, &ni);
 }
@@ -2362,6 +2366,7 @@ linux_handle_ifaddr_event(void *arg, struct ifnet *ifp)
 	struct netdev_notifier_info ni;
 
 	nb = arg;
+	ni.ifp = ifp;
 	ni.dev = (struct net_device *)ifp;
 	nb->notifier_call(nb, NETDEV_CHANGEIFADDR, &ni);
 }