Commit 571f9738 authored by Peilin Ye's avatar Peilin Ye Committed by Martin KaFai Lau
Browse files

bpf/btf: Use btf_type_str() whenever possible 



We have btf_type_str().  Use it whenever possible in btf.c, instead of
"btf_kind_str[BTF_INFO_KIND(t->info)]".

Signed-off-by: default avatarPeilin Ye <peilin.ye@bytedance.com>
Link: https://lore.kernel.org/r/20220916202800.31421-1-yepeilin.cs@gmail.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent dc567045

kernel/bpf/btf.c

+8 −9
Original line number Diff line number Diff line
@@ -1397,7 +1397,6 @@ __printf(4, 5) static void __btf_verifier_log_type(struct btf_verifier_env *env, 
						   const char *fmt, ...)

{

	struct bpf_verifier_log *log = &env->log;

	u8 kind = BTF_INFO_KIND(t->info);

	struct btf *btf = env->btf;

	va_list args;
@@ -1413,7 +1412,7 @@ __printf(4, 5) static void __btf_verifier_log_type(struct btf_verifier_env *env, 


	__btf_verifier_log(log, "[%u] %s %s%s",

			   env->log_type_id,

			   btf_kind_str[kind],

			   btf_type_str(t),

			   __btf_name_by_offset(btf, t->name_off),

			   log_details ? " " : "");
@@ -5427,7 +5426,7 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, 
			if (!btf_type_is_small_int(t)) {

				bpf_log(log,

					"ret type %s not allowed for fmod_ret\n",

					btf_kind_str[BTF_INFO_KIND(t->info)]);

					btf_type_str(t));

				return false;

			}

			break;
@@ -5454,7 +5453,7 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, 
			"func '%s' arg%d '%s' has type %s. Only pointer access is allowed\n",

			tname, arg,

			__btf_name_by_offset(btf, t->name_off),

			btf_kind_str[BTF_INFO_KIND(t->info)]);

			btf_type_str(t));

		return false;

	}
@@ -5538,11 +5537,11 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, 
	if (!btf_type_is_struct(t)) {

		bpf_log(log,

			"func '%s' arg%d type %s is not a struct\n",

			tname, arg, btf_kind_str[BTF_INFO_KIND(t->info)]);

			tname, arg, btf_type_str(t));

		return false;

	}

	bpf_log(log, "func '%s' arg%d has btf_id %d type %s '%s'\n",

		tname, arg, info->btf_id, btf_kind_str[BTF_INFO_KIND(t->info)],

		tname, arg, info->btf_id, btf_type_str(t),

		__btf_name_by_offset(btf, t->name_off));

	return true;

}
@@ -5950,7 +5949,7 @@ int btf_distill_func_proto(struct bpf_verifier_log *log, 
	if (ret < 0 || __btf_type_is_struct(t)) {

		bpf_log(log,

			"The function %s return type %s is unsupported.\n",

			tname, btf_kind_str[BTF_INFO_KIND(t->info)]);

			tname, btf_type_str(t));

		return -EINVAL;

	}

	m->ret_size = ret;
@@ -5968,7 +5967,7 @@ int btf_distill_func_proto(struct bpf_verifier_log *log, 
		if (ret < 0 || ret > 16) {

			bpf_log(log,

				"The function %s arg%d type %s is unsupported.\n",

				tname, i, btf_kind_str[BTF_INFO_KIND(t->info)]);

				tname, i, btf_type_str(t));

			return -EINVAL;

		}

		if (ret == 0) {
@@ -6727,7 +6726,7 @@ int btf_prepare_func_args(struct bpf_verifier_env *env, int subprog, 
			continue;

		}

		bpf_log(log, "Arg#%d type %s in %s() is not supported yet.\n",

			i, btf_kind_str[BTF_INFO_KIND(t->info)], tname);

			i, btf_type_str(t), tname);

		return -EINVAL;

	}

	return 0;