[Intel-wired-lan] [PATCH iwl-next v8 2/6] igb: Introduce igb_xdp_is_enabled()

[Kurt Kanzenbach]

From: Sriram Yagnaraman <sriram.yagnara...@est.tech>

Introduce igb_xdp_is_enabled() to check if an XDP program is assigned to
the device. Use that wherever xdp_prog is read and evaluated.

Signed-off-by: Sriram Yagnaraman <sriram.yagnara...@est.tech>
[Kurt: Split patches and use READ_ONCE()]
Signed-off-by: Kurt Kanzenbach <k...@linutronix.de>
Acked-by: Maciej Fijalkowski <maciej.fijalkow...@intel.com>
---
 drivers/net/ethernet/intel/igb/igb.h      | 5 +++++
 drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb.h 
b/drivers/net/ethernet/intel/igb/igb.h
index 1bfe703e73d9..6e2b61ecff68 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -826,6 +826,11 @@ static inline struct igb_ring 
*igb_xdp_tx_queue_mapping(struct igb_adapter *adap
        return adapter->tx_ring[r_idx];
 }
 
+static inline bool igb_xdp_is_enabled(struct igb_adapter *adapter)
+{
+       return !!READ_ONCE(adapter->xdp_prog);
+}
+
 int igb_add_filter(struct igb_adapter *adapter,
                   struct igb_nfc_filter *input);
 int igb_erase_filter(struct igb_adapter *adapter,
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
b/drivers/net/ethernet/intel/igb/igb_main.c
index 5a44867bcb26..fc30966282c5 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2926,7 +2926,8 @@ int igb_xdp_xmit_back(struct igb_adapter *adapter, struct 
xdp_buff *xdp)
        /* During program transitions its possible adapter->xdp_prog is assigned
         * but ring has not been configured yet. In this case simply abort xmit.
         */
-       tx_ring = adapter->xdp_prog ? igb_xdp_tx_queue_mapping(adapter) : NULL;
+       tx_ring = igb_xdp_is_enabled(adapter) ?
+               igb_xdp_tx_queue_mapping(adapter) : NULL;
        if (unlikely(!tx_ring))
                return IGB_XDP_CONSUMED;
 
@@ -2959,7 +2960,8 @@ static int igb_xdp_xmit(struct net_device *dev, int n,
        /* During program transitions its possible adapter->xdp_prog is assigned
         * but ring has not been configured yet. In this case simply abort xmit.
         */
-       tx_ring = adapter->xdp_prog ? igb_xdp_tx_queue_mapping(adapter) : NULL;
+       tx_ring = igb_xdp_is_enabled(adapter) ?
+               igb_xdp_tx_queue_mapping(adapter) : NULL;
        if (unlikely(!tx_ring))
                return -ENXIO;
 
@@ -6593,7 +6595,7 @@ static int igb_change_mtu(struct net_device *netdev, int 
new_mtu)
        struct igb_adapter *adapter = netdev_priv(netdev);
        int max_frame = new_mtu + IGB_ETH_PKT_HDR_PAD;
 
-       if (adapter->xdp_prog) {
+       if (igb_xdp_is_enabled(adapter)) {
                int i;
 
                for (i = 0; i < adapter->num_rx_queues; i++) {

-- 
2.39.5