From: Jianlin Lv <iecedge@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: irogers@google.com, Song Liu <songliubraving@fb.com>,
linux-doc@vger.kernel.org, zlim.lnx@gmail.com,
paul.walmsley@sifive.com, Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
paulus@samba.org, sandipan@linux.ibm.com, hpa@zytor.com,
sparclinux@vger.kernel.org, illusionist.neo@gmail.com,
Mahesh Bandewar <maheshb@google.com>,
Will Deacon <will@kernel.org>,
Nicolas Dichtel <nicolas.dichtel@6wind.com>,
linux-s390@vger.kernel.org, iii@linux.ibm.com,
paulburton@kernel.org, corbet@lwn.net, mchehab+huawei@kernel.org,
Masahiro Yamada <masahiroy@kernel.org>,
x86@kernel.org, John Fastabend <john.fastabend@gmail.com>,
linux@armlinux.org.uk, linux-riscv@lists.infradead.org,
borntraeger@de.ibm.com, mingo@redhat.com,
linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
naveen.n.rao@linux.ibm.com, Jakub Kicinski <kuba@kernel.org>,
tklauser@distanz.ch, linux-mips@vger.kernel.org,
grantseltzer@gmail.com, xi.wang@gmail.com, aou@eecs.berkeley.edu,
Kees Cook <keescook@chromium.org>,
gor@linux.ibm.com, luke.r.nels@gmail.com,
LKML <linux-kernel@vger.kernel.org>,
hca@linux.ibm.com, linuxppc-dev@lists.ozlabs.org,
KP Singh <kpsingh@kernel.org>,
horms@verge.net.au, bp@alien8.de,
Alexander Viro <viro@zeniv.linux.org.uk>,
Yonghong Song <yhs@fb.com>,
tglx@linutronix.de, Dmitry Vyukov <dvyukov@google.com>,
tsbogend@alpha.franken.de, yoshfuji@linux-ipv6.org,
Network Development <netdev@vger.kernel.org>,
dsahern@kernel.org, udknight@gmail.com,
Martin KaFai Lau <kafai@fb.com>,
bjorn@kernel.org, palmer@dabbelt.com, quentin@isovalent.com,
bpf <bpf@vger.kernel.org>, Jianlin Lv <Jianlin.Lv@arm.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH bpf-next 1/2] bpf: Remove bpf_jit_enable=2 debugging mode
Date: Fri, 16 Apr 2021 21:38:33 +0800 [thread overview]
Message-ID: <CAFA-uR8H2MMy_vjQ_ZL96ifKcVg2goK3nozOFavN+gnJ+=V6Rw@mail.gmail.com> (raw)
In-Reply-To: <9c4a78d2-f73c-832a-e6e2-4b4daa729e07@iogearbox.net>
On Thu, Apr 15, 2021 at 10:38 PM Daniel Borkmann <daniel@iogearbox.net> wrote:
>
> On 4/15/21 11:32 AM, Jianlin Lv wrote:
> > For debugging JITs, dumping the JITed image to kernel log is discouraged,
> > "bpftool prog dump jited" is much better way to examine JITed dumps.
> > This patch get rid of the code related to bpf_jit_enable=2 mode and
> > update the proc handler of bpf_jit_enable, also added auxiliary
> > information to explain how to use bpf_jit_disasm tool after this change.
> >
> > Signed-off-by: Jianlin Lv <Jianlin.Lv@arm.com>
> [...]
> > diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
> > index 0a7a2870f111..8d36b4658076 100644
> > --- a/arch/x86/net/bpf_jit_comp32.c
> > +++ b/arch/x86/net/bpf_jit_comp32.c
> > @@ -2566,9 +2566,6 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
> > cond_resched();
> > }
> >
> > - if (bpf_jit_enable > 1)
> > - bpf_jit_dump(prog->len, proglen, pass + 1, image);
> > -
> > if (image) {
> > bpf_jit_binary_lock_ro(header);
> > prog->bpf_func = (void *)image;
> > diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> > index c8496c1142c9..990b1720c7a4 100644
> > --- a/net/core/sysctl_net_core.c
> > +++ b/net/core/sysctl_net_core.c
> > @@ -273,16 +273,8 @@ static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,
> >
> > tmp.data = &jit_enable;
> > ret = proc_dointvec_minmax(&tmp, write, buffer, lenp, ppos);
> > - if (write && !ret) {
> > - if (jit_enable < 2 ||
> > - (jit_enable == 2 && bpf_dump_raw_ok(current_cred()))) {
> > - *(int *)table->data = jit_enable;
> > - if (jit_enable == 2)
> > - pr_warn("bpf_jit_enable = 2 was set! NEVER use this in production, only for JIT debugging!\n");
> > - } else {
> > - ret = -EPERM;
> > - }
> > - }
> > + if (write && !ret)
> > + *(int *)table->data = jit_enable;
> > return ret;
> > }
> >
> > @@ -389,7 +381,7 @@ static struct ctl_table net_core_table[] = {
> > .extra2 = SYSCTL_ONE,
> > # else
> > .extra1 = SYSCTL_ZERO,
> > - .extra2 = &two,
> > + .extra2 = SYSCTL_ONE,
> > # endif
> > },
> > # ifdef CONFIG_HAVE_EBPF_JIT
> > diff --git a/tools/bpf/bpf_jit_disasm.c b/tools/bpf/bpf_jit_disasm.c
> > index c8ae95804728..efa4b17ae016 100644
> > --- a/tools/bpf/bpf_jit_disasm.c
> > +++ b/tools/bpf/bpf_jit_disasm.c
> > @@ -7,7 +7,7 @@
> > *
> > * To get the disassembly of the JIT code, do the following:
> > *
> > - * 1) `echo 2 > /proc/sys/net/core/bpf_jit_enable`
> > + * 1) Insert bpf_jit_dump() and recompile the kernel to output JITed image into log
>
> Hmm, if we remove bpf_jit_dump(), the next drive-by cleanup patch will be thrown
> at bpf@vger stating that bpf_jit_dump() has no in-tree users and should be removed.
> Maybe we should be removing bpf_jit_disasm.c along with it as well as bpf_jit_dump()
> itself ... I guess if it's ever needed in those rare occasions for JIT debugging we
> can resurrect it from old kernels just locally. But yeah, bpftool's jit dump should
> suffice for vast majority of use cases.
>
> There was a recent set for ppc32 jit which was merged into ppc tree which will create
> a merge conflict with this one [0]. So we would need a rebase and take it maybe during
> merge win once the ppc32 landed..
>
> [0] https://lore.kernel.org/bpf/cover.1616430991.git.christophe.leroy@csgroup.eu/
>
> > * 2) Load a BPF filter (e.g. `tcpdump -p -n -s 0 -i eth1 host 192.168.20.0/24`)
> > * 3) Run e.g. `bpf_jit_disasm -o` to read out the last JIT code
> > *
> > diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c
> > index 40a88df275f9..98c7eec2923f 100644
> > --- a/tools/bpf/bpftool/feature.c
> > +++ b/tools/bpf/bpftool/feature.c
> > @@ -203,9 +203,6 @@ static void probe_jit_enable(void)
> > case 1:
> > printf("JIT compiler is enabled\n");
> > break;
> > - case 2:
> > - printf("JIT compiler is enabled with debugging traces in kernel logs\n");
> > - break;
>
> This would still need to be there for older kernels ...
I will submit another version after ppc32 landed to remove
bpf_jit_disasm.c and restore bpftool/feature.c
Jianlin
>
> > case -1:
> > printf("Unable to retrieve JIT-compiler status\n");
> > break;
> >
>
prev parent reply other threads:[~2021-04-17 1:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 9:32 [PATCH bpf-next 1/2] bpf: Remove bpf_jit_enable=2 debugging mode Jianlin Lv
2021-04-15 9:32 ` [PATCH bpf-next 2/2] docs: bpf: bpf_jit_enable mode changed Jianlin Lv
2021-04-15 14:37 ` [PATCH bpf-next 1/2] bpf: Remove bpf_jit_enable=2 debugging mode Daniel Borkmann
2021-04-15 15:41 ` Quentin Monnet
2021-04-15 23:49 ` Alexei Starovoitov
2021-04-17 8:16 ` Christophe Leroy
2021-04-20 3:28 ` Alexei Starovoitov
2021-04-21 13:10 ` Christophe Leroy
2021-04-21 15:27 ` Quentin Monnet
2021-04-21 16:29 ` John Fastabend
2021-04-23 7:19 ` Christophe Leroy
2021-04-23 10:26 ` Quentin Monnet
2021-04-23 10:46 ` Christophe Leroy
2021-04-23 10:59 ` Quentin Monnet
2021-04-23 11:29 ` Christophe Leroy
2021-05-14 6:34 ` Christophe Leroy
2021-04-16 13:38 ` Jianlin Lv [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='CAFA-uR8H2MMy_vjQ_ZL96ifKcVg2goK3nozOFavN+gnJ+=V6Rw@mail.gmail.com' \
--to=iecedge@gmail.com \
--cc=Jianlin.Lv@arm.com \
--cc=andrii@kernel.org \
--cc=aou@eecs.berkeley.edu \
--cc=ast@kernel.org \
--cc=bjorn@kernel.org \
--cc=borntraeger@de.ibm.com \
--cc=bp@alien8.de \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=dvyukov@google.com \
--cc=gor@linux.ibm.com \
--cc=grantseltzer@gmail.com \
--cc=hca@linux.ibm.com \
--cc=horms@verge.net.au \
--cc=hpa@zytor.com \
--cc=iii@linux.ibm.com \
--cc=illusionist.neo@gmail.com \
--cc=irogers@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luke.r.nels@gmail.com \
--cc=maheshb@google.com \
--cc=masahiroy@kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mingo@redhat.com \
--cc=naveen.n.rao@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=paulburton@kernel.org \
--cc=paulus@samba.org \
--cc=quentin@isovalent.com \
--cc=sandipan@linux.ibm.com \
--cc=songliubraving@fb.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tklauser@distanz.ch \
--cc=tsbogend@alpha.franken.de \
--cc=udknight@gmail.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xi.wang@gmail.com \
--cc=yhs@fb.com \
--cc=yoshfuji@linux-ipv6.org \
--cc=zlim.lnx@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).