Skip to content

Commit e102db7

Browse files
mfijalkoanguy11
authored andcommitted
ice: track AF_XDP ZC enabled queues in bitmap
Commit c7a2190 ("ice: Remove xsk_buff_pool from VSI structure") silently introduced a regression and broke the Tx side of AF_XDP in copy mode. xsk_pool on ice_ring is set only based on the existence of the XDP prog on the VSI which in turn picks ice_clean_tx_irq_zc to be executed. That is not something that should happen for copy mode as it should use the regular data path ice_clean_tx_irq. This results in a following splat when xdpsock is run in txonly or l2fwd scenarios in copy mode: <snip> [ 106.050195] BUG: kernel NULL pointer dereference, address: 0000000000000030 [ 106.057269] #PF: supervisor read access in kernel mode [ 106.062493] #PF: error_code(0x0000) - not-present page [ 106.067709] PGD 0 P4D 0 [ 106.070293] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 106.074721] CPU: 61 PID: 0 Comm: swapper/61 Not tainted 5.12.0-rc2+ MIPS#45 [ 106.081436] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019 [ 106.092027] RIP: 0010:xp_raw_get_dma+0x36/0x50 [ 106.096551] Code: 74 14 48 b8 ff ff ff ff ff ff 00 00 48 21 f0 48 c1 ee 30 48 01 c6 48 8b 87 90 00 00 00 48 89 f2 81 e6 ff 0f 00 00 48 c1 ea 0c <48> 8b 04 d0 48 83 e0 fe 48 01 f0 c3 66 66 2e 0f 1f 84 00 00 00 00 [ 106.115588] RSP: 0018:ffffc9000d694e50 EFLAGS: 00010206 [ 106.120893] RAX: 0000000000000000 RBX: ffff88984b8c8a00 RCX: ffff889852581800 [ 106.128137] RDX: 0000000000000006 RSI: 0000000000000000 RDI: ffff88984cd8b800 [ 106.135383] RBP: ffff888123b50001 R08: ffff889896800000 R09: 0000000000000800 [ 106.142628] R10: 0000000000000000 R11: ffffffff826060c0 R12: 00000000000000ff [ 106.149872] R13: 0000000000000000 R14: 0000000000000040 R15: ffff888123b50018 [ 106.157117] FS: 0000000000000000(0000) GS:ffff8897e0f40000(0000) knlGS:0000000000000000 [ 106.165332] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 106.171163] CR2: 0000000000000030 CR3: 000000000560a004 CR4: 00000000007706e0 [ 106.178408] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 106.185653] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 106.192898] PKRU: 55555554 [ 106.195653] Call Trace: [ 106.198143] <IRQ> [ 106.200196] ice_clean_tx_irq_zc+0x183/0x2a0 [ice] [ 106.205087] ice_napi_poll+0x3e/0x590 [ice] [ 106.209356] __napi_poll+0x2a/0x160 [ 106.212911] net_rx_action+0xd6/0x200 [ 106.216634] __do_softirq+0xbf/0x29b [ 106.220274] irq_exit_rcu+0x88/0xc0 [ 106.223819] common_interrupt+0x7b/0xa0 [ 106.227719] </IRQ> [ 106.229857] asm_common_interrupt+0x1e/0x40 </snip> Fix this by introducing the bitmap of queues that are zero-copy enabled, where each bit, corresponding to a queue id that xsk pool is being configured on, will be set/cleared within ice_xsk_pool_{en,dis}able and checked within ice_xsk_pool(). The latter is a function used for deciding which napi poll routine is executed. Idea is being taken from our other drivers such as i40e and ixgbe. Fixes: c7a2190 ("ice: Remove xsk_buff_pool from VSI structure") Signed-off-by: Maciej Fijalkowski <[email protected]> Tested-by: Kiran Bhandare <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 45ce085 commit e102db7

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

drivers/net/ethernet/intel/ice/ice.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ struct ice_vsi {
335335
struct ice_tc_cfg tc_cfg;
336336
struct bpf_prog *xdp_prog;
337337
struct ice_ring **xdp_rings; /* XDP ring array */
338+
unsigned long *af_xdp_zc_qps; /* tracks AF_XDP ZC enabled qps */
338339
u16 num_xdp_txq; /* Used XDP queues */
339340
u8 xdp_mapping_mode; /* ICE_MAP_MODE_[CONTIG|SCATTER] */
340341

@@ -547,15 +548,16 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring)
547548
*/
548549
static inline struct xsk_buff_pool *ice_xsk_pool(struct ice_ring *ring)
549550
{
551+
struct ice_vsi *vsi = ring->vsi;
550552
u16 qid = ring->q_index;
551553

552554
if (ice_ring_is_xdp(ring))
553-
qid -= ring->vsi->num_xdp_txq;
555+
qid -= vsi->num_xdp_txq;
554556

555-
if (!ice_is_xdp_ena_vsi(ring->vsi))
557+
if (!ice_is_xdp_ena_vsi(vsi) || !test_bit(qid, vsi->af_xdp_zc_qps))
556558
return NULL;
557559

558-
return xsk_get_pool_from_qid(ring->vsi->netdev, qid);
560+
return xsk_get_pool_from_qid(vsi->netdev, qid);
559561
}
560562

561563
/**

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,14 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi)
105105
if (!vsi->q_vectors)
106106
goto err_vectors;
107107

108+
vsi->af_xdp_zc_qps = bitmap_zalloc(max_t(int, vsi->alloc_txq, vsi->alloc_rxq), GFP_KERNEL);
109+
if (!vsi->af_xdp_zc_qps)
110+
goto err_zc_qps;
111+
108112
return 0;
109113

114+
err_zc_qps:
115+
devm_kfree(dev, vsi->q_vectors);
110116
err_vectors:
111117
devm_kfree(dev, vsi->rxq_map);
112118
err_rxq_map:
@@ -288,6 +294,10 @@ static void ice_vsi_free_arrays(struct ice_vsi *vsi)
288294

289295
dev = ice_pf_to_dev(pf);
290296

297+
if (vsi->af_xdp_zc_qps) {
298+
bitmap_free(vsi->af_xdp_zc_qps);
299+
vsi->af_xdp_zc_qps = NULL;
300+
}
291301
/* free the ring and vector containers */
292302
if (vsi->q_vectors) {
293303
devm_kfree(dev, vsi->q_vectors);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ static int ice_xsk_pool_disable(struct ice_vsi *vsi, u16 qid)
270270
if (!pool)
271271
return -EINVAL;
272272

273+
clear_bit(qid, vsi->af_xdp_zc_qps);
273274
xsk_pool_dma_unmap(pool, ICE_RX_DMA_ATTR);
274275

275276
return 0;
@@ -300,6 +301,8 @@ ice_xsk_pool_enable(struct ice_vsi *vsi, struct xsk_buff_pool *pool, u16 qid)
300301
if (err)
301302
return err;
302303

304+
set_bit(qid, vsi->af_xdp_zc_qps);
305+
303306
return 0;
304307
}
305308

0 commit comments

Comments
 (0)