From: "Toke Høiland-Jørgensen" <toke@redhat•com>
To: Alexei Starovoitov <alexei.starovoitov@gmail•com>,
Jiri Olsa <jolsa@kernel•org>
Cc: Alexei Starovoitov <ast@kernel•org>,
Daniel Borkmann <daniel@iogearbox•net>,
Eelco Chaudron <echaudro@redhat•com>,
Network Development <netdev@vger•kernel.org>,
bpf <bpf@vger•kernel.org>, Martin KaFai Lau <kafai@fb•com>,
Song Liu <songliubraving@fb•com>, Yonghong Song <yhs@fb•com>,
Andrii Nakryiko <andriin@fb•com>,
John Fastabend <john.fastabend@gmail•com>,
KP Singh <kpsingh@chromium•org>,
Jesper Dangaard Brouer <brouer@redhat•com>
Subject: Re: [PATCH bpf-next 1/2] bpf: Fix context type resolving for extension programs
Date: Fri, 11 Sep 2020 12:52:17 +0200 [thread overview]
Message-ID: <871rj8bn6m.fsf@toke.dk> (raw)
In-Reply-To: <CAADnVQ+3sBR7dTQhX+eHvzJajtnm0QctjrWFyc+LMkHJOoOabA@mail.gmail.com>
Alexei Starovoitov <alexei.starovoitov@gmail•com> writes:
> On Wed, Sep 9, 2020 at 8:11 AM Jiri Olsa <jolsa@kernel•org> wrote:
>>
>> Eelco reported we can't properly access arguments if the tracing
>> program is attached to extension program.
>>
>> Having following program:
>>
>> SEC("classifier/test_pkt_md_access")
>> int test_pkt_md_access(struct __sk_buff *skb)
>>
>> with its extension:
>>
>> SEC("freplace/test_pkt_md_access")
>> int test_pkt_md_access_new(struct __sk_buff *skb)
>>
>> and tracing that extension with:
>>
>> SEC("fentry/test_pkt_md_access_new")
>> int BPF_PROG(fentry, struct sk_buff *skb)
>>
>> It's not possible to access skb argument in the fentry program,
>> with following error from verifier:
>>
>> ; int BPF_PROG(fentry, struct sk_buff *skb)
>> 0: (79) r1 = *(u64 *)(r1 +0)
>> invalid bpf_context access off=0 size=8
>>
>> The problem is that btf_ctx_access gets the context type for the
>> traced program, which is in this case the extension.
>>
>> But when we trace extension program, we want to get the context
>> type of the program that the extension is attached to, so we can
>> access the argument properly in the trace program.
>>
>> Reported-by: Eelco Chaudron <echaudro@redhat•com>
>> Signed-off-by: Jiri Olsa <jolsa@kernel•org>
>> ---
>> kernel/bpf/btf.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
>> index f9ac6935ab3c..37ad01c32e5a 100644
>> --- a/kernel/bpf/btf.c
>> +++ b/kernel/bpf/btf.c
>> @@ -3859,6 +3859,14 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,
>> }
>>
>> info->reg_type = PTR_TO_BTF_ID;
>> +
>> + /* When we trace extension program, we want to get the context
>> + * type of the program that the extension is attached to, so
>> + * we can access the argument properly in the trace program.
>> + */
>> + if (tgt_prog && tgt_prog->type == BPF_PROG_TYPE_EXT)
>> + tgt_prog = tgt_prog->aux->linked_prog;
>> +
>> if (tgt_prog) {
>> ret = btf_translate_to_vmlinux(log, btf, t, tgt_prog->type, arg);
>
> I think it would be cleaner to move resolve_prog_type() from verifier.c
> and use that helper function here.
FYI, I've added a different version of this patch to my freplace
multi-attach series (since the approach here was incompatible with
that).
-Toke
prev parent reply other threads:[~2020-09-11 10:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 15:11 [PATCH bpf-next 1/2] bpf: Fix context type resolving for extension programs Jiri Olsa
2020-09-09 15:11 ` [PATCH bpf-next 2/2] selftests/bpf: Adding test for arg dereference in extension trace Jiri Olsa
2020-09-10 22:34 ` Andrii Nakryiko
2020-09-11 11:01 ` Toke Høiland-Jørgensen
2020-09-11 13:02 ` Jiri Olsa
2020-09-09 15:54 ` [PATCH bpf-next 1/2] bpf: Fix context type resolving for extension programs Toke Høiland-Jørgensen
2020-09-09 18:58 ` Jiri Olsa
2020-09-10 9:49 ` Toke Høiland-Jørgensen
2020-09-10 18:00 ` Alexei Starovoitov
2020-09-11 10:52 ` Toke Høiland-Jørgensen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871rj8bn6m.fsf@toke.dk \
--to=toke@redhat$(echo .)com \
--cc=alexei.starovoitov@gmail$(echo .)com \
--cc=andriin@fb$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=brouer@redhat$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=echaudro@redhat$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=kafai@fb$(echo .)com \
--cc=kpsingh@chromium$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=songliubraving@fb$(echo .)com \
--cc=yhs@fb$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox