Skip to content

Commit 2768499

Browse files
michalQbgregkh
authored andcommitted
ice: fix Tx scheduler error handling in XDP callback
[ Upstream commit 0153f36 ] 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+ #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]> Reviewed-by: Simon Horman <[email protected]> Tested-by: Jesse Brandeburg <[email protected]> Tested-by: Saritha Sanigani <[email protected]> (A Contingent Worker at Intel) Signed-off-by: Tony Nguyen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b788ceb commit 2768499

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
@@ -2761,6 +2761,27 @@ void ice_map_xdp_rings(struct ice_vsi *vsi)
27612761
}
27622762
}
27632763

2764+
/**
2765+
* ice_unmap_xdp_rings - Unmap XDP rings from interrupt vectors
2766+
* @vsi: the VSI with XDP rings being unmapped
2767+
*/
2768+
static void ice_unmap_xdp_rings(struct ice_vsi *vsi)
2769+
{
2770+
int v_idx;
2771+
2772+
ice_for_each_q_vector(vsi, v_idx) {
2773+
struct ice_q_vector *q_vector = vsi->q_vectors[v_idx];
2774+
struct ice_tx_ring *ring;
2775+
2776+
ice_for_each_tx_ring(ring, q_vector->tx)
2777+
if (!ring->tx_buf || !ice_ring_is_xdp(ring))
2778+
break;
2779+
2780+
/* restore the value of last node prior to XDP setup */
2781+
q_vector->tx.tx_ring = ring;
2782+
}
2783+
}
2784+
27642785
/**
27652786
* ice_prepare_xdp_rings - Allocate, configure and setup Tx rings for XDP
27662787
* @vsi: VSI to bring up Tx rings used by XDP
@@ -2824,7 +2845,7 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28242845
if (status) {
28252846
dev_err(dev, "Failed VSI LAN queue config for XDP, error: %d\n",
28262847
status);
2827-
goto clear_xdp_rings;
2848+
goto unmap_xdp_rings;
28282849
}
28292850

28302851
/* assign the prog only when it's not already present on VSI;
@@ -2840,6 +2861,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28402861
ice_vsi_assign_bpf_prog(vsi, prog);
28412862

28422863
return 0;
2864+
unmap_xdp_rings:
2865+
ice_unmap_xdp_rings(vsi);
28432866
clear_xdp_rings:
28442867
ice_for_each_xdp_txq(vsi, i)
28452868
if (vsi->xdp_rings[i]) {
@@ -2856,6 +2879,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,
28562879
mutex_unlock(&pf->avail_q_mutex);
28572880

28582881
devm_kfree(dev, vsi->xdp_rings);
2882+
vsi->xdp_rings = NULL;
2883+
28592884
return -ENOMEM;
28602885
}
28612886

@@ -2871,25 +2896,15 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi, enum ice_xdp_cfg cfg_type)
28712896
{
28722897
u16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };
28732898
struct ice_pf *pf = vsi->back;
2874-
int i, v_idx;
2899+
int i;
28752900

28762901
/* q_vectors are freed in reset path so there's no point in detaching
28772902
* rings
28782903
*/
28792904
if (cfg_type == ICE_XDP_CFG_PART)
28802905
goto free_qmap;
28812906

2882-
ice_for_each_q_vector(vsi, v_idx) {
2883-
struct ice_q_vector *q_vector = vsi->q_vectors[v_idx];
2884-
struct ice_tx_ring *ring;
2885-
2886-
ice_for_each_tx_ring(ring, q_vector->tx)
2887-
if (!ring->tx_buf || !ice_ring_is_xdp(ring))
2888-
break;
2889-
2890-
/* restore the value of last node prior to XDP setup */
2891-
q_vector->tx.tx_ring = ring;
2892-
}
2907+
ice_unmap_xdp_rings(vsi);
28932908

28942909
free_qmap:
28952910
mutex_lock(&pf->avail_q_mutex);
@@ -3034,11 +3049,14 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
30343049
xdp_ring_err = ice_vsi_determine_xdp_res(vsi);
30353050
if (xdp_ring_err) {
30363051
NL_SET_ERR_MSG_MOD(extack, "Not enough Tx resources for XDP");
3052+
goto resume_if;
30373053
} else {
30383054
xdp_ring_err = ice_prepare_xdp_rings(vsi, prog,
30393055
ICE_XDP_CFG_FULL);
3040-
if (xdp_ring_err)
3056+
if (xdp_ring_err) {
30413057
NL_SET_ERR_MSG_MOD(extack, "Setting up XDP Tx resources failed");
3058+
goto resume_if;
3059+
}
30423060
}
30433061
xdp_features_set_redirect_target(vsi->netdev, true);
30443062
/* reallocate Rx queues that are used for zero-copy */
@@ -3056,6 +3074,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
30563074
NL_SET_ERR_MSG_MOD(extack, "Freeing XDP Rx resources failed");
30573075
}
30583076

3077+
resume_if:
30593078
if (if_running)
30603079
ret = ice_up(vsi);
30613080

0 commit comments

Comments
 (0)