ice: check for XDP rings instead of bpf program when unconfiguring

If VSI rebuild is pending, .ndo_bpf() can attach/detach the XDP program on
VSI without applying new ring configuration. When unconfiguring the VSI, we
can encounter the state in which there is an XDP program but no XDP rings
to destroy or there will be XDP rings that need to be destroyed, but no XDP
program to indicate their presence.

When unconfiguring, rely on the presence of XDP rings rather then XDP
program, as they better represent the current state that has to be
destroyed.

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com>
Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index c1c1b63d9701771ea97feb41517c9f66a7f1a29e..3dccfaba024c8e04fd35182d171503870a15456c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2426,7 +2426,7 @@ void ice_vsi_decfg(struct ice_vsi *vsi)
                dev_err(ice_pf_to_dev(pf), "Failed to remove RDMA scheduler config for VSI %u, err %d\n",
                        vsi->vsi_num, err);
 
-       if (ice_is_xdp_ena_vsi(vsi))
+       if (vsi->xdp_rings)
                /* return value check can be skipped here, it always returns
                 * 0 if reset is in progress
                 */
@@ -2528,7 +2528,7 @@ static void ice_vsi_release_msix(struct ice_vsi *vsi)
                for (q = 0; q < q_vector->num_ring_tx; q++) {
                        ice_write_itr(&q_vector->tx, 0);
                        wr32(hw, QINT_TQCTL(vsi->txq_map[txq]), 0);
-                       if (ice_is_xdp_ena_vsi(vsi)) {
+                       if (vsi->xdp_rings) {
                                u32 xdp_txq = txq + vsi->num_xdp_txq;
 
                                wr32(hw, QINT_TQCTL(vsi->txq_map[xdp_txq]), 0);

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 4edaddcba3b41fd1f3f8aaa8076715815ca4c86a..22b8ef5faf8d56895233057efbaa191da763bff7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -7249,7 +7249,7 @@ int ice_down(struct ice_vsi *vsi)
        if (tx_err)
                netdev_err(vsi->netdev, "Failed stop Tx rings, VSI %d error %d\n",
                           vsi->vsi_num, tx_err);
-       if (!tx_err && ice_is_xdp_ena_vsi(vsi)) {
+       if (!tx_err && vsi->xdp_rings) {
                tx_err = ice_vsi_stop_xdp_tx_rings(vsi);
                if (tx_err)
                        netdev_err(vsi->netdev, "Failed stop XDP rings, VSI %d error %d\n",
@@ -7266,7 +7266,7 @@ int ice_down(struct ice_vsi *vsi)
        ice_for_each_txq(vsi, i)
                ice_clean_tx_ring(vsi->tx_rings[i]);
 
-       if (ice_is_xdp_ena_vsi(vsi))
+       if (vsi->xdp_rings)
                ice_for_each_xdp_txq(vsi, i)
                        ice_clean_tx_ring(vsi->xdp_rings[i]);
 

diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index a659951fa98729cfd993e52b0c6d8415957845c1..8693509efbe75d8cb1cbb0851409dfea7ad58b8a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -39,7 +39,7 @@ static void ice_qp_reset_stats(struct ice_vsi *vsi, u16 q_idx)
               sizeof(vsi_stat->rx_ring_stats[q_idx]->rx_stats));
        memset(&vsi_stat->tx_ring_stats[q_idx]->stats, 0,
               sizeof(vsi_stat->tx_ring_stats[q_idx]->stats));
-       if (ice_is_xdp_ena_vsi(vsi))
+       if (vsi->xdp_rings)
                memset(&vsi->xdp_rings[q_idx]->ring_stats->stats, 0,
                       sizeof(vsi->xdp_rings[q_idx]->ring_stats->stats));
 }
@@ -52,7 +52,7 @@ static void ice_qp_reset_stats(struct ice_vsi *vsi, u16 q_idx)
 static void ice_qp_clean_rings(struct ice_vsi *vsi, u16 q_idx)
 {
        ice_clean_tx_ring(vsi->tx_rings[q_idx]);
-       if (ice_is_xdp_ena_vsi(vsi))
+       if (vsi->xdp_rings)
                ice_clean_tx_ring(vsi->xdp_rings[q_idx]);
        ice_clean_rx_ring(vsi->rx_rings[q_idx]);
 }
@@ -194,7 +194,7 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
        err = ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, 0, tx_ring, &txq_meta);
        if (!fail)
                fail = err;
-       if (ice_is_xdp_ena_vsi(vsi)) {
+       if (vsi->xdp_rings) {
                struct ice_tx_ring *xdp_ring = vsi->xdp_rings[q_idx];
 
                memset(&txq_meta, 0, sizeof(txq_meta));