From: Maxim Mikityanskiy <maximmi@mellanox.com>
To: Magnus Karlsson <magnus.karlsson@intel.com>
Cc: "bjorn.topel@intel.com" <bjorn.topel@intel.com>,
"ast@kernel.org" <ast@kernel.org>,
"daniel@iogearbox.net" <daniel@iogearbox.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"jonathan.lemon@gmail.com" <jonathan.lemon@gmail.com>,
"bpf@vger.kernel.org" <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf] xsk: add missing memory barrier in xskq_has_addrs()
Date: Mon, 2 Dec 2019 09:30:36 +0000 [thread overview]
Message-ID: <c15a81e1-252f-936c-26f0-f21e8165c622@mellanox.com> (raw)
In-Reply-To: <1575021070-28873-1-git-send-email-magnus.karlsson@intel.com>
On 2019-11-29 11:51, Magnus Karlsson wrote:
> The rings in AF_XDP between user space and kernel space have the
> following semantics:
>
> producer consumer
>
> if (LOAD ->consumer) { LOAD ->producer
> (A) smp_rmb() (C)
> STORE $data LOAD $data
> smp_wmb() (B) smp_mb() (D)
> STORE ->producer STORE ->consumer
> }
>
> The consumer function xskq_has_addrs() below loads the producer
> pointer and updates the locally cached copy of it. However, it does
> not issue the smp_rmb() operation required by the lockless ring. This
> would have been ok had the function not updated the locally cached
> copy, as that could not have resulted in new data being read from the
> ring. But as it updates the local producer pointer, a subsequent peek
> operation, such as xskq_peek_addr(), might load data from the ring
> without issuing the required smp_rmb() memory barrier.
Thanks for paying attention to it, but I don't think it can really
happen. xskq_has_addrs only updates prod_tail, but xskq_peek_addr
doesn't use prod_tail, it reads from cons_tail to cons_head, and every
cons_head update has the necessary smp_rmb.
Actually, the same thing happens with xskq_nb_avail. In xskq_full_desc,
we don't have any barrier after xskq_nb_avail, and xskq_peek_desc can be
called after xskq_full_desc, but it's absolutely fine, because
xskq_nb_avail doesn't touch cons_head. The same happens with
xskq_has_addrs and xskq_peek_addr.
So, I don't think this change is required. Please correct me if I'm wrong.
> static inline bool xskq_has_addrs(struct xsk_queue *q, u32 cnt)
> {
> u32 entries = q->prod_tail - q->cons_tail;
>
> if (entries >= cnt)
> return true;
>
> /* Refresh the local pointer. */
> q->prod_tail = READ_ONCE(q->ring->producer);
> *** MISSING MEMORY BARRIER ***
> entries = q->prod_tail - q->cons_tail;
>
> return entries >= cnt;
> }
>
> Fix this by adding the missing memory barrier at the indicated point
> above.
>
> Fixes: d57d76428ae9 ("Add API to check for available entries in FQ")
> Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
> ---
> net/xdp/xsk_queue.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h
> index eddae46..b5492c3 100644
> --- a/net/xdp/xsk_queue.h
> +++ b/net/xdp/xsk_queue.h
> @@ -127,6 +127,7 @@ static inline bool xskq_has_addrs(struct xsk_queue *q, u32 cnt)
>
> /* Refresh the local pointer. */
> q->prod_tail = READ_ONCE(q->ring->producer);
> + smp_rmb(); /* C, matches B */
> entries = q->prod_tail - q->cons_tail;
>
> return entries >= cnt;
>
next prev parent reply other threads:[~2019-12-02 9:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 9:51 [PATCH bpf] xsk: add missing memory barrier in xskq_has_addrs() Magnus Karlsson
2019-12-02 9:30 ` Maxim Mikityanskiy [this message]
2019-12-02 12:31 ` Magnus Karlsson
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=c15a81e1-252f-936c-26f0-f21e8165c622@mellanox.com \
--to=maximmi@mellanox.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jonathan.lemon@gmail.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.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).