From: alardam@gmail.com
To: magnus.karlsson@intel.com, bjorn.topel@intel.com,
andrii.nakryiko@gmail.com, kuba@kernel.org, ast@kernel.org,
daniel@iogearbox.net, netdev@vger.kernel.org,
davem@davemloft.net, john.fastabend@gmail.com, hawk@kernel.org,
toke@redhat.com
Cc: maciej.fijalkowski@intel.com, jonathan.lemon@gmail.com,
bpf@vger.kernel.org, jeffrey.t.kirsher@intel.com,
maciejromanfijalkowski@gmail.com,
intel-wired-lan@lists.osuosl.org,
Marek Majtyka <marekx.majtyka@intel.com>
Subject: [PATCH 7/8] libbpf: add API to get XSK/XDP caps
Date: Mon, 16 Nov 2020 10:34:51 +0100 [thread overview]
Message-ID: <20201116093452.7541-8-marekx.majtyka@intel.com> (raw)
In-Reply-To: <20201116093452.7541-1-marekx.majtyka@intel.com>
From: Marek Majtyka <marekx.majtyka@intel.com>
Add public xsk API to read supported XDP functions of a netdev:
- XDP driver mode (SKB, DRV),
- XSK bind mode (COPY, ZEROCOPY).
Signed-off-by: Marek Majtyka <marekx.majtyka@intel.com>
---
tools/lib/bpf/libbpf.map | 1 +
tools/lib/bpf/xsk.c | 51 +++++++++++++++++++++++++++++++++++++++-
tools/lib/bpf/xsk.h | 3 ++-
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 29ff4807b909..0867dd078a65 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -345,4 +345,5 @@ LIBBPF_0.3.0 {
btf__parse_split;
btf__new_empty_split;
btf__new_split;
+ xsk_socket__get_caps;
} LIBBPF_0.2.0;
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
index 7951f7ea6db3..433c58fbed68 100644
--- a/tools/lib/bpf/xsk.c
+++ b/tools/lib/bpf/xsk.c
@@ -15,7 +15,6 @@
#include <arpa/inet.h>
#include <asm/barrier.h>
#include <linux/compiler.h>
-#include <linux/ethtool.h>
#include <linux/filter.h>
#include <linux/if_ether.h>
#include <linux/if_link.h>
@@ -31,6 +30,7 @@
#include <sys/types.h>
#include "bpf.h"
+#include "ethtool.h"
#include "libbpf.h"
#include "libbpf_internal.h"
#include "xsk.h"
@@ -931,3 +931,52 @@ void xsk_socket__delete(struct xsk_socket *xsk)
close(xsk->fd);
free(xsk);
}
+
+int xsk_socket__get_caps(const char *ifname, __u32 *xdp_caps, __u16 *bind_caps)
+{
+ struct ethnl_params param;
+ int ret;
+
+ if (!xdp_caps || !bind_caps || !ifname ||
+ (strnlen(ifname, IFNAMSIZ) >= IFNAMSIZ))
+ return -EINVAL;
+
+ param.nl_family = ETHTOOL_GENL_NAME;
+ param.xdp_zc_flags = 0;
+ param.ifname = ifname;
+ param.xdp_flags = 0;
+
+ /* First, get the netlink family id */
+ ret = libbpf_ethnl_get_ethtool_family_id(¶m);
+ if (ret)
+ return ret;
+
+ /* Second, get number of features */
+ param.features = 0;
+ ret = libbpf_ethnl_get_netdev_features(¶m);
+ if (ret)
+ return ret;
+
+ /* Third, get the features description */
+ ret = libbpf_ethnl_get_netdev_features(¶m);
+ if (ret)
+ return ret;
+
+ *xdp_caps = XDP_FLAGS_SKB_MODE;
+ *bind_caps = XDP_COPY;
+
+ if (param.xdp_idx == -1 || param.xdp_zc_idx == -1)
+ return 0;
+
+ /* Finally, get features flags and process it */
+ ret = libbpf_ethnl_get_active_bits(¶m);
+ if (!ret) {
+ if (param.xdp_flags) {
+ *xdp_caps |= XDP_FLAGS_DRV_MODE;
+ if (param.xdp_zc_flags)
+ *bind_caps |= XDP_ZEROCOPY;
+ }
+ }
+
+ return ret;
+}
diff --git a/tools/lib/bpf/xsk.h b/tools/lib/bpf/xsk.h
index 1069c46364ff..ae29004570b2 100644
--- a/tools/lib/bpf/xsk.h
+++ b/tools/lib/bpf/xsk.h
@@ -247,7 +247,8 @@ xsk_socket__create_shared(struct xsk_socket **xsk_ptr,
/* Returns 0 for success and -EBUSY if the umem is still in use. */
LIBBPF_API int xsk_umem__delete(struct xsk_umem *umem);
LIBBPF_API void xsk_socket__delete(struct xsk_socket *xsk);
-
+LIBBPF_API int xsk_socket__get_caps(const char *ifname, __u32 *xdp_caps,
+ __u16 *bind_caps);
#ifdef __cplusplus
} /* extern "C" */
#endif
--
2.20.1
next prev parent reply other threads:[~2020-11-16 10:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 9:34 [PATCH 0/8] New netdev feature flags for XDP alardam
2020-11-16 9:34 ` [PATCH 1/8] net: ethtool: extend netdev_features flag set alardam
2020-11-16 9:34 ` [PATCH 2/8] drivers/net: turn XDP flags on alardam
2020-11-16 9:34 ` [PATCH 3/8] xsk: add usage of xdp netdev_features flags alardam
2020-11-16 9:34 ` [PATCH 4/8] xsk: add check for full support of XDP in bind alardam
2020-11-16 9:34 ` [PATCH 5/8] libbpf: extend netlink attribute API alardam
2020-11-16 9:34 ` [PATCH 6/8] libbpf: add functions to get XSK modes alardam
2020-11-16 9:34 ` alardam [this message]
2020-11-16 9:34 ` [PATCH 8/8] samples/bpf/xdp: apply netdev XDP/XSK modes info alardam
2020-11-16 13:25 ` [PATCH 0/8] New netdev feature flags for XDP Toke Høiland-Jørgensen
2020-11-17 7:37 ` [Intel-wired-lan] " Magnus Karlsson
2020-11-17 8:55 ` Marek Majtyka
2020-11-17 18:38 ` Toke Høiland-Jørgensen
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=20201116093452.7541-8-marekx.majtyka@intel.com \
--to=alardam@gmail.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=maciejromanfijalkowski@gmail.com \
--cc=magnus.karlsson@intel.com \
--cc=marekx.majtyka@intel.com \
--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