Skip to content

Commit

Permalink
bpf, xdp: Add tracepoint to xdp attaching failure
Browse files Browse the repository at this point in the history
When error happens in dev_xdp_attach(), it should have a way to tell
users the error message like the netlink approach.

To avoid breaking uapi, adding a tracepoint in bpf_xdp_link_attach() is
an appropriate way to notify users the error message.

Hence, bpf libraries are able to retrieve the error message by this
tracepoint, and then report the error message to users.

Signed-off-by: Leon Hwang <hffilwlqm@gmail.com>
Link: https://lore.kernel.org/r/20230801142621.7925-2-hffilwlqm@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Leon Hwang authored and Alexei Starovoitov committed Aug 2, 2023
1 parent 416c6d0 commit bf4ea1d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
17 changes: 17 additions & 0 deletions include/trace/events/xdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,23 @@ TRACE_EVENT(mem_return_failed,
)
);

TRACE_EVENT(bpf_xdp_link_attach_failed,

TP_PROTO(const char *msg),

TP_ARGS(msg),

TP_STRUCT__entry(
__string(msg, msg)
),

TP_fast_assign(
__assign_str(msg, msg);
),

TP_printk("errmsg=%s", __get_str(msg))
);

#endif /* _TRACE_XDP_H */

#include <trace/define_trace.h>
5 changes: 4 additions & 1 deletion net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
#include <trace/events/net.h>
#include <trace/events/skb.h>
#include <trace/events/qdisc.h>
#include <trace/events/xdp.h>
#include <linux/inetdevice.h>
#include <linux/cpu_rmap.h>
#include <linux/static_key.h>
Expand Down Expand Up @@ -9470,6 +9471,7 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
{
struct net *net = current->nsproxy->net_ns;
struct bpf_link_primer link_primer;
struct netlink_ext_ack extack = {};
struct bpf_xdp_link *link;
struct net_device *dev;
int err, fd;
Expand Down Expand Up @@ -9497,12 +9499,13 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
goto unlock;
}

err = dev_xdp_attach_link(dev, NULL, link);
err = dev_xdp_attach_link(dev, &extack, link);
rtnl_unlock();

if (err) {
link->dev = NULL;
bpf_link_cleanup(&link_primer);
trace_bpf_xdp_link_attach_failed(extack._msg);
goto out_put_dev;
}

Expand Down

0 comments on commit bf4ea1d

Please sign in to comment.