Commit 5a73efc7 authored by David Vernet's avatar David Vernet Committed by Alexei Starovoitov
Browse files

selftests/bpf: Update bpf_cpumask_any* tests to use bpf_cpumask_any_distribute* 



In a prior patch, we removed the bpf_cpumask_any() and
bpf_cpumask_any_and() kfuncs, and replaced them with
bpf_cpumask_any_distribute() and bpf_cpumask_any_distribute_and().
The advertised semantics between the two kfuncs were identical, with the
former always returning the first CPU, and the latter actually returning
any CPU.

This patch updates the selftests for these kfuncs to use the new names.

Signed-off-by: default avatarDavid Vernet <void@manifault.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/r/20230610035053.117605-4-void@manifault.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent f983be91

tools/testing/selftests/bpf/progs/cpumask_common.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ bool bpf_cpumask_subset(const struct cpumask *src1, const struct cpumask *src2) 
bool bpf_cpumask_empty(const struct cpumask *cpumask) __ksym;

bool bpf_cpumask_full(const struct cpumask *cpumask) __ksym;

void bpf_cpumask_copy(struct bpf_cpumask *dst, const struct cpumask *src) __ksym;

u32 bpf_cpumask_any(const struct cpumask *src) __ksym;

u32 bpf_cpumask_any_and(const struct cpumask *src1, const struct cpumask *src2) __ksym;

u32 bpf_cpumask_any_distribute(const struct cpumask *src) __ksym;

u32 bpf_cpumask_any_and_distribute(const struct cpumask *src1, const struct cpumask *src2) __ksym;



void bpf_rcu_read_lock(void) __ksym;

void bpf_rcu_read_unlock(void) __ksym;

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

+4 −4
Original line number Diff line number Diff line
@@ -344,13 +344,13 @@ int BPF_PROG(test_copy_any_anyand, struct task_struct *task, u64 clone_flags) 
	bpf_cpumask_set_cpu(1, mask2);

	bpf_cpumask_or(dst1, cast(mask1), cast(mask2));



	cpu = bpf_cpumask_any(cast(mask1));

	cpu = bpf_cpumask_any_distribute(cast(mask1));

	if (cpu != 0) {

		err = 6;

		goto release_exit;

	}



	cpu = bpf_cpumask_any(cast(dst2));

	cpu = bpf_cpumask_any_distribute(cast(dst2));

	if (cpu < nr_cpus) {

		err = 7;

		goto release_exit;
@@ -362,13 +362,13 @@ int BPF_PROG(test_copy_any_anyand, struct task_struct *task, u64 clone_flags) 
		goto release_exit;

	}



	cpu = bpf_cpumask_any(cast(dst2));

	cpu = bpf_cpumask_any_distribute(cast(dst2));

	if (cpu > 1) {

		err = 9;

		goto release_exit;

	}



	cpu = bpf_cpumask_any_and(cast(mask1), cast(mask2));

	cpu = bpf_cpumask_any_and_distribute(cast(mask1), cast(mask2));

	if (cpu < nr_cpus) {

		err = 10;

		goto release_exit;