From: Maciej Fijalkowski <maciejromanfijalkowski@gmail.com>
To: daniel@iogearbox.net, ast@kernel.org
Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com,
brouer@redhat.com, john.fastabend@gmail.com
Subject: [PATCH bpf-next v5 5/8] xdp: Provide extack messages when prog attachment failed
Date: Fri, 1 Feb 2019 01:19:51 +0100 [thread overview]
Message-ID: <20190201001954.4130-6-maciej.fijalkowski@intel.com> (raw)
In-Reply-To: <20190201001954.4130-1-maciej.fijalkowski@intel.com>
In order to provide more meaningful messages to user when the process of
loading xdp program onto network interface failed, let's add extack
messages within dev_change_xdp_fd.
Suggested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
---
net/core/dev.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 8e276e0192a1..bfa4be42afff 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7983,8 +7983,10 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
query = flags & XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
bpf_op = bpf_chk = ops->ndo_bpf;
- if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE)))
+ if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) {
+ NL_SET_ERR_MSG(extack, "underlying driver does not support XDP in native mode");
return -EOPNOTSUPP;
+ }
if (!bpf_op || (flags & XDP_FLAGS_SKB_MODE))
bpf_op = generic_xdp_install;
if (bpf_op == bpf_chk)
@@ -7992,11 +7994,15 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
if (fd >= 0) {
if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) ||
- __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW))
+ __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW)) {
+ NL_SET_ERR_MSG(extack, "native and generic XDP can't be active at the same time");
return -EEXIST;
+ }
if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) &&
- __dev_xdp_query(dev, bpf_op, query))
+ __dev_xdp_query(dev, bpf_op, query)) {
+ NL_SET_ERR_MSG(extack, "XDP program already attached");
return -EBUSY;
+ }
prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,
bpf_op == ops->ndo_bpf);
--
2.16.1
next prev parent reply other threads:[~2019-02-01 0:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 0:19 [PATCH bpf-next v5 0/8] xdp: Avoid unloading xdp prog not attached by sample Maciej Fijalkowski
2019-02-01 0:19 ` [PATCH bpf-next v5 1/8] libbpf: Add a helper for retrieving a map fd for a given name Maciej Fijalkowski
2019-02-01 0:19 ` [PATCH bpf-next v5 2/8] samples/bpf: xdp_redirect_cpu have not need for read_trace_pipe Maciej Fijalkowski
2019-02-01 0:19 ` [PATCH bpf-next v5 3/8] samples/bpf: Convert XDP samples to libbpf usage Maciej Fijalkowski
2019-02-01 0:19 ` [PATCH bpf-next v5 4/8] samples/bpf: Extend RLIMIT_MEMLOCK for xdp_{sample_pkts, router_ipv4} Maciej Fijalkowski
2019-02-01 0:19 ` Maciej Fijalkowski [this message]
2019-02-01 0:32 ` [PATCH bpf-next v5 5/8] xdp: Provide extack messages when prog attachment failed Jakub Kicinski
2019-02-01 3:11 ` Jakub Kicinski
2019-02-01 7:02 ` Co-existing XDP generic and native mode? (Re: [PATCH bpf-next v5 5/8] xdp: Provide extack messages when prog attachment failed) Jesper Dangaard Brouer
2019-02-01 18:47 ` Jakub Kicinski
2019-02-01 21:33 ` Daniel Borkmann
2019-02-01 21:44 ` Jakub Kicinski
2019-02-01 23:14 ` Daniel Borkmann
2019-02-01 7:04 ` [PATCH bpf-next v5 5/8] xdp: Provide extack messages when prog attachment failed Jesper Dangaard Brouer
2019-02-01 0:19 ` [PATCH bpf-next v5 6/8] samples/bpf: Add a "force" flag to XDP samples Maciej Fijalkowski
2019-02-01 0:19 ` [PATCH bpf-next v5 7/8] libbpf: Add a support for getting xdp prog id on ifindex Maciej Fijalkowski
2019-02-01 21:43 ` Daniel Borkmann
2019-02-01 21:47 ` Jakub Kicinski
2019-02-01 23:00 ` Daniel Borkmann
2019-02-01 0:19 ` [PATCH bpf-next v5 8/8] samples/bpf: Check the prog id before exiting Maciej Fijalkowski
2019-02-01 21:23 ` [PATCH bpf-next v5 0/8] xdp: Avoid unloading xdp prog not attached by sample Daniel Borkmann
2019-02-01 21:47 ` Maciej Fijałkowski
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=20190201001954.4130-6-maciej.fijalkowski@intel.com \
--to=maciejromanfijalkowski@gmail.com \
--cc=ast@kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=jakub.kicinski@netronome.com \
--cc=john.fastabend@gmail.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).