On Fri, Aug 16, 2024 at 11:24:02AM +0200, Kurt Kanzenbach wrote:
> From: Sriram Yagnaraman <sriram.yagnaraman@xxxxxxxx>
>
> 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.yagnaraman@xxxxxxxx>
> [Kurt: Split patches and use READ_ONCE()]
> Signed-off-by: Kurt Kanzenbach <kurt@xxxxxxxxxxxxx>
Acked-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
> ---
> 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 c718e3d14401..dbba193241b9 100644
> --- a/drivers/net/ethernet/intel/igb/igb.h
> +++ b/drivers/net/ethernet/intel/igb/igb.h
> @@ -805,6 +805,11 @@ static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring)
> return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);
> }
>
> +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 0b81665b2478..db1598876424 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -2946,7 +2946,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;
>
> @@ -2979,7 +2980,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;
>
> @@ -6612,7 +6614,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.2
>
