From: John Fastabend <john.fastabend@gmail.com>
To: Magnus Karlsson <magnus.karlsson@gmail.com>,
magnus.karlsson@intel.com, bjorn.topel@intel.com, ast@kernel.org,
daniel@iogearbox.net, netdev@vger.kernel.org,
jonathan.lemon@gmail.com
Cc: maciejromanfijalkowski@gmail.com,
intel-wired-lan@lists.osuosl.org, bpf@vger.kernel.org
Subject: RE: [Intel-wired-lan] [PATCH bpf-next 5/6] xsk: introduce batched Tx descriptor interfaces
Date: Mon, 09 Nov 2020 13:06:33 -0800 [thread overview]
Message-ID: <5fa9af59a5f89_8c0e208b1@john-XPS-13-9370.notmuch> (raw)
In-Reply-To: <1604498942-24274-6-git-send-email-magnus.karlsson@gmail.com>
Magnus Karlsson wrote:
> From: Magnus Karlsson <magnus.karlsson@intel.com>
>
> Introduce batched descriptor interfaces in the xsk core code for the
> Tx path to be used in the driver to write a code path with higher
> performance. This interface will be used by the i40e driver in the
> next patch. Though other drivers would likely benefit from this new
> interface too.
>
> Note that batching is only implemented for the common case when
> there is only one socket bound to the same device and queue id. When
> this is not the case, we fall back to the old non-batched version of
> the function.
>
> Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
> ---
> include/net/xdp_sock_drv.h | 7 ++++
> net/xdp/xsk.c | 43 ++++++++++++++++++++++
> net/xdp/xsk_queue.h | 89 +++++++++++++++++++++++++++++++++++++++-------
> 3 files changed, 126 insertions(+), 13 deletions(-)
>
> diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
> index 5b1ee8a..4e295541 100644
> --- a/include/net/xdp_sock_drv.h
> +++ b/include/net/xdp_sock_drv.h
> @@ -13,6 +13,7 @@
>
> void xsk_tx_completed(struct xsk_buff_pool *pool, u32 nb_entries);
> bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc);
> +u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, struct xdp_desc *desc, u32 max);
> void xsk_tx_release(struct xsk_buff_pool *pool);
> struct xsk_buff_pool *xsk_get_pool_from_qid(struct net_device *dev,
> u16 queue_id);
> @@ -128,6 +129,12 @@ static inline bool xsk_tx_peek_desc(struct xsk_buff_pool *pool,
> return false;
> }
>
> +static inline u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, struct xdp_desc *desc,
> + u32 max)
> +{
> + return 0;
> +}
> +
> static inline void xsk_tx_release(struct xsk_buff_pool *pool)
> {
> }
> diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> index b71a32e..dd75b5f 100644
> --- a/net/xdp/xsk.c
> +++ b/net/xdp/xsk.c
> @@ -332,6 +332,49 @@ bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc)
> }
> EXPORT_SYMBOL(xsk_tx_peek_desc);
>
> +u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, struct xdp_desc *descs,
> + u32 max_entries)
> +{
> + struct xdp_sock *xs;
> + u32 nb_pkts;
> +
> + rcu_read_lock();
> + if (!list_is_singular(&pool->xsk_tx_list)) {
> + /* Fallback to the non-batched version */
> + rcu_read_unlock();
> + return xsk_tx_peek_desc(pool, &descs[0]) ? 1 : 0;
> + }
> +
> + xs = list_first_or_null_rcu(&pool->xsk_tx_list, struct xdp_sock, tx_list);
I'm not seeing how we avoid the null check here? Can you add a comment on why this
is safe? I see the bind/unbind routines is it possible to unbind while this is
running or do we have some locking here.
> +
> + nb_pkts = xskq_cons_peek_desc_batch(xs->tx, descs, pool, max_entries);
> + if (!nb_pkts) {
> + xs->tx->queue_empty_descs++;
> + goto out;
> + }
> +
> + /* This is the backpressure mechanism for the Tx path. Try to
> + * reserve space in the completion queue for all packets, but
> + * if there are fewer slots available, just process that many
> + * packets. This avoids having to implement any buffering in
> + * the Tx path.
> + */
> + nb_pkts = xskq_prod_reserve_addr_batch(pool->cq, descs, nb_pkts);
> + if (!nb_pkts)
> + goto out;
> +
> + xskq_cons_release_n(xs->tx, nb_pkts);
> + __xskq_cons_release(xs->tx);
> + xs->sk.sk_write_space(&xs->sk);
Can you move the out label here? Looks like nb_pkts = 0 in all cases
where goto out is used.
> + rcu_read_unlock();
> + return nb_pkts;
> +
> +out:
> + rcu_read_unlock();
> + return 0;
> +}
> +EXPORT_SYMBOL(xsk_tx_peek_release_desc_batch);
> +
> static int xsk_wakeup(struct xdp_sock *xs, u8 flags)
> {
> struct net_device *dev = xs->dev;
[...]
Other than above question LGTM.
Thanks,
John
next prev parent reply other threads:[~2020-11-09 21:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 14:08 [PATCH bpf-next 0/6] xsk: i40e: Tx performance improvements Magnus Karlsson
2020-11-04 14:08 ` [PATCH bpf-next 1/6] i40e: introduce lazy Tx completions for AF_XDP zero-copy Magnus Karlsson
2020-11-04 23:33 ` Jakub Kicinski
2020-11-04 23:35 ` Jakub Kicinski
2020-11-05 14:17 ` Magnus Karlsson
2020-11-05 15:45 ` Jakub Kicinski
2020-11-06 19:09 ` Magnus Karlsson
2020-11-04 14:08 ` [PATCH bpf-next 2/6] samples/bpf: increment Tx stats at sending Magnus Karlsson
2020-11-09 20:47 ` [Intel-wired-lan] " John Fastabend
2020-11-10 7:12 ` Magnus Karlsson
2020-11-04 14:08 ` [PATCH bpf-next 3/6] i40e: remove unnecessary sw_ring access from xsk Tx Magnus Karlsson
2020-11-09 20:48 ` [Intel-wired-lan] " John Fastabend
2020-11-04 14:09 ` [PATCH bpf-next 4/6] xsk: introduce padding between more ring pointers Magnus Karlsson
2020-11-09 20:43 ` [Intel-wired-lan] " John Fastabend
2020-11-04 14:09 ` [PATCH bpf-next 5/6] xsk: introduce batched Tx descriptor interfaces Magnus Karlsson
2020-11-09 21:06 ` John Fastabend [this message]
2020-11-10 8:28 ` [Intel-wired-lan] " Magnus Karlsson
2020-11-04 14:09 ` [PATCH bpf-next 6/6] i40e: use batched xsk Tx interfaces to increase performance Magnus Karlsson
2020-11-04 23:01 ` Maciej Fijalkowski
2020-11-05 7:19 ` Magnus Karlsson
2020-11-09 21:10 ` [Intel-wired-lan] " John Fastabend
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=5fa9af59a5f89_8c0e208b1@john-XPS-13-9370.notmuch \
--to=john.fastabend@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jonathan.lemon@gmail.com \
--cc=maciejromanfijalkowski@gmail.com \
--cc=magnus.karlsson@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).