net: dev: Makes sure netif_rx() can be invoked in any context.

[linux-block.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e490b84732d1654bf067b30f2bb0b0825f88dea9..e99db8341da54086207c6138a6b429e46ae20701 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1948,6 +1948,8 @@ enum netdev_ml_priv_type {
  *     @dev_addr_shadow:       Copy of @dev_addr to catch direct writes.
  *     @linkwatch_dev_tracker: refcount tracker used by linkwatch.
  *     @watchdog_dev_tracker:  refcount tracker used by watchdog.
+ *     @dev_registered_tracker:        tracker for reference held while
+ *                                     registered
  *
  *     FIXME: cleanup struct net_device such that network protocol info
  *     moves out.
@@ -2282,6 +2284,7 @@ struct net_device {
        u8 dev_addr_shadow[MAX_ADDR_LEN];
        netdevice_tracker       linkwatch_dev_tracker;
        netdevice_tracker       watchdog_dev_tracker;
+       netdevice_tracker       dev_registered_tracker;
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 
@@ -3669,8 +3672,18 @@ u32 bpf_prog_run_generic_xdp(struct sk_buff *skb, struct xdp_buff *xdp,
 void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog);
 int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb);
 int netif_rx(struct sk_buff *skb);
-int netif_rx_ni(struct sk_buff *skb);
-int netif_rx_any_context(struct sk_buff *skb);
+int __netif_rx(struct sk_buff *skb);
+
+static inline int netif_rx_ni(struct sk_buff *skb)
+{
+       return netif_rx(skb);
+}
+
+static inline int netif_rx_any_context(struct sk_buff *skb)
+{
+       return netif_rx(skb);
+}
+
 int netif_receive_skb(struct sk_buff *skb);
 int netif_receive_skb_core(struct sk_buff *skb);
 void netif_receive_skb_list_internal(struct list_head *head);
@@ -3817,14 +3830,7 @@ 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.
- * Try using dev_put_track() instead.
- */
-static inline void dev_put(struct net_device *dev)
+static inline void __dev_put(struct net_device *dev)
 {
        if (dev) {
 #ifdef CONFIG_PCPU_DEV_REFCNT
@@ -3835,14 +3841,7 @@ static inline 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.
- * Try using dev_hold_track() instead.
- */
-static inline void dev_hold(struct net_device *dev)
+static inline void __dev_hold(struct net_device *dev)
 {
        if (dev) {
 #ifdef CONFIG_PCPU_DEV_REFCNT
@@ -3853,11 +3852,24 @@ static inline void dev_hold(struct net_device *dev)
        }
 }
 
+static inline void __netdev_tracker_alloc(struct net_device *dev,
+                                         netdevice_tracker *tracker,
+                                         gfp_t gfp)
+{
+#ifdef CONFIG_NET_DEV_REFCNT_TRACKER
+       ref_tracker_alloc(&dev->refcnt_tracker, tracker, gfp);
+#endif
+}
+
+/* netdev_tracker_alloc() can upgrade a prior untracked reference
+ * taken by dev_get_by_name()/dev_get_by_index() to a tracked one.
+ */
 static inline void netdev_tracker_alloc(struct net_device *dev,
                                        netdevice_tracker *tracker, gfp_t gfp)
 {
 #ifdef CONFIG_NET_DEV_REFCNT_TRACKER
-       ref_tracker_alloc(&dev->refcnt_tracker, tracker, gfp);
+       refcount_dec(&dev->refcnt_tracker.no_tracker);
+       __netdev_tracker_alloc(dev, tracker, gfp);
 #endif
 }
 
@@ -3873,8 +3885,8 @@ static inline void dev_hold_track(struct net_device *dev,
                                  netdevice_tracker *tracker, gfp_t gfp)
 {
        if (dev) {
-               dev_hold(dev);
-               netdev_tracker_alloc(dev, tracker, gfp);
+               __dev_hold(dev);
+               __netdev_tracker_alloc(dev, tracker, gfp);
        }
 }
 
@@ -3883,10 +3895,34 @@ static inline void dev_put_track(struct net_device *dev,
 {
        if (dev) {
                netdev_tracker_free(dev, tracker);
-               dev_put(dev);
+               __dev_put(dev);
        }
 }
 
+/**
+ *     dev_hold - get reference to device
+ *     @dev: network device
+ *
+ * Hold reference to device to keep it from being freed.
+ * Try using dev_hold_track() instead.
+ */
+static inline void dev_hold(struct net_device *dev)
+{
+       dev_hold_track(dev, NULL, GFP_ATOMIC);
+}
+
+/**
+ *     dev_put - release reference to device
+ *     @dev: network device
+ *
+ * Release reference to device to allow it to be freed.
+ * Try using dev_put_track() instead.
+ */
+static inline void dev_put(struct net_device *dev)
+{
+       dev_put_track(dev, NULL);
+}
+
 static inline void dev_replace_track(struct net_device *odev,
                                     struct net_device *ndev,
                                     netdevice_tracker *tracker,
@@ -3895,11 +3931,11 @@ static inline void dev_replace_track(struct net_device *odev,
        if (odev)
                netdev_tracker_free(odev, tracker);
 
-       dev_hold(ndev);
-       dev_put(odev);
+       __dev_hold(ndev);
+       __dev_put(odev);
 
        if (ndev)
-               netdev_tracker_alloc(ndev, tracker, gfp);
+               __netdev_tracker_alloc(ndev, tracker, gfp);
 }
 
 /* Carrier loss detection, dial on demand. The functions netif_carrier_on