From: Jesper Dangaard Brouer <brouer@redhat.com>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net,
ast@kernel.org, daniel@iogearbox.net, toke@redhat.com,
lorenzo.bianconi@redhat.com, dsahern@kernel.org,
David Ahern <dahern@digitalocean.com>,
brouer@redhat.com
Subject: Re: [PATCH v2 bpf-next 1/8] net: Refactor xdp_convert_buff_to_frame
Date: Sun, 21 Jun 2020 17:15:13 +0200 [thread overview]
Message-ID: <20200621171513.066e78ed@carbon> (raw)
In-Reply-To: <dfeb25e5274b0895f29fc1960e1cbd6c01157f8a.1592606391.git.lorenzo@kernel.org>
On Sat, 20 Jun 2020 00:57:17 +0200
Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> From: David Ahern <dahern@digitalocean.com>
>
> Move the guts of xdp_convert_buff_to_frame to a new helper,
> xdp_update_frame_from_buff so it can be reused removing code duplication
>
> Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com>
> Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> Signed-off-by: David Ahern <dahern@digitalocean.com>
> ---
> include/net/xdp.h | 35 ++++++++++++++++++++++-------------
> 1 file changed, 22 insertions(+), 13 deletions(-)
>
> diff --git a/include/net/xdp.h b/include/net/xdp.h
> index 609f819ed08b..ab1c503808a4 100644
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@ -121,39 +121,48 @@ void xdp_convert_frame_to_buff(struct xdp_frame *frame, struct xdp_buff *xdp)
> xdp->frame_sz = frame->frame_sz;
> }
>
> -/* Convert xdp_buff to xdp_frame */
> static inline
> -struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp)
> +int xdp_update_frame_from_buff(struct xdp_buff *xdp,
> + struct xdp_frame *xdp_frame)
> {
> - struct xdp_frame *xdp_frame;
> - int metasize;
> - int headroom;
> -
> - if (xdp->rxq->mem.type == MEM_TYPE_XSK_BUFF_POOL)
> - return xdp_convert_zc_to_xdp_frame(xdp);
> + int metasize, headroom;
>
> /* Assure headroom is available for storing info */
> headroom = xdp->data - xdp->data_hard_start;
> metasize = xdp->data - xdp->data_meta;
> metasize = metasize > 0 ? metasize : 0;
> if (unlikely((headroom - metasize) < sizeof(*xdp_frame)))
> - return NULL;
> + return -ENOMEM;
IMHO I think ENOMEM is reserved for memory allocations failures.
I think ENOSPC will be more appropriate here (or EOVERFLOW).
>
> /* Catch if driver didn't reserve tailroom for skb_shared_info */
> if (unlikely(xdp->data_end > xdp_data_hard_end(xdp))) {
> XDP_WARN("Driver BUG: missing reserved tailroom");
> - return NULL;
> + return -ENOMEM;
Same here.
> }
>
> - /* Store info in top of packet */
> - xdp_frame = xdp->data_hard_start;
> -
> xdp_frame->data = xdp->data;
> xdp_frame->len = xdp->data_end - xdp->data;
> xdp_frame->headroom = headroom - sizeof(*xdp_frame);
> xdp_frame->metasize = metasize;
> xdp_frame->frame_sz = xdp->frame_sz;
>
> + return 0;
> +}
> +
> +/* Convert xdp_buff to xdp_frame */
> +static inline
> +struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp)
> +{
> + struct xdp_frame *xdp_frame;
> +
> + if (xdp->rxq->mem.type == MEM_TYPE_XSK_BUFF_POOL)
> + return xdp_convert_zc_to_xdp_frame(xdp);
> +
> + /* Store info in top of packet */
> + xdp_frame = xdp->data_hard_start;
> + if (unlikely(xdp_update_frame_from_buff(xdp, xdp_frame) < 0))
> + return NULL;
> +
> /* rxq only valid until napi_schedule ends, convert to xdp_mem_info */
> xdp_frame->mem = xdp->rxq->mem;
>
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
next prev parent reply other threads:[~2020-06-21 15:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 22:57 [PATCH v2 bpf-next 0/8] introduce support for XDP programs in CPUMAP Lorenzo Bianconi
2020-06-19 22:57 ` [PATCH v2 bpf-next 1/8] net: Refactor xdp_convert_buff_to_frame Lorenzo Bianconi
2020-06-21 15:15 ` Jesper Dangaard Brouer [this message]
2020-06-22 11:48 ` Lorenzo Bianconi
2020-06-19 22:57 ` [PATCH v2 bpf-next 2/8] samples/bpf: xdp_redirect_cpu_user: do not update bpf maps in option loop Lorenzo Bianconi
2020-06-21 15:26 ` Jesper Dangaard Brouer
2020-06-19 22:57 ` [PATCH v2 bpf-next 3/8] cpumap: formalize map value as a named struct Lorenzo Bianconi
2020-06-22 9:33 ` Jesper Dangaard Brouer
2020-06-22 11:50 ` Lorenzo Bianconi
2020-06-19 22:57 ` [PATCH v2 bpf-next 4/8] bpf: cpumap: add the possibility to attach an eBPF program to cpumap Lorenzo Bianconi
2020-06-22 9:48 ` Jesper Dangaard Brouer
2020-06-23 14:56 ` Jesper Dangaard Brouer
2020-06-23 15:23 ` Jesper Dangaard Brouer
2020-06-19 22:57 ` [PATCH v2 bpf-next 5/8] bpf: cpumap: implement XDP_REDIRECT for eBPF programs attached to map entries Lorenzo Bianconi
2020-06-19 22:57 ` [PATCH v2 bpf-next 6/8] libbpf: add SEC name for xdp programs attached to CPUMAP Lorenzo Bianconi
2020-06-23 5:50 ` Andrii Nakryiko
2020-06-19 22:57 ` [PATCH v2 bpf-next 7/8] samples/bpf: xdp_redirect_cpu: load a eBPF program on cpumap Lorenzo Bianconi
2020-06-19 22:57 ` [PATCH v2 bpf-next 8/8] selftest: add tests for XDP programs in CPUMAP entries Lorenzo Bianconi
2020-06-23 5:55 ` Andrii Nakryiko
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=20200621171513.066e78ed@carbon \
--to=brouer@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dahern@digitalocean.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=lorenzo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=toke@redhat.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).