Skip to content

Commit bc4f132

Browse files
michalQbanguy11
authored andcommitted
ice: fix Tx scheduler error handling in XDP callback
When the XDP program is loaded, the XDP callback adds new Tx queues. This means that the callback must update the Tx scheduler with the new queue number. In the event of a Tx scheduler failure, the XDP callback should also fail and roll back any changes previously made for XDP preparation. The previous implementation had a bug that not all changes made by the XDP callback were rolled back. This caused the crash with the following call trace: [ +9.549584] ice 0000:ca:00.0: Failed VSI LAN queue config for XDP, error: -5 [ +0.382335] Oops: general protection fault, probably for non-canonical address 0x50a2250a90495525: 0000 [#1] SMP NOPTI [ +0.010710] CPU: 103 UID: 0 PID: 0 Comm: swapper/103 Not tainted 6.14.0-net-next-mar-31+ torvalds#14 PREEMPT(voluntary) [ +0.010175] Hardware name: Intel Corporation M50CYP2SBSTD/M50CYP2SBSTD, BIOS SE5C620.86B.01.01.0005.2202160810 02/16/2022 [ +0.010946] RIP: 0010:__ice_update_sample+0x39/0xe0 [ice] [...] [ +0.002715] Call Trace: [ +0.002452] <IRQ> [ +0.002021] ? __die_body.cold+0x19/0x29 [ +0.003922] ? die_addr+0x3c/0x60 [ +0.003319] ? exc_general_protection+0x17c/0x400 [ +0.004707] ? asm_exc_general_protection+0x26/0x30 [ +0.004879] ? __ice_update_sample+0x39/0xe0 [ice] [ +0.004835] ice_napi_poll+0x665/0x680 [ice] [ +0.004320] __napi_poll+0x28/0x190 [ +0.003500] net_rx_action+0x198/0x360 [ +0.003752] ? update_rq_clock+0x39/0x220 [ +0.004013] handle_softirqs+0xf1/0x340 [ +0.003840] ? sched_clock_cpu+0xf/0x1f0 [ +0.003925] __irq_exit_rcu+0xc2/0xe0 [ +0.003665] common_interrupt+0x85/0xa0 [ +0.003839] </IRQ> [ +0.002098] <TASK> [ +0.002106] asm_common_interrupt+0x26/0x40 [ +0.004184] RIP: 0010:cpuidle_enter_state+0xd3/0x690 Fix this by performing the missing unmapping of XDP queues from q_vectors and setting the XDP rings pointer back to NULL after all those queues are released. Also, add an immediate exit from the XDP callback in case of ring preparation failure. Fixes: efc2214 ("ice: Add support for XDP") Reviewed-by: Dawid Osuchowski <[email protected]> Reviewed-by: Przemek Kitszel <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Signed-off-by: Michal Kubiak <[email protected]> Reviewed-by: Aleksandr Loktionov <[email protected]>
1 parent 94d99be commit bc4f132

File tree

1 file changed

+33
-14
lines changed

1 file changed

+33
-14
lines changed

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,27 @@ void ice_map_xdp_rings(struct ice_vsi *vsi)
27442744
}
27452745
}
27462746

2747+
/**
2748+
* ice_unmap_xdp_rings - Unmap XDP rings from interrupt vectors
2749+
* @vsi: the VSI with XDP rings being unmapped
2750+
*/
2751+
static void ice_unmap_xdp_rings(struct ice_vsi *vsi)
2752+
{
2753+
int v_idx;
2754+
2755+
ice_for_each_q_vector(vsi, v_idx) {
2756+
struct ice_q_vector *q_vector = vsi->q_vectors[v_idx];
2757+
struct ice_tx_ring *ring;
2758+
2759+
ice_for_each_tx_ring(ring, q_vector->tx)
2760+
if (!ring->tx_buf || !ice_ring_is_xdp(ring))
2761+
break;
2762+
2763+
/* restore the value of last node prior to XDP setup */
2764+
q_vector->tx.tx_ring = ring;
2765+
}
2766+
}
2767+
27472768
/**
27482769
* ice_prepare_xdp_rings - Allocate, configure and setup Tx rings for XDP
27492770
* @vsi: VSI to bring up Tx rings used by XDP
@@ -2807,7 +2828,7 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28072828
if (status) {
28082829
dev_err(dev, "Failed VSI LAN queue config for XDP, error: %d\n",
28092830
status);
2810-
goto clear_xdp_rings;
2831+
goto unmap_xdp_rings;
28112832
}
28122833

28132834
/* assign the prog only when it's not already present on VSI;
@@ -2823,6 +2844,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28232844
ice_vsi_assign_bpf_prog(vsi, prog);
28242845

28252846
return 0;
2847+
unmap_xdp_rings:
2848+
ice_unmap_xdp_rings(vsi);
28262849
clear_xdp_rings:
28272850
ice_for_each_xdp_txq(vsi, i)
28282851
if (vsi->xdp_rings[i]) {
@@ -2839,6 +2862,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28392862
mutex_unlock(&pf->avail_q_mutex);
28402863

28412864
devm_kfree(dev, vsi->xdp_rings);
2865+
vsi->xdp_rings = NULL;
2866+
28422867
return -ENOMEM;
28432868
}
28442869

@@ -2854,25 +2879,15 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi, enum ice_xdp_cfg cfg_type)
28542879
{
28552880
u16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };
28562881
struct ice_pf *pf = vsi->back;
2857-
int i, v_idx;
2882+
int i;
28582883

28592884
/* q_vectors are freed in reset path so there's no point in detaching
28602885
* rings
28612886
*/
28622887
if (cfg_type == ICE_XDP_CFG_PART)
28632888
goto free_qmap;
28642889

2865-
ice_for_each_q_vector(vsi, v_idx) {
2866-
struct ice_q_vector *q_vector = vsi->q_vectors[v_idx];
2867-
struct ice_tx_ring *ring;
2868-
2869-
ice_for_each_tx_ring(ring, q_vector->tx)
2870-
if (!ring->tx_buf || !ice_ring_is_xdp(ring))
2871-
break;
2872-
2873-
/* restore the value of last node prior to XDP setup */
2874-
q_vector->tx.tx_ring = ring;
2875-
}
2890+
ice_unmap_xdp_rings(vsi);
28762891

28772892
free_qmap:
28782893
mutex_lock(&pf->avail_q_mutex);
@@ -3017,11 +3032,14 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
30173032
xdp_ring_err = ice_vsi_determine_xdp_res(vsi);
30183033
if (xdp_ring_err) {
30193034
NL_SET_ERR_MSG_MOD(extack, "Not enough Tx resources for XDP");
3035+
goto resume_if;
30203036
} else {
30213037
xdp_ring_err = ice_prepare_xdp_rings(vsi, prog,
30223038
ICE_XDP_CFG_FULL);
3023-
if (xdp_ring_err)
3039+
if (xdp_ring_err) {
30243040
NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed");
3041+
goto resume_if;
3042+
}
30253043
}
30263044
xdp_features_set_redirect_target(vsi->netdev, true);
30273045
/* reallocate Rx queues that are used for zero-copy */
@@ -3039,6 +3057,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
30393057
NL_SET_ERR_MSG_MOD(extack, "Freeing XDP Rx resources failed");
30403058
}
30413059

3060+
resume_if:
30423061
if (if_running)
30433062
ret = ice_up(vsi);
30443063

0 commit comments

Comments
 (0)