[PATCH bpf-next 01/14] nfp: don't try to register XDP rxq structures on control queues

[Jakub Kicinski]

Some RX rings are used for control messages, those will not have
a netdev pointer in dp.  Skip XDP rxq handling on those rings.

Fixes: 7f1c684a8966 ("nfp: setup xdp_rxq_info")
Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vanderme...@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c 
b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 05e071b3dc5b..104d6c520a52 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -2253,7 +2253,8 @@ static void nfp_net_rx_ring_free(struct nfp_net_rx_ring 
*rx_ring)
        struct nfp_net_r_vector *r_vec = rx_ring->r_vec;
        struct nfp_net_dp *dp = &r_vec->nfp_net->dp;
 
-       xdp_rxq_info_unreg(&rx_ring->xdp_rxq);
+       if (dp->netdev)
+               xdp_rxq_info_unreg(&rx_ring->xdp_rxq);
        kfree(rx_ring->rxbufs);
 
        if (rx_ring->rxds)
@@ -2279,9 +2280,12 @@ nfp_net_rx_ring_alloc(struct nfp_net_dp *dp, struct 
nfp_net_rx_ring *rx_ring)
 {
        int sz, err;
 
-       err = xdp_rxq_info_reg(&rx_ring->xdp_rxq, dp->netdev, rx_ring->idx);
-       if (err < 0)
-               return err;
+       if (dp->netdev) {
+               err = xdp_rxq_info_reg(&rx_ring->xdp_rxq, dp->netdev,
+                                      rx_ring->idx);
+               if (err < 0)
+                       return err;
+       }
 
        rx_ring->cnt = dp->rxd_cnt;
        rx_ring->size = sizeof(*rx_ring->rxds) * rx_ring->cnt;
-- 
2.15.1