[bpf-next] bpf/btf: Use btf_type_str() whenever possible

Commit Message

Peilin Ye Sept. 14, 2022, 2:13 a.m. UTC

From: Peilin Ye <[e-mail]>

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: Peilin Ye <[e-mail]>
---
 kernel/bpf/btf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Martin KaFai Lau Sept. 16, 2022, 6:37 p.m. UTC | #1

On 9/13/22 7:13 PM, Peilin Ye wrote:
> From: Peilin Ye <[e-mail]>
> 
> 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: Peilin Ye <[e-mail]>
> ---
>   kernel/bpf/btf.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index cad4657ba2ce..81dc7423d723 100644

This clean up makes sense.  The patch cannot be applied though [0], so 
it is marked as 'Changes Requested'.  Also, where is the cad4657ba2ce 
coming from?  It can't be found in the bpf-next tree.  Please rebase on 
the bpf-next and resend.


[0]: 
https://patchwork.kernel.org/project/netdevbpf/patch/[e-mail]/

Peilin Ye Sept. 16, 2022, 8:26 p.m. UTC | #2

On Fri, Sep 16, 2022 at 11:37:46AM -0700, Martin KaFai Lau wrote:
> This clean up makes sense.  The patch cannot be applied though [0], so it is
> marked as 'Changes Requested'.  Also, where is the cad4657ba2ce coming from?
> It can't be found in the bpf-next tree.  Please rebase on the bpf-next and
> resend.

Ah, I will fix it in v2 soon.

Thanks,
Peilin Ye

Patch

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index cad4657ba2ce..81dc7423d723 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -5403,7 +5403,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;
@@ -5430,7 +5430,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;
 	}
 
@@ -5514,11 +5514,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;
 }
@@ -5924,7 +5924,7 @@  int btf_distill_func_proto(struct bpf_verifier_log *log,
 	if (ret < 0) {
 		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;
@@ -5940,7 +5940,7 @@  int btf_distill_func_proto(struct bpf_verifier_log *log,
 		if (ret < 0) {
 			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) {
@@ -6593,7 +6593,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;