]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Make variables in bpf_prog_test_run_xdp less confusing
authorAmery Hung <ameryhung@gmail.com>
Mon, 22 Sep 2025 23:33:53 +0000 (16:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Jan 2026 15:30:00 +0000 (16:30 +0100)
commit875d7cb4fe156d1a378bf38400e36797123ca9a6
tree00795bcd50fa15373c77807a0f0369c8ff6f790c
parenta60c827903b45e2cbf45de782d0a14c2037e2122
bpf: Make variables in bpf_prog_test_run_xdp less confusing

[ Upstream commit 7eb83bff02ad5e82e8c456c58717ef181c220870 ]

Change the variable naming in bpf_prog_test_run_xdp() to make the
overall logic less confusing. As different modes were added to the
function over the time, some variables got overloaded, making
it hard to understand and changing the code becomes error-prone.

Replace "size" with "linear_sz" where it refers to the size of metadata
and data. If "size" refers to input data size, use test.data_size_in
directly.

Replace "max_data_sz" with "max_linear_sz" to better reflect the fact
that it is the maximum size of metadata and data (i.e., linear_sz). Also,
xdp_rxq.frags_size is always PAGE_SIZE, so just set it directly instead
of subtracting headroom and tailroom and adding them back.

Signed-off-by: Amery Hung <ameryhung@gmail.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250922233356.3356453-6-ameryhung@gmail.com
Stable-dep-of: e558cca21779 ("bpf, test_run: Subtract size of xdp_frame from allowed metadata size")
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bpf/test_run.c