selftests/bpf: track amount of memory used by liveness analysis

Temporarily extended veristat collected data with:
- amount of memory consumed for liveness bit masks;
- number of memory allocations done for liveness.c:func_instance
  internals (O(number of unique callchains)).

Will not be included in the final submission.

Signed-off-by: Eduard Zingerman <[email protected]>

Author: eddyz87

include/linux/bpf_verifier.h

@@ -828,6 +828,8 @@ struct bpf_verifier_env {
 	/* array of pointers to bpf_scc_info indexed by SCC id */
 	struct bpf_scc_info **scc_info;
 	u32 scc_cnt;
+	u32 num_liveness_allocs;
+	u32 total_liveness_mem;
 };
 
 static inline struct bpf_func_info_aux *subprog_aux(struct bpf_verifier_env *env, int subprog)

kernel/bpf/liveness.c

@@ -199,6 +199,9 @@ static struct func_instance *__lookup_instance(struct bpf_verifier_env *env,
 	memcpy(&result->callchain, callchain, sizeof(*callchain));
 	result->insn_cnt = subprog_sz;
 	hash_add(liveness->func_instances, &result->hl_node, key);
+	env->num_liveness_allocs++;
+	env->total_liveness_mem += size;
+	env->total_liveness_mem += sizeof(*result->must_write_set) * subprog_sz;
 	return result;
 }
 
@@ -267,6 +270,8 @@ static struct per_frame_masks *alloc_frame_masks(struct bpf_verifier_env *env,
 		instance->frames[frame] = arr;
 		if (!arr)
 			return ERR_PTR(-ENOMEM);
+		env->num_liveness_allocs++;
+		env->total_liveness_mem += instance->insn_cnt * sizeof(*arr);
 	}
 	return get_frame_masks(instance, frame, insn_idx);
 }

kernel/bpf/verifier.c

@@ -23179,10 +23179,11 @@ static void print_verification_stats(struct bpf_verifier_env *env)
 		verbose(env, "\n");
 	}
 	verbose(env, "processed %d insns (limit %d) max_states_per_insn %d "
-		"total_states %d peak_states %d mark_read %d\n",
+		"total_states %d peak_states %d mark_read %d num_liveness_allocs %d total_liveness_mem %d\n",
 		env->insn_processed, BPF_COMPLEXITY_LIMIT_INSNS,
 		env->max_states_per_insn, env->total_states,
-		env->peak_states, env->longest_mark_read_walk);
+		env->peak_states, env->longest_mark_read_walk,
+		env->num_liveness_allocs, env->total_liveness_mem);
 }
 
 int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,

tools/testing/selftests/bpf/veristat.c

@@ -51,6 +51,8 @@ enum stat_id {
 	PROG_TYPE,
 	ATTACH_TYPE,
 	MEMORY_PEAK,
+	LIVENESS_ALLOCS,
+	LIVENESS_MEM,
 
 	FILE_NAME,
 	PROG_NAME,
@@ -738,10 +740,11 @@ static int append_filter_file(const char *path)
 }
 
 static const struct stat_specs default_output_spec = {
-	.spec_cnt = 8,
+	.spec_cnt = 10,
 	.ids = {
 		FILE_NAME, PROG_NAME, VERDICT, DURATION,
-		TOTAL_INSNS, TOTAL_STATES, SIZE, JITED_SIZE
+		TOTAL_INSNS, TOTAL_STATES, SIZE, JITED_SIZE,
+		LIVENESS_ALLOCS, LIVENESS_MEM,
 	},
 };
 
@@ -789,13 +792,13 @@ static int append_file_from_file(const char *path)
 }
 
 static const struct stat_specs default_csv_output_spec = {
-	.spec_cnt = 15,
+	.spec_cnt = 17,
 	.ids = {
 		FILE_NAME, PROG_NAME, VERDICT, DURATION,
 		TOTAL_INSNS, TOTAL_STATES, PEAK_STATES,
 		MAX_STATES_PER_INSN, MARK_READ_MAX_LEN,
 		SIZE, JITED_SIZE, PROG_TYPE, ATTACH_TYPE,
-		STACK, MEMORY_PEAK,
+		STACK, MEMORY_PEAK, LIVENESS_ALLOCS, LIVENESS_MEM,
 	},
 };
 
@@ -837,6 +840,8 @@ static struct stat_def {
 	[PROG_TYPE] = { "Program type", {"prog_type"}, },
 	[ATTACH_TYPE] = { "Attach type", {"attach_type", }, },
 	[MEMORY_PEAK] = { "Peak memory (MiB)", {"mem_peak", }, },
+	[LIVENESS_ALLOCS] = { "liveness allocs", {"liveness_allocs", }, },
+	[LIVENESS_MEM] = { "liveness mem", {"liveness_mem", }, },
 };
 
 static bool parse_stat_id_var(const char *name, size_t len, int *id,
@@ -1015,12 +1020,15 @@ static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *
 
 		if (1 == sscanf(cur, "verification time %ld usec\n", &s->stats[DURATION]))
 			continue;
-		if (5 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld",
+		if (5 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld num_liveness_allocs %ld total_liveness_mem %ld",
 				&s->stats[TOTAL_INSNS],
 				&s->stats[MAX_STATES_PER_INSN],
 				&s->stats[TOTAL_STATES],
 				&s->stats[PEAK_STATES],
-				&s->stats[MARK_READ_MAX_LEN]))
+				&s->stats[MARK_READ_MAX_LEN],
+				&s->stats[LIVENESS_ALLOCS],
+				&s->stats[LIVENESS_MEM]
+				))
 			continue;
 
 		if (1 == sscanf(cur, "stack depth %511s", stack))
@@ -2299,6 +2307,8 @@ static int cmp_stat(const struct verif_stats *s1, const struct verif_stats *s2,
 	case PEAK_STATES:
 	case MAX_STATES_PER_INSN:
 	case MEMORY_PEAK:
+	case LIVENESS_ALLOCS:
+	case LIVENESS_MEM:
 	case MARK_READ_MAX_LEN: {
 		long v1 = s1->stats[id];
 		long v2 = s2->stats[id];
@@ -2528,6 +2538,8 @@ static void prepare_value(const struct verif_stats *s, enum stat_id id,
 	case STACK:
 	case SIZE:
 	case JITED_SIZE:
+	case LIVENESS_ALLOCS:
+	case LIVENESS_MEM:
 	case MEMORY_PEAK:
 		*val = s ? s->stats[id] : 0;
 		break;
@@ -2615,6 +2627,8 @@ static int parse_stat_value(const char *str, enum stat_id id, struct verif_stats
 	case MARK_READ_MAX_LEN:
 	case SIZE:
 	case JITED_SIZE:
+	case LIVENESS_ALLOCS:
+	case LIVENESS_MEM:
 	case MEMORY_PEAK:
 	case STACK: {
 		long val;