Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Fix the u64_offset_to_skb_data test

The u64_offset_to_skb_data test is supposed to make a 64-bit fill, but
instead makes a 16-bit one. Fix the test according to its intention and
update the comments accordingly (umax is no longer 0xffff). The 16-bit
fill is covered by u16_offset_to_skb_data.

Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20240108205209.838365-2-maxtram95@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Maxim Mikityanskiy and committed by
Alexei Starovoitov
242d1851 f067074b

+3 -5
+3 -5
tools/testing/selftests/bpf/progs/verifier_spill_fill.c
··· 243 243 244 244 SEC("tc") 245 245 __description("Spill u32 const scalars. Refill as u64. Offset to skb->data") 246 - __failure __msg("invalid access to packet") 246 + __failure __msg("math between pkt pointer and register with unbounded min value is not allowed") 247 247 __naked void u64_offset_to_skb_data(void) 248 248 { 249 249 asm volatile (" \ ··· 253 253 w7 = 20; \ 254 254 *(u32*)(r10 - 4) = r6; \ 255 255 *(u32*)(r10 - 8) = r7; \ 256 - r4 = *(u16*)(r10 - 8); \ 256 + r4 = *(u64*)(r10 - 8); \ 257 257 r0 = r2; \ 258 - /* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */\ 258 + /* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4= */ \ 259 259 r0 += r4; \ 260 - /* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=umax=65535 */\ 261 260 if r0 > r3 goto l0_%=; \ 262 - /* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=20 */\ 263 261 r0 = *(u32*)(r2 + 0); \ 264 262 l0_%=: r0 = 0; \ 265 263 exit; \