Skip to content

Commit

Permalink
selftests/bpf: Set the default value of consumer_cnt as 0
Browse files Browse the repository at this point in the history 
Considering that only bench_ringbufs.c supports consumer, just set the
default value of consumer_cnt as 0. After that, update the validity
check of consumer_cnt, remove unused consumer_thread code snippets and
set consumer_cnt as 1 in run_bench_ringbufs.sh accordingly.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20230613080921.1623219-5-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Hou Tao authored and Alexei Starovoitov committed Jun 19, 2023
1 parent da77ae2 commit 970308a
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 128 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/bench.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct env env = {
.duration_sec = 5,
.affinity = false,
.quiet = false,
.consumer_cnt = 1,
.consumer_cnt = 0,
.producer_cnt = 1,
};

Expand Down
14 changes: 2 additions & 12 deletions tools/testing/selftests/bpf/benchs/bench_bloom_filter_map.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ const struct argp bench_bloom_map_argp = {

static void validate(void)
{
if (env.consumer_cnt != 1) {
if (env.consumer_cnt != 0) {
fprintf(stderr,
"The bloom filter benchmarks do not support multi-consumer use\n");
"The bloom filter benchmarks do not support consumer\n");
exit(1);
}
}
Expand Down Expand Up @@ -421,18 +421,12 @@ static void measure(struct bench_res *res)
last_false_hits = total_false_hits;
}

static void *consumer(void *input)
{
return NULL;
}

const struct bench bench_bloom_lookup = {
.name = "bloom-lookup",
.argp = &bench_bloom_map_argp,
.validate = validate,
.setup = bloom_lookup_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -444,7 +438,6 @@ const struct bench bench_bloom_update = {
.validate = validate,
.setup = bloom_update_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -456,7 +449,6 @@ const struct bench bench_bloom_false_positive = {
.validate = validate,
.setup = false_positive_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = false_hits_report_progress,
.report_final = false_hits_report_final,
Expand All @@ -468,7 +460,6 @@ const struct bench bench_hashmap_without_bloom = {
.validate = validate,
.setup = hashmap_no_bloom_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -480,7 +471,6 @@ const struct bench bench_hashmap_with_bloom = {
.validate = validate,
.setup = hashmap_with_bloom_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand Down
10 changes: 2 additions & 8 deletions tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_full_update.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ static struct ctx {

static void validate(void)
{
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}
}
Expand All @@ -30,11 +30,6 @@ static void *producer(void *input)
return NULL;
}

static void *consumer(void *input)
{
return NULL;
}

static void measure(struct bench_res *res)
{
}
Expand Down Expand Up @@ -88,7 +83,6 @@ const struct bench bench_bpf_hashmap_full_update = {
.validate = validate,
.setup = setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = NULL,
.report_final = hashmap_report_final,
Expand Down
10 changes: 2 additions & 8 deletions tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_lookup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ const struct argp bench_hashmap_lookup_argp = {

static void validate(void)
{
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}

Expand All @@ -134,11 +134,6 @@ static void *producer(void *input)
return NULL;
}

static void *consumer(void *input)
{
return NULL;
}

static void measure(struct bench_res *res)
{
}
Expand Down Expand Up @@ -276,7 +271,6 @@ const struct bench bench_bpf_hashmap_lookup = {
.validate = validate,
.setup = setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = NULL,
.report_final = hashmap_report_final,
Expand Down
10 changes: 2 additions & 8 deletions tools/testing/selftests/bpf/benchs/bench_bpf_loop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ const struct argp bench_bpf_loop_argp = {

static void validate(void)
{
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}
}
Expand All @@ -62,11 +62,6 @@ static void *producer(void *input)
return NULL;
}

static void *consumer(void *input)
{
return NULL;
}

static void measure(struct bench_res *res)
{
res->hits = atomic_swap(&ctx.skel->bss->hits, 0);
Expand Down Expand Up @@ -99,7 +94,6 @@ const struct bench bench_bpf_loop = {
.validate = validate,
.setup = setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = ops_report_progress,
.report_final = ops_report_final,
Expand Down
12 changes: 0 additions & 12 deletions tools/testing/selftests/bpf/benchs/bench_count.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ static void *count_global_producer(void *input)
return NULL;
}

static void *count_global_consumer(void *input)
{
return NULL;
}

static void count_global_measure(struct bench_res *res)
{
struct count_global_ctx *ctx = &count_global_ctx;
Expand Down Expand Up @@ -56,11 +51,6 @@ static void *count_local_producer(void *input)
return NULL;
}

static void *count_local_consumer(void *input)
{
return NULL;
}

static void count_local_measure(struct bench_res *res)
{
struct count_local_ctx *ctx = &count_local_ctx;
Expand All @@ -74,7 +64,6 @@ static void count_local_measure(struct bench_res *res)
const struct bench bench_count_global = {
.name = "count-global",
.producer_thread = count_global_producer,
.consumer_thread = count_global_consumer,
.measure = count_global_measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -84,7 +73,6 @@ const struct bench bench_count_local = {
.name = "count-local",
.setup = count_local_setup,
.producer_thread = count_local_producer,
.consumer_thread = count_local_consumer,
.measure = count_local_measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand Down
12 changes: 2 additions & 10 deletions tools/testing/selftests/bpf/benchs/bench_local_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ static void validate(void)
fprintf(stderr, "benchmark doesn't support multi-producer!\n");
exit(1);
}
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}

Expand Down Expand Up @@ -230,11 +230,6 @@ static inline void trigger_bpf_program(void)
syscall(__NR_getpgid);
}

static void *consumer(void *input)
{
return NULL;
}

static void *producer(void *input)
{
while (true)
Expand All @@ -259,7 +254,6 @@ const struct bench bench_local_storage_cache_seq_get = {
.validate = validate,
.setup = local_storage_cache_get_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = local_storage_report_progress,
.report_final = local_storage_report_final,
Expand All @@ -271,7 +265,6 @@ const struct bench bench_local_storage_cache_interleaved_get = {
.validate = validate,
.setup = local_storage_cache_get_interleaved_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = local_storage_report_progress,
.report_final = local_storage_report_final,
Expand All @@ -283,7 +276,6 @@ const struct bench bench_local_storage_cache_hashmap_control = {
.validate = validate,
.setup = hashmap_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = local_storage_report_progress,
.report_final = local_storage_report_final,
Expand Down
8 changes: 1 addition & 7 deletions tools/testing/selftests/bpf/benchs/bench_local_storage_create.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const struct argp bench_local_storage_create_argp = {

static void validate(void)
{
if (env.consumer_cnt > 1) {
if (env.consumer_cnt != 0) {
fprintf(stderr,
"local-storage-create benchmark does not need consumer\n");
exit(1);
Expand Down Expand Up @@ -143,11 +143,6 @@ static void measure(struct bench_res *res)
res->drops = atomic_swap(&skel->bss->kmalloc_cnts, 0);
}

static void *consumer(void *input)
{
return NULL;
}

static void *sk_producer(void *input)
{
struct thread *t = &threads[(long)(input)];
Expand Down Expand Up @@ -257,7 +252,6 @@ const struct bench bench_local_storage_create = {
.validate = validate,
.setup = setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = report_progress,
.report_final = report_final,
Expand Down
10 changes: 2 additions & 8 deletions tools/testing/selftests/bpf/benchs/bench_local_storage_rcu_tasks_trace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ static void validate(void)
fprintf(stderr, "benchmark doesn't support multi-producer!\n");
exit(1);
}
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}

Expand Down Expand Up @@ -197,11 +197,6 @@ static void measure(struct bench_res *res)
ctx.prev_kthread_stime = ticks;
}

static void *consumer(void *input)
{
return NULL;
}

static void *producer(void *input)
{
while (true)
Expand Down Expand Up @@ -262,7 +257,6 @@ const struct bench bench_local_storage_tasks_trace = {
.validate = validate,
.setup = local_storage_tasks_trace_setup,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = report_progress,
.report_final = report_final,
Expand Down
15 changes: 2 additions & 13 deletions tools/testing/selftests/bpf/benchs/bench_rename.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ static void validate(void)
fprintf(stderr, "benchmark doesn't support multi-producer!\n");
exit(1);
}
if (env.consumer_cnt != 1) {
fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
if (env.consumer_cnt != 0) {
fprintf(stderr, "benchmark doesn't support consumer!\n");
exit(1);
}
}
Expand Down Expand Up @@ -106,17 +106,11 @@ static void setup_fexit(void)
attach_bpf(ctx.skel->progs.prog5);
}

static void *consumer(void *input)
{
return NULL;
}

const struct bench bench_rename_base = {
.name = "rename-base",
.validate = validate,
.setup = setup_base,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -127,7 +121,6 @@ const struct bench bench_rename_kprobe = {
.validate = validate,
.setup = setup_kprobe,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -138,7 +131,6 @@ const struct bench bench_rename_kretprobe = {
.validate = validate,
.setup = setup_kretprobe,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -149,7 +141,6 @@ const struct bench bench_rename_rawtp = {
.validate = validate,
.setup = setup_rawtp,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -160,7 +151,6 @@ const struct bench bench_rename_fentry = {
.validate = validate,
.setup = setup_fentry,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand All @@ -171,7 +161,6 @@ const struct bench bench_rename_fexit = {
.validate = validate,
.setup = setup_fexit,
.producer_thread = producer,
.consumer_thread = consumer,
.measure = measure,
.report_progress = hits_drops_report_progress,
.report_final = hits_drops_report_final,
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/benchs/bench_ringbufs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static inline void bufs_trigger_batch(void)
static void bufs_validate(void)
{
if (env.consumer_cnt != 1) {
fprintf(stderr, "rb-libbpf benchmark doesn't support multi-consumer!\n");
fprintf(stderr, "rb-libbpf benchmark needs one consumer!\n");
exit(1);
}

Expand Down
Loading

0 comments on commit 970308a

Please sign in to comment.