Skip to content

Commit 87ed3de

Browse files
Yinjun Zhangkuba-moo
authored andcommitted
nfp: xsk: fix a warning when allocating rx rings
Previous commits introduced AF_XDP zero-copy support, in which we need register different mem model for xdp_rxq when AF_XDP zero-copy is enabled or not. And this should be done after xdp_rxq info is registered, which is not needed for ctrl port, otherwise there complaints warnings: "Missing register, driver bug". Fix this by not registering mem model for ctrl port, just like we don't register xdp_rxq info for ctrl port. Fixes: 6402528 ("nfp: xsk: add AF_XDP zero-copy Rx and Tx support") Signed-off-by: Yinjun Zhang <[email protected]> Reviewed-by: Niklas Söderlund <[email protected]> Signed-off-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 4c7d2e1 commit 87ed3de

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2622,11 +2622,12 @@ nfp_net_rx_ring_alloc(struct nfp_net_dp *dp, struct nfp_net_rx_ring *rx_ring)
26222622
rx_ring->idx, rx_ring->r_vec->napi.napi_id);
26232623
if (err < 0)
26242624
return err;
2625-
}
26262625

2627-
err = xdp_rxq_info_reg_mem_model(&rx_ring->xdp_rxq, mem_type, NULL);
2628-
if (err)
2629-
goto err_alloc;
2626+
err = xdp_rxq_info_reg_mem_model(&rx_ring->xdp_rxq,
2627+
mem_type, NULL);
2628+
if (err)
2629+
goto err_alloc;
2630+
}
26302631

26312632
rx_ring->cnt = dp->rxd_cnt;
26322633
rx_ring->size = array_size(rx_ring->cnt, sizeof(*rx_ring->rxds));

0 commit comments

Comments
 (0)