From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Brendan Jackman <jackmanb@google.com>, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Florent Revest <revest@chromium.org>
Subject: Re: [PATCH v3 bpf-next] bpf: Explicitly zero-extend R0 after 32-bit cmpxchg
Date: Wed, 17 Feb 2021 19:30:26 +0100 [thread overview]
Message-ID: <c20a494cfeb112093dcefe45838c63f62d781621.camel@linux.ibm.com> (raw)
In-Reply-To: <20210217092831.2366396-1-jackmanb@google.com>
On Wed, 2021-02-17 at 09:28 +0000, Brendan Jackman wrote:
> As pointed out by Ilya and explained in the new comment, there's a
> discrepancy between x86 and BPF CMPXCHG semantics: BPF always loads
> the value from memory into r0, while x86 only does so when r0 and the
> value in memory are different. The same issue affects s390.
>
> At first this might sound like pure semantics, but it makes a real
> difference when the comparison is 32-bit, since the load will
> zero-extend r0/rax.
>
> The fix is to explicitly zero-extend rax after doing such a
> CMPXCHG. Since this problem affects multiple archs, this is done in
> the verifier by patching in a BPF_ZEXT_REG instruction after every
> 32-bit cmpxchg. Any archs that don't need such manual zero-extension
> can do a look-ahead with insn_is_zext to skip the unnecessary mov.
>
> Reported-by: Ilya Leoshkevich <iii@linux.ibm.com>
> Fixes: 5ffa25502b5a ("bpf: Add instructions for atomic_[cmp]xchg")
> Signed-off-by: Brendan Jackman <jackmanb@google.com>
> ---
>
> Differences v2->v3[1]:
> - Moved patching into fixup_bpf_calls (patch incoming to rename this
> function)
> - Added extra commentary on bpf_jit_needs_zext
> - Added check to avoid adding a pointless zext(r0) if there's
> already one there.
>
> Difference v1->v2[1]: Now solved centrally in the verifier instead of
> specifically for the x86 JIT. Thanks to Ilya and Daniel for the
> suggestions!
>
> [1] v2:
> https://lore.kernel.org/bpf/08669818-c99d-0d30-e1db-53160c063611@iogearbox.net/T/#t
> v1:
> https://lore.kernel.org/bpf/d7ebaefb-bfd6-a441-3ff2-2fdfe699b1d2@iogearbox.net/T/#t
>
> kernel/bpf/core.c | 4 +++
> kernel/bpf/verifier.c | 26
> +++++++++++++++++++
> .../selftests/bpf/verifier/atomic_cmpxchg.c | 25
> ++++++++++++++++++
> .../selftests/bpf/verifier/atomic_or.c | 26
> +++++++++++++++++++
> 4 files changed, 81 insertions(+)
[...]
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 16ba43352a5f..a0d19be13558 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -11662,6 +11662,32 @@ static int fixup_bpf_calls(struct
> bpf_verifier_env *env)
> continue;
> }
>
> + /* BPF_CMPXCHG always loads a value into R0,
> therefore always
> + * zero-extends. However some archs' equivalent
> instruction only
> + * does this load when the comparison is successful.
> So here we
> + * add a BPF_ZEXT_REG after every 32-bit CMPXCHG, so
> that such
> + * archs' JITs don't need to deal with the issue.
> Archs that
> + * don't face this issue may use insn_is_zext to
> detect and skip
> + * the added instruction.
> + */
> + if (insn->code == (BPF_STX | BPF_W | BPF_ATOMIC) &&
> insn->imm == BPF_CMPXCHG) {
> + struct bpf_insn zext_patch[2] = { [1] =
> BPF_ZEXT_REG(BPF_REG_0) };
> +
> + if (!memcmp(&insn[1], &zext_patch[1],
> sizeof(struct bpf_insn)))
> + /* Probably done by
> opt_subreg_zext_lo32_rnd_hi32. */
> + continue;
> +
Isn't opt_subreg_zext_lo32_rnd_hi32() called after fixup_bpf_calls()?
[...]
next prev parent reply other threads:[~2021-02-17 18:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 9:28 [PATCH v3 bpf-next] bpf: Explicitly zero-extend R0 after 32-bit cmpxchg Brendan Jackman
2021-02-17 18:30 ` Ilya Leoshkevich [this message]
2021-02-17 23:12 ` KP Singh
2021-02-22 15:06 ` Brendan Jackman
2021-02-22 15:51 ` Ilya Leoshkevich
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=c20a494cfeb112093dcefe45838c63f62d781621.camel@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jackmanb@google.com \
--cc=kpsingh@chromium.org \
--cc=revest@chromium.org \
/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).