After 4ddb74165ae5 it is possible for global function to have a pointer argument that points to something different than struct. Drop the irrelevant log message and keep the logic same. Fixes: 4ddb74165ae5 ("bpf: Extract nullable reg type conversion into a helper function") Signed-off-by: Dmitrii Banshchikov <me@ubique.spb.ru> --- kernel/bpf/btf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 2efeb5f4b343..b1a76fe046cb 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4321,8 +4321,6 @@ btf_get_prog_ctx_type(struct bpf_verifier_log *log, struct btf *btf, * is not supported yet. * BPF_PROG_TYPE_RAW_TRACEPOINT is fine. */ - if (log->level & BPF_LOG_LEVEL) - bpf_log(log, "arg#%d type is not a struct\n", arg); return NULL; } tname = btf_name_by_offset(btf, t->name_off); -- 2.25.1
Now it is possible for global function to have a pointer argument that points to something different than struct. Drop the irrelevant log message and keep the logic same. Fixes: 4ddb74165ae5 ("bpf: Extract nullable reg type conversion into a helper function") Signed-off-by: Dmitrii Banshchikov <me@ubique.spb.ru> --- v0 -> v1: drop redundant commit hash mention kernel/bpf/btf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 2efeb5f4b343..b1a76fe046cb 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4321,8 +4321,6 @@ btf_get_prog_ctx_type(struct bpf_verifier_log *log, struct btf *btf, * is not supported yet. * BPF_PROG_TYPE_RAW_TRACEPOINT is fine. */ - if (log->level & BPF_LOG_LEVEL) - bpf_log(log, "arg#%d type is not a struct\n", arg); return NULL; } tname = btf_name_by_offset(btf, t->name_off); -- 2.25.1
On Mon, Feb 22, 2021 at 01:10:50PM +0400, Dmitrii Banshchikov wrote: > Now it is possible for global function to have a pointer argument that > points to something different than struct. Drop the irrelevant log > message and keep the logic same. Acked-by: Martin KaFai Lau <kafai@fb.com> > Fixes: 4ddb74165ae5 ("bpf: Extract nullable reg type conversion into a helper function") Should be this: e5069b9c23b3 ("bpf: Support pointers in global func args")?
On Mon, Feb 22, 2021 at 11:31:11AM -0800, Martin KaFai Lau wrote:
> On Mon, Feb 22, 2021 at 01:10:50PM +0400, Dmitrii Banshchikov wrote:
> > Now it is possible for global function to have a pointer argument that
> > points to something different than struct. Drop the irrelevant log
> > message and keep the logic same.
> Acked-by: Martin KaFai Lau <kafai@fb.com>
>
> > Fixes: 4ddb74165ae5 ("bpf: Extract nullable reg type conversion into a helper function")
> Should be this: e5069b9c23b3 ("bpf: Support pointers in global func args")?
Yeah, sorry for it.
--
Dmitrii Banshchikov
On Mon, Feb 22, 2021 at 11:53:38PM +0400, Dmitrii Banshchikov wrote:
> On Mon, Feb 22, 2021 at 11:31:11AM -0800, Martin KaFai Lau wrote:
> > On Mon, Feb 22, 2021 at 01:10:50PM +0400, Dmitrii Banshchikov wrote:
> > > Now it is possible for global function to have a pointer argument that
> > > points to something different than struct. Drop the irrelevant log
> > > message and keep the logic same.
> > Acked-by: Martin KaFai Lau <kafai@fb.com>
> >
> > > Fixes: 4ddb74165ae5 ("bpf: Extract nullable reg type conversion into a helper function")
> > Should be this: e5069b9c23b3 ("bpf: Support pointers in global func args")?
>
> Yeah, sorry for it.
>
Shall I respin it?
--
Dmitrii Banshchikov
Now it is possible for global function to have a pointer argument that points to something different than struct. Drop the irrelevant log message and keep the logic same. Fixes: e5069b9c23b3 ("bpf: Support pointers in global func args") Signed-off-by: Dmitrii Banshchikov <me@ubique.spb.ru> Acked-by: Martin KaFai Lau <kafai@fb.com> --- v1 -> v2: * mention correct commit by hash * bpf-next -> bpf v0 -> v1: drop redundant commit hash mention kernel/bpf/btf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 2efeb5f4b343..b1a76fe046cb 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4321,8 +4321,6 @@ btf_get_prog_ctx_type(struct bpf_verifier_log *log, struct btf *btf, * is not supported yet. * BPF_PROG_TYPE_RAW_TRACEPOINT is fine. */ - if (log->level & BPF_LOG_LEVEL) - bpf_log(log, "arg#%d type is not a struct\n", arg); return NULL; } tname = btf_name_by_offset(btf, t->name_off); -- 2.25.1
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Tue, 23 Feb 2021 13:04:16 +0400 you wrote: > Now it is possible for global function to have a pointer argument that > points to something different than struct. Drop the irrelevant log > message and keep the logic same. > > Fixes: e5069b9c23b3 ("bpf: Support pointers in global func args") > Signed-off-by: Dmitrii Banshchikov <me@ubique.spb.ru> > Acked-by: Martin KaFai Lau <kafai@fb.com> > > [...] Here is the summary with links: - [v2] bpf: Drop imprecise log message https://git.kernel.org/bpf/bpf/c/f4eda8b6e4a5 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html