Merge pull request #17893 from benpicco/gnrc_ipv6_nib_iface_up

fabian18 · web-flow · commit 6ac0bbf59164 · 2022-09-17T14:59:44.000+02:00
gnrc_netif: handle NETDEV_EVENT_LINK_UP/DOWN events
diff --git a/cpu/esp_common/esp-now/esp_now_netdev.c b/cpu/esp_common/esp-now/esp_now_netdev.c
@@ -487,6 +487,9 @@ static int _init(netdev_t *netdev)
 {
     DEBUG("%s: %p\n", __func__, netdev);
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/cpu/native/netdev_tap/netdev_tap.c b/cpu/native/netdev_tap/netdev_tap.c
@@ -404,5 +404,9 @@ static int _init(netdev_t *netdev)
     native_async_read_add_handler(dev->tap_fd, netdev, _tap_isr);
 
     DEBUG("gnrc_tapnet: initialized.\n");
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
diff --git a/cpu/nrf5x_common/radio/nrfble/nrfble.c b/cpu/nrf5x_common/radio/nrfble/nrfble.c
@@ -279,6 +279,10 @@ static int _nrfble_init(netdev_t *dev)
     NVIC_EnableIRQ(RADIO_IRQn);
 
     DEBUG("[nrfble] initialization successful\n");
+
+    /* signal link UP */
+    dev->event_callback(dev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/cpu/nrf5x_common/radio/nrfmin/nrfmin.c b/cpu/nrf5x_common/radio/nrfmin/nrfmin.c
@@ -448,6 +448,9 @@ static int nrfmin_init(netdev_t *dev)
 
     DEBUG("[nrfmin] initialization successful\n");
 
+    /* signal link UP */
+    dev->event_callback(dev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/cpu/sam0_common/sam0_eth/eth-netdev.c b/cpu/sam0_common/sam0_eth/eth-netdev.c
@@ -55,6 +55,10 @@ static int _sam0_eth_init(netdev_t *netdev)
     eui48_t hwaddr;
     netdev_eui48_get(netdev, &hwaddr);
     sam0_eth_set_mac(&hwaddr);
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/cpu/stm32/periph/eth.c b/cpu/stm32/periph/eth.c
@@ -460,6 +460,11 @@ static int stm32_eth_init(netdev_t *netdev)
 
     _setup_phy();
 
+    /* signal link UP if no proper link detection is enabled */
+    if (!IS_USED(MODULE_STM32_ETH_LINK_UP)) {
+        netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+    }
+
     return 0;
 }
 
diff --git a/drivers/at86rf215/at86rf215_netdev.c b/drivers/at86rf215/at86rf215_netdev.c
@@ -137,6 +137,9 @@ static int _init(netdev_t *netdev)
     /* reset device to default values and put it into RX state */
     at86rf215_reset_and_cfg(dev);
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/at86rf2xx/at86rf2xx_netdev.c b/drivers/at86rf2xx/at86rf2xx_netdev.c
@@ -108,6 +108,9 @@ static int _init(netdev_t *netdev)
     /* reset device to default values and put it into RX state */
     at86rf2xx_reset(dev);
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/cc110x/cc110x_netdev.c b/drivers/cc110x/cc110x_netdev.c
@@ -343,6 +343,10 @@ static int cc110x_init(netdev_t *netdev)
     }
 
     DEBUG("[cc110x] netdev_driver_t::init(): Success\n");
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/cc2420/cc2420_netdev.c b/drivers/cc2420/cc2420_netdev.c
@@ -136,7 +136,13 @@ static int _init(netdev_t *netdev)
         return -1;
     }
 
-    return cc2420_init(dev);
+    int res = cc2420_init(dev);
+    if (res == 0) {
+        /* signal link UP */
+        netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+    }
+
+    return res;
 }
 
 static void _isr(netdev_t *netdev)
diff --git a/drivers/dose/dose.c b/drivers/dose/dose.c
@@ -761,6 +761,8 @@ static int _init(netdev_t *dev)
 
     state(ctx, DOSE_SIGNAL_INIT);
 
+    dev->event_callback(dev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/ethos/ethos.c b/drivers/ethos/ethos.c
@@ -211,9 +211,11 @@ static void _isr(netdev_t *netdev)
     netdev->event_callback(netdev, NETDEV_EVENT_RX_COMPLETE);
 }
 
-static int _init(netdev_t *encdev)
+static int _init(netdev_t *netdev)
 {
-    (void)encdev;
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/kw41zrf/kw41zrf_netdev.c b/drivers/kw41zrf/kw41zrf_netdev.c
@@ -100,6 +100,9 @@ static int kw41zrf_netdev_init(netdev_t *netdev)
         return -1;
     }
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/mrf24j40/mrf24j40_netdev.c b/drivers/mrf24j40/mrf24j40_netdev.c
@@ -64,6 +64,9 @@ static int _init(netdev_t *netdev)
         return -ENODEV;
     }
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/netdev_ieee802154_submac/netdev_ieee802154_submac.c b/drivers/netdev_ieee802154_submac/netdev_ieee802154_submac.c
@@ -365,6 +365,10 @@ static int _init(netdev_t *netdev)
                           &enable, sizeof(enable));
 
     netdev_submac->dev.txpower = tx_power;
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/nrf24l01p_ng/nrf24l01p_ng_netdev.c b/drivers/nrf24l01p_ng/nrf24l01p_ng_netdev.c
@@ -255,6 +255,10 @@ static int _init(netdev_t *netdev)
         DEBUG_PUTS("[nrf24l01p_ng] _init(): gpio_init_int() failed");
         return -EIO;
     }
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/slipdev/slipdev.c b/drivers/slipdev/slipdev.c
@@ -88,6 +88,10 @@ static int _init(netdev_t *netdev)
                   dev->config.uart, dev->config.baudrate);
         return -ENODEV;
     }
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/sx126x/sx126x_netdev.c b/drivers/sx126x/sx126x_netdev.c
@@ -141,6 +141,10 @@ static int _init(netdev_t *netdev)
     }
 
     DEBUG("[sx126x] netdev: initialization successful\n");
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/sx127x/sx127x_netdev.c b/drivers/sx127x/sx127x_netdev.c
@@ -229,6 +229,9 @@ static int _init(netdev_t *netdev)
 
     DEBUG("[sx127x] netdev: initialization done\n");
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/sx1280/sx1280_netdev.c b/drivers/sx1280/sx1280_netdev.c
@@ -149,6 +149,10 @@ static int _init(netdev_t *netdev)
     }
 
     DEBUG("[sx1280] netdev: initialization successful\n");
+
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/w5100/w5100.c b/drivers/w5100/w5100.c
@@ -180,6 +180,9 @@ static int init(netdev_t *netdev)
     /* release the SPI bus again */
     spi_release(dev->p.spi);
 
+    /* signal link UP */
+    netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/drivers/xbee/xbee.c b/drivers/xbee/xbee.c
@@ -639,6 +639,10 @@ int xbee_init(netdev_t *dev)
     }
 
     DEBUG("[xbee] init: Initialization successful\n");
+
+    /* signal link UP */
+    dev->event_callback(dev, NETDEV_EVENT_LINK_UP);
+
     return 0;
 }
 
diff --git a/sys/include/net/gnrc/ipv6/nib.h b/sys/include/net/gnrc/ipv6/nib.h
@@ -303,6 +303,26 @@ void gnrc_ipv6_nib_init(void);
  */
 void gnrc_ipv6_nib_init_iface(gnrc_netif_t *netif);
 
+/**
+ * @brief   Call bring-up functions when the interface comes online
+ *
+ * @pre `netif != NULL`
+ *
+ * @param[in,out] netif The interface that just got online
+ */
+void gnrc_ipv6_nib_iface_up(gnrc_netif_t *netif);
+
+/**
+ * @brief   Clean up when the interface goes offline
+ *
+ * @pre `netif != NULL`
+ *
+ * @param[in,out] netif         The interface that has just got offline
+ * @param[in]     send_final_ra Whether to advertise router disappearance
+ *                              in a final router advertisement
+ */
+void gnrc_ipv6_nib_iface_down(gnrc_netif_t *netif, bool send_final_ra);
+
 /**
  * @brief   Gets link-layer address of next hop to a destination address
  *
diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c
@@ -1974,6 +1974,14 @@ static void _event_cb(netdev_t *dev, netdev_event_t event)
         DEBUG("gnrc_netif: event triggered -> %i\n", event);
         gnrc_pktsnip_t *pkt = NULL;
         switch (event) {
+#if IS_USED(MODULE_GNRC_IPV6_NIB)
+            case NETDEV_EVENT_LINK_UP:
+                gnrc_ipv6_nib_iface_up(netif);
+                break;
+            case NETDEV_EVENT_LINK_DOWN:
+                gnrc_ipv6_nib_iface_down(netif, false);
+                break;
+#endif
             case NETDEV_EVENT_RX_COMPLETE:
                 pkt = netif->ops->recv(netif);
                 /* send packet previously queued within netif due to the lower
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.h b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.h
@@ -193,6 +193,16 @@ static inline void _init_iface_arsm(gnrc_netif_t *netif)
     _recalc_reach_time(&netif->ipv6);
 }
 
+/**
+ * @brief   Deinitializes interface from address registration state machine
+ *
+ * @param[in] netif An interface
+ */
+static inline void _deinit_iface_arsm(gnrc_netif_t *netif)
+{
+    _evtimer_del(&netif->ipv6.recalc_reach_time);
+}
+
 /**
  * @brief   Gets neighbor unreachability state of a neighbor
  *
@@ -232,11 +242,11 @@ bool _is_reachable(_nib_onl_entry_t *entry);
 #define _handle_state_timeout(ctx)                  (void)ctx
 #define _probe_nbr(nbr, reset)                      (void)nbr; (void)reset
 #define _init_iface_arsm(netif)                     (void)netif
+#define _deinit_iface_arsm(netif)                   (void)netif
 #define _handle_adv_l2(netif, nce, icmpv6, tl2ao)   (void)netif; (void)nce; \
                                                     (void)icmpv6; (void)tl2ao
 #define _recalc_reach_time(netif)                   (void)netif
 #define _set_reachable(netif, nce)                  (void)netif; (void)nce
-#define _init_iface_arsm(netif)                     (void)netif
 
 #define _get_nud_state(nbr)                 (GNRC_IPV6_NIB_NC_INFO_NUD_STATE_UNMANAGED)
 #define _set_nud_state(netif, nce, state)   (void)netif; (void)nbr; (void)state
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
@@ -23,13 +23,13 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <kernel_defines.h>
 
 #include "bitfield.h"
 #include "evtimer_msg.h"
 #include "sched.h"
 #include "mutex.h"
 #include "net/eui64.h"
+#include "kernel_defines.h"
 #include "net/ipv6/addr.h"
 #ifdef MODULE_GNRC_IPV6
 #include "net/gnrc/ipv6.h"
@@ -835,6 +835,16 @@ int _nib_get_route(const ipv6_addr_t *dst, gnrc_pktsnip_t *ctx,
  */
 uint32_t _evtimer_lookup(const void *ctx, uint16_t type);
 
+/**
+ * @brief   Removes an event from the event timer
+ *
+ * @param[in] event Representation of the event.
+ */
+static inline void _evtimer_del(evtimer_msg_event_t *event)
+{
+    evtimer_del(&_nib_evtimer, &event->event);
+}
+
 /**
  * @brief   Adds an event to the event timer
  *
@@ -851,7 +861,7 @@ static inline void _evtimer_add(void *ctx, int16_t type,
 #else
     kernel_pid_t target_pid = KERNEL_PID_LAST;  /* just for testing */
 #endif
-    evtimer_del((evtimer_t *)(&_nib_evtimer), (evtimer_event_t *)event);
+    _evtimer_del(event);
     event->event.next = NULL;
     event->event.offset = offset;
     event->msg.type = type;
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/nib.c b/sys/net/gnrc/network_layer/ipv6/nib/nib.c
diff --git a/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c b/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c

Original file line number	Diff line number	Diff line change
`@@ -487,6 +487,9 @@ static int _init(netdev_t *netdev)`
`487`	`487`	`{`
`488`	`488`	`DEBUG("%s: %p\n", __func__, netdev);`
`489`	`489`
	`490`	`+ /* signal link UP */`
	`491`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`492`	`+`
`490`	`493`	`return 0;`
`491`	`494`	`}`
`492`	`495`
Original file line number	Diff line number	Diff line change
`@@ -404,5 +404,9 @@ static int _init(netdev_t *netdev)`
`404`	`404`	`native_async_read_add_handler(dev->tap_fd, netdev, _tap_isr);`
`405`	`405`
`406`	`406`	`DEBUG("gnrc_tapnet: initialized.\n");`
	`407`	`+`
	`408`	`+ /* signal link UP */`
	`409`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`410`	`+`
`407`	`411`	`return 0;`
`408`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,10 @@ static int _nrfble_init(netdev_t *dev)`
`279`	`279`	`NVIC_EnableIRQ(RADIO_IRQn);`
`280`	`280`
`281`	`281`	`DEBUG("[nrfble] initialization successful\n");`
	`282`	`+`
	`283`	`+ /* signal link UP */`
	`284`	`+ dev->event_callback(dev, NETDEV_EVENT_LINK_UP);`
	`285`	`+`
`282`	`286`	`return 0;`
`283`	`287`	`}`
`284`	`288`
Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,9 @@ static int nrfmin_init(netdev_t *dev)`
`448`	`448`
`449`	`449`	`DEBUG("[nrfmin] initialization successful\n");`
`450`	`450`
	`451`	`+ /* signal link UP */`
	`452`	`+ dev->event_callback(dev, NETDEV_EVENT_LINK_UP);`
	`453`	`+`
`451`	`454`	`return 0;`
`452`	`455`	`}`
`453`	`456`
Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,11 @@ static int stm32_eth_init(netdev_t *netdev)`
`460`	`460`
`461`	`461`	`_setup_phy();`
`462`	`462`
	`463`	`+ /* signal link UP if no proper link detection is enabled */`
	`464`	`+ if (!IS_USED(MODULE_STM32_ETH_LINK_UP)) {`
	`465`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`466`	`+ }`
	`467`	`+`
`463`	`468`	`return 0;`
`464`	`469`	`}`
`465`	`470`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ static int _init(netdev_t *netdev)`
`137`	`137`	`/* reset device to default values and put it into RX state */`
`138`	`138`	`at86rf215_reset_and_cfg(dev);`
`139`	`139`
	`140`	`+ /* signal link UP */`
	`141`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`142`	`+`
`140`	`143`	`return 0;`
`141`	`144`	`}`
`142`	`145`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ static int _init(netdev_t *netdev)`
`108`	`108`	`/* reset device to default values and put it into RX state */`
`109`	`109`	`at86rf2xx_reset(dev);`
`110`	`110`
	`111`	`+ /* signal link UP */`
	`112`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`113`	`+`
`111`	`114`	`return 0;`
`112`	`115`	`}`
`113`	`116`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,10 @@ static int cc110x_init(netdev_t *netdev)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`DEBUG("[cc110x] netdev_driver_t::init(): Success\n");`
	`346`	`+`
	`347`	`+ /* signal link UP */`
	`348`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`349`	`+`
`346`	`350`	`return 0;`
`347`	`351`	`}`
`348`	`352`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,13 @@ static int _init(netdev_t *netdev)`
`136`	`136`	`return -1;`
`137`	`137`	`}`
`138`	`138`
`139`		`- return cc2420_init(dev);`
	`139`	`+ int res = cc2420_init(dev);`
	`140`	`+ if (res == 0) {`
	`141`	`+ /* signal link UP */`
	`142`	`+ netdev->event_callback(netdev, NETDEV_EVENT_LINK_UP);`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ return res;`
`140`	`146`	`}`
`141`	`147`
`142`	`148`	`static void _isr(netdev_t *netdev)`