]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
xsk: Clear pool even for inactive queues
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Mon, 18 Jan 2021 16:03:33 +0000 (18:03 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 19 Jan 2021 21:47:04 +0000 (22:47 +0100)
commitb425e24a934e21a502d25089c6c7443d799c5594
treec44bdeeda97f5b4f683e2220bc63d56061bcf1e3
parent301a33d51880619d0c5a581b5a48d3a5248fa84b
xsk: Clear pool even for inactive queues

The number of queues can change by other means, rather than ethtool. For
example, attaching an mqprio qdisc with num_tc > 1 leads to creating
multiple sets of TX queues, which may be then destroyed when mqprio is
deleted. If an AF_XDP socket is created while mqprio is active,
dev->_tx[queue_id].pool will be filled, but then real_num_tx_queues may
decrease with deletion of mqprio, which will mean that the pool won't be
NULLed, and a further increase of the number of TX queues may expose a
dangling pointer.

To avoid any potential misbehavior, this commit clears pool for RX and
TX queues, regardless of real_num_*_queues, still taking into
consideration num_*_queues to avoid overflows.

Fixes: 1c1efc2af158 ("xsk: Create and free buffer pool independently from umem")
Fixes: a41b4f3c58dd ("xsk: simplify xdp_clear_umem_at_qid implementation")
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Björn Töpel <bjorn.topel@intel.com>
Link: https://lore.kernel.org/bpf/20210118160333.333439-1-maximmi@mellanox.com
net/xdp/xsk.c