ice: do not bring the VSI up, if it was down before the XDP setup

After XDP configuration is completed, we bring the interface up
unconditionally, regardless of its state before the call to .ndo_bpf().

Preserve the information whether the interface had to be brought down and
later bring it up only in such case.

Fixes: efc2214b6047 ("ice: Add support for XDP")
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_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 22b8ef5faf8d56895233057efbaa191da763bff7..c7db88b517da26dc5afc0a9286dabdd41b8a6277 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3005,8 +3005,8 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
                   struct netlink_ext_ack *extack)
 {
        unsigned int frame_size = vsi->netdev->mtu + ICE_ETH_PKT_HDR_PAD;
-       bool if_running = netif_running(vsi->netdev);
        int ret = 0, xdp_ring_err = 0;
+       bool if_running;
 
        if (prog && !prog->aux->xdp_has_frags) {
                if (frame_size > ice_max_xdp_frame_size(vsi)) {
@@ -3023,8 +3023,11 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
                return 0;
        }
 
+       if_running = netif_running(vsi->netdev) &&
+                    !test_and_set_bit(ICE_VSI_DOWN, vsi->state);
+
        /* need to stop netdev while setting up the program for Rx rings */
-       if (if_running && !test_and_set_bit(ICE_VSI_DOWN, vsi->state)) {
+       if (if_running) {
                ret = ice_down(vsi);
                if (ret) {
                        NL_SET_ERR_MSG_MOD(extack, "Preparing device for XDP attach failed");