Commit 1fffe1f4 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'fix-a-few-selftest-failure-due-to-64k-page' 

Yonghong Song says:

====================
Fix a few selftest failure due to 64K page

Fix a few arm64 selftest failures due to 64K page. Please see each
indvidual patch for why the test failed and how the test gets fixed.
====================

Link: https://patch.msgid.link/20260113061018.3797051-1-yonghong.song@linux.dev


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 7af33399 951d7901

tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void subtest_dmabuf_iter_check_lots_of_buffers(struct dmabuf_iter *skel) 
	while ((bytes_read = read(iter_fd, buf, sizeof(buf))) > 0)

		total_bytes_read += bytes_read;



	ASSERT_GT(total_bytes_read, getpagesize(), "total_bytes_read");

	ASSERT_GT(total_bytes_read, 4096, "total_bytes_read");



	close(iter_fd);

}

tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c

+6 −1
Original line number Diff line number Diff line
@@ -5,9 +5,14 @@ 
#include "sk_bypass_prot_mem.skel.h"

#include "network_helpers.h"



#ifndef PAGE_SIZE

#include <unistd.h>

#define PAGE_SIZE getpagesize()

#endif



#define NR_PAGES	32

#define NR_SOCKETS	2

#define BUF_TOTAL	(NR_PAGES * 4096 / NR_SOCKETS)

#define BUF_TOTAL	(NR_PAGES * PAGE_SIZE / NR_SOCKETS)

#define BUF_SINGLE	1024

#define NR_SEND		(BUF_TOTAL / BUF_SINGLE)

tools/testing/selftests/bpf/progs/verifier_arena_globals1.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "bpf_arena_common.h"

#include "bpf_misc.h"



#define ARENA_PAGES (1UL<< (32 - 12))

#define ARENA_PAGES (1UL<< (32 - __builtin_ffs(__PAGE_SIZE) + 1))

#define GLOBAL_PAGES (16)



struct {