From: John Fastabend <john.fastabend@gmail.com>
To: Lorenzo Bianconi <lorenzo@kernel.org>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: lorenzo.bianconi@redhat.com, davem@davemloft.net,
kuba@kernel.org, ast@kernel.org, daniel@iogearbox.net,
shayagr@amazon.com, sameehj@amazon.com, john.fastabend@gmail.com,
dsahern@kernel.org, brouer@redhat.com, echaudro@redhat.com,
jasowang@redhat.com, alexander.duyck@gmail.com, saeed@kernel.org,
maciej.fijalkowski@intel.com, magnus.karlsson@intel.com,
tirthendu.sarkar@intel.com
Subject: RE: [PATCH v9 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API
Date: Tue, 22 Jun 2021 16:37:50 -0700 [thread overview]
Message-ID: <60d2744ee12c2_1342e208f7@john-XPS-13-9370.notmuch> (raw)
In-Reply-To: <863f4934d251f44ad85a6be08b3737fac74f9b5a.1623674025.git.lorenzo@kernel.org>
Lorenzo Bianconi wrote:
> From: Eelco Chaudron <echaudro@redhat.com>
>
> This change adds support for tail growing and shrinking for XDP multi-buff.
>
It would be nice if the commit message gave us some details on how the
growing/shrinking works in the multi-buff support.
> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> include/net/xdp.h | 7 ++++++
> net/core/filter.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
> net/core/xdp.c | 5 ++--
> 3 files changed, 72 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/xdp.h b/include/net/xdp.h
> index 935a6f83115f..3525801c6ed5 100644
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@ -132,6 +132,11 @@ xdp_get_shared_info_from_buff(struct xdp_buff *xdp)
> return (struct skb_shared_info *)xdp_data_hard_end(xdp);
> }
>
> +static inline unsigned int xdp_get_frag_tailroom(const skb_frag_t *frag)
> +{
> + return PAGE_SIZE - skb_frag_size(frag) - skb_frag_off(frag);
> +}
> +
> struct xdp_frame {
> void *data;
> u16 len;
> @@ -259,6 +264,8 @@ struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp)
> return xdp_frame;
> }
>
> +void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct,
> + struct xdp_buff *xdp);
> void xdp_return_frame(struct xdp_frame *xdpf);
> void xdp_return_frame_rx_napi(struct xdp_frame *xdpf);
> void xdp_return_buff(struct xdp_buff *xdp);
> diff --git a/net/core/filter.c b/net/core/filter.c
> index caa88955562e..05f574a3d690 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -3859,11 +3859,73 @@ static const struct bpf_func_proto bpf_xdp_adjust_head_proto = {
> .arg2_type = ARG_ANYTHING,
> };
>
> +static int bpf_xdp_mb_adjust_tail(struct xdp_buff *xdp, int offset)
> +{
> + struct skb_shared_info *sinfo;
> +
> + if (unlikely(!xdp_buff_is_mb(xdp)))
> + return -EINVAL;
> +
> + sinfo = xdp_get_shared_info_from_buff(xdp);
> + if (offset >= 0) {
> + skb_frag_t *frag = &sinfo->frags[sinfo->nr_frags - 1];
> + int size;
> +
> + if (unlikely(offset > xdp_get_frag_tailroom(frag)))
> + return -EINVAL;
> +
> + size = skb_frag_size(frag);
> + memset(skb_frag_address(frag) + size, 0, offset);
> + skb_frag_size_set(frag, size + offset);
> + sinfo->data_len += offset;
Can you add some comment on how this works? So today I call
bpf_xdp_adjust_tail() to add some trailer to my packet.
This looks like it adds tailroom to the last frag? But, then
how do I insert my trailer? I don't think we can without the
extra multi-buffer access support right.
Also data_end will be unchanged yet it will return 0 so my
current programs will likely be a bit confused by this.
> + } else {
next prev parent reply other threads:[~2021-06-22 23:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 12:49 [PATCH v9 bpf-next 00/14] mvneta: introduce XDP multi-buffer support Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 01/14] net: skbuff: add data_len field to skb_shared_info Lorenzo Bianconi
2021-06-28 19:58 ` Alexander Duyck
2021-06-29 12:44 ` Lorenzo Bianconi
2021-06-29 17:08 ` Jakub Kicinski
2021-06-29 18:18 ` Alexander Duyck
2021-06-29 18:37 ` Jakub Kicinski
2021-06-29 19:11 ` Jesper Dangaard Brouer
2021-06-29 19:18 ` Lorenzo Bianconi
2021-06-29 20:45 ` Alexander Duyck
2021-06-14 12:49 ` [PATCH v9 bpf-next 02/14] xdp: introduce flags field in xdp_buff/xdp_frame Lorenzo Bianconi
2021-06-28 20:14 ` Alexander Duyck
2021-06-29 12:43 ` Lorenzo Bianconi
2021-06-29 13:07 ` Alexander Duyck
2021-06-29 13:25 ` Lorenzo Bianconi
2021-07-05 15:52 ` Lorenzo Bianconi
2021-07-05 21:35 ` Alexander Duyck
2021-07-06 11:53 ` Lorenzo Bianconi
2021-07-06 14:04 ` Alexander Duyck
2021-07-06 17:47 ` Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 03/14] net: mvneta: update mb bit before passing the xdp buffer to eBPF layer Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 04/14] xdp: add multi-buff support to xdp_return_{buff/frame} Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 05/14] net: mvneta: add multi buffer support to XDP_TX Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 06/14] net: mvneta: enable jumbo frames for XDP Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 07/14] net: xdp: add multi-buff support to xdp_build_skb_from_frame Lorenzo Bianconi
2021-06-28 21:05 ` Alexander Duyck
2021-06-29 18:34 ` Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API Lorenzo Bianconi
2021-06-22 23:37 ` John Fastabend [this message]
2021-06-24 9:26 ` Eelco Chaudron
2021-06-24 14:24 ` John Fastabend
2021-06-24 15:16 ` Zvi Effron
2021-06-29 13:19 ` Lorenzo Bianconi
2021-06-29 13:27 ` Toke Høiland-Jørgensen
2021-07-06 21:44 ` Backwards compatibility for XDP multi-buff (was: Re: [PATCH v9 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API) Toke Høiland-Jørgensen
2021-06-14 12:49 ` [PATCH v9 bpf-next 09/14] bpf: introduce bpf_xdp_get_buff_len helper Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 10/14] bpf: add multi-buffer support to xdp copy helpers Lorenzo Bianconi
2021-06-22 23:49 ` John Fastabend
2021-06-24 9:42 ` Eelco Chaudron
2021-06-24 14:28 ` John Fastabend
2021-06-25 8:25 ` Eelco Chaudron
2021-06-29 13:23 ` Lorenzo Bianconi
2021-07-06 10:15 ` Eelco Chaudron
2021-06-14 12:49 ` [PATCH v9 bpf-next 11/14] bpf: move user_size out of bpf_test_init Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 12/14] bpf: introduce multibuff support to bpf_prog_test_run_xdp() Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 13/14] bpf: test_run: add xdp_shared_info pointer in bpf_test_finish signature Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 14/14] bpf: update xdp_adjust_tail selftest to include multi-buffer Lorenzo Bianconi
2021-06-22 23:18 ` [PATCH v9 bpf-next 00/14] mvneta: introduce XDP multi-buffer support John Fastabend
2021-06-23 3:41 ` David Ahern
2021-06-23 5:48 ` John Fastabend
2021-06-23 14:40 ` David Ahern
2021-06-24 14:22 ` John Fastabend
2021-07-01 7:56 ` 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=60d2744ee12c2_1342e208f7@john-XPS-13-9370.notmuch \
--to=john.fastabend@gmail.com \
--cc=alexander.duyck@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=echaudro@redhat.com \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=lorenzo@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@kernel.org \
--cc=sameehj@amazon.com \
--cc=shayagr@amazon.com \
--cc=tirthendu.sarkar@intel.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).