From: Stanislav Fomichev <sdf@google.com>
To: bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, netdev@vger.kernel.org
Subject: [RFC bpf-next v2 05/11] bpf: Implement devtx timestamp kfunc
Date: Wed, 21 Jun 2023 10:02:38 -0700 [thread overview]
Message-ID: <20230621170244.1283336-6-sdf@google.com> (raw)
In-Reply-To: <20230621170244.1283336-1-sdf@google.com>
Two kfuncs, one per hook point:
1. at submit time - bpf_devtx_sb_request_timestamp - to request HW
to put TX timestamp into TX completion descriptors
2. at completion time - bpf_devtx_cp_timestamp - to read out
TX timestamp
Cc: netdev@vger.kernel.org
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
include/linux/netdevice.h | 4 +++
include/net/offload.h | 10 ++++++
kernel/bpf/offload.c | 8 +++++
net/core/devtx.c | 73 +++++++++++++++++++++++++++++++++++++++
4 files changed, 95 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 08fbd4622ccf..2fdb0731eb67 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1651,10 +1651,14 @@ struct net_device_ops {
bool cycles);
};
+struct devtx_frame;
+
struct xdp_metadata_ops {
int (*xmo_rx_timestamp)(const struct xdp_md *ctx, u64 *timestamp);
int (*xmo_rx_hash)(const struct xdp_md *ctx, u32 *hash,
enum xdp_rss_hash_type *rss_type);
+ int (*xmo_sb_request_timestamp)(const struct devtx_frame *ctx);
+ int (*xmo_cp_timestamp)(const struct devtx_frame *ctx, u64 *timestamp);
};
/**
diff --git a/include/net/offload.h b/include/net/offload.h
index 264a35881473..36899b64f4c8 100644
--- a/include/net/offload.h
+++ b/include/net/offload.h
@@ -10,9 +10,19 @@
NETDEV_METADATA_KFUNC(XDP_METADATA_KFUNC_RX_HASH, \
bpf_xdp_metadata_rx_hash)
+#define DEVTX_SB_KFUNC_xxx \
+ NETDEV_METADATA_KFUNC(DEVTX_SB_KFUNC_REQUEST_TIMESTAMP, \
+ bpf_devtx_sb_request_timestamp)
+
+#define DEVTX_CP_KFUNC_xxx \
+ NETDEV_METADATA_KFUNC(DEVTX_CP_KFUNC_TIMESTAMP, \
+ bpf_devtx_cp_timestamp)
+
enum {
#define NETDEV_METADATA_KFUNC(name, _) name,
XDP_METADATA_KFUNC_xxx
+DEVTX_SB_KFUNC_xxx
+DEVTX_CP_KFUNC_xxx
#undef NETDEV_METADATA_KFUNC
MAX_NETDEV_METADATA_KFUNC,
};
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c
index f01a1aa0f627..45a243af49be 100644
--- a/kernel/bpf/offload.c
+++ b/kernel/bpf/offload.c
@@ -863,6 +863,10 @@ void *bpf_dev_bound_resolve_kfunc(struct bpf_prog *prog, u32 func_id)
p = ops->xmo_rx_timestamp;
else if (func_id == bpf_dev_bound_kfunc_id(XDP_METADATA_KFUNC_RX_HASH))
p = ops->xmo_rx_hash;
+ else if (func_id == bpf_dev_bound_kfunc_id(DEVTX_SB_KFUNC_REQUEST_TIMESTAMP))
+ p = ops->xmo_sb_request_timestamp;
+ else if (func_id == bpf_dev_bound_kfunc_id(DEVTX_CP_KFUNC_TIMESTAMP))
+ p = ops->xmo_cp_timestamp;
out:
up_read(&bpf_devs_lock);
@@ -872,12 +876,16 @@ void *bpf_dev_bound_resolve_kfunc(struct bpf_prog *prog, u32 func_id)
BTF_SET_START(dev_bound_kfunc_ids)
#define NETDEV_METADATA_KFUNC(name, str) BTF_ID(func, str)
XDP_METADATA_KFUNC_xxx
+DEVTX_SB_KFUNC_xxx
+DEVTX_CP_KFUNC_xxx
#undef NETDEV_METADATA_KFUNC
BTF_SET_END(dev_bound_kfunc_ids)
BTF_ID_LIST(dev_bound_kfunc_ids_unsorted)
#define NETDEV_METADATA_KFUNC(name, str) BTF_ID(func, str)
XDP_METADATA_KFUNC_xxx
+DEVTX_SB_KFUNC_xxx
+DEVTX_CP_KFUNC_xxx
#undef NETDEV_METADATA_KFUNC
u32 bpf_dev_bound_kfunc_id(int id)
diff --git a/net/core/devtx.c b/net/core/devtx.c
index bad694439ae3..4267a8fe6711 100644
--- a/net/core/devtx.c
+++ b/net/core/devtx.c
@@ -74,3 +74,76 @@ void devtx_hooks_unregister(struct btf_id_set8 *set)
}
mutex_unlock(&devtx_hooks_lock);
}
+
+__diag_push();
+__diag_ignore_all("-Wmissing-prototypes",
+ "Global functions as their definitions will be in vmlinux BTF");
+
+/**
+ * bpf_devtx_sb_request_timestamp - Request TX timestamp on the packet.
+ * Callable only from the devtx-submit hook.
+ * @ctx: devtx context pointer.
+ *
+ * Returns 0 on success or ``-errno`` on error.
+ */
+__bpf_kfunc int bpf_devtx_sb_request_timestamp(const struct devtx_frame *ctx)
+{
+ return -EOPNOTSUPP;
+}
+
+/**
+ * bpf_devtx_cp_timestamp - Read TX timestamp of the packet. Callable
+ * only from the devtx-complete hook.
+ * @ctx: devtx context pointer.
+ * @timestamp: Return value pointer.
+ *
+ * Returns 0 on success or ``-errno`` on error.
+ */
+__bpf_kfunc int bpf_devtx_cp_timestamp(const struct devtx_frame *ctx, __u64 *timestamp)
+{
+ return -EOPNOTSUPP;
+}
+
+__diag_pop();
+
+BTF_SET8_START(devtx_sb_kfunc_ids)
+#define NETDEV_METADATA_KFUNC(_, name) BTF_ID_FLAGS(func, name, 0)
+DEVTX_SB_KFUNC_xxx
+#undef NETDEV_METADATA_KFUNC
+BTF_SET8_END(devtx_sb_kfunc_ids)
+
+static const struct btf_kfunc_id_set devtx_sb_kfunc_set = {
+ .owner = THIS_MODULE,
+ .set = &devtx_sb_kfunc_ids,
+};
+
+BTF_SET8_START(devtx_cp_kfunc_ids)
+#define NETDEV_METADATA_KFUNC(_, name) BTF_ID_FLAGS(func, name, 0)
+DEVTX_CP_KFUNC_xxx
+#undef NETDEV_METADATA_KFUNC
+BTF_SET8_END(devtx_cp_kfunc_ids)
+
+static const struct btf_kfunc_id_set devtx_cp_kfunc_set = {
+ .owner = THIS_MODULE,
+ .set = &devtx_cp_kfunc_ids,
+};
+
+static int __init devtx_init(void)
+{
+ int ret;
+
+ ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &devtx_sb_kfunc_set);
+ if (ret) {
+ pr_warn("failed to register devtx_sb kfuncs: %d", ret);
+ return ret;
+ }
+
+ ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &devtx_cp_kfunc_set);
+ if (ret) {
+ pr_warn("failed to register devtx_cp completion kfuncs: %d", ret);
+ return ret;
+ }
+
+ return 0;
+}
+late_initcall(devtx_init);
--
2.41.0.162.gfafddb0af9-goog
next prev parent reply other threads:[~2023-06-21 17:02 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 17:02 [RFC bpf-next v2 00/11] bpf: Netdev TX metadata Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 01/11] bpf: Rename some xdp-metadata functions into dev-bound Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 02/11] bpf: Resolve single typedef when walking structs Stanislav Fomichev
2023-06-22 5:17 ` Alexei Starovoitov
2023-06-22 17:55 ` Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 03/11] xsk: Support XDP_TX_METADATA_LEN Stanislav Fomichev
2023-06-22 9:11 ` Jesper D. Brouer
2023-06-22 17:55 ` Stanislav Fomichev
2023-06-23 10:24 ` Jesper Dangaard Brouer
2023-06-23 17:41 ` Stanislav Fomichev
2023-06-24 9:02 ` Jesper Dangaard Brouer
2023-06-26 17:00 ` Stanislav Fomichev
2023-06-28 8:09 ` Magnus Karlsson
2023-06-28 18:49 ` Stanislav Fomichev
2023-06-29 6:15 ` Magnus Karlsson
2023-06-29 11:30 ` [xdp-hints] " Toke Høiland-Jørgensen
2023-06-29 11:48 ` Magnus Karlsson
2023-06-29 12:01 ` Toke Høiland-Jørgensen
2023-06-29 16:21 ` Stanislav Fomichev
2023-06-29 20:58 ` Toke Høiland-Jørgensen
2023-06-30 6:22 ` Magnus Karlsson
2023-06-30 9:19 ` Toke Høiland-Jørgensen
2023-06-22 15:26 ` Simon Horman
2023-06-22 17:55 ` Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 04/11] bpf: Implement devtx hook points Stanislav Fomichev
2023-06-21 17:02 ` Stanislav Fomichev [this message]
2023-06-22 12:07 ` [RFC bpf-next v2 05/11] bpf: Implement devtx timestamp kfunc Jesper D. Brouer
2023-06-22 17:55 ` Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 06/11] net: veth: Implement devtx timestamp kfuncs Stanislav Fomichev
2023-06-23 23:29 ` Vinicius Costa Gomes
2023-06-26 17:00 ` Stanislav Fomichev
2023-06-26 22:00 ` Vinicius Costa Gomes
2023-06-26 23:29 ` Stanislav Fomichev
2023-06-27 1:38 ` Vinicius Costa Gomes
2023-06-21 17:02 ` [RFC bpf-next v2 07/11] selftests/xsk: Support XDP_TX_METADATA_LEN Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 08/11] selftests/bpf: Add helper to query current netns cookie Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 09/11] selftests/bpf: Extend xdp_metadata with devtx kfuncs Stanislav Fomichev
2023-06-23 11:12 ` Jesper D. Brouer
2023-06-23 17:40 ` Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 10/11] selftests/bpf: Extend xdp_hw_metadata " Stanislav Fomichev
2023-06-21 17:02 ` [RFC bpf-next v2 11/11] net/mlx5e: Support TX timestamp metadata Stanislav Fomichev
2023-06-22 19:57 ` Alexei Starovoitov
2023-06-22 20:13 ` Stanislav Fomichev
2023-06-22 21:47 ` Alexei Starovoitov
2023-06-22 22:13 ` Stanislav Fomichev
2023-06-23 2:35 ` Alexei Starovoitov
2023-06-23 10:16 ` Maryam Tahhan
2023-06-23 16:32 ` Alexei Starovoitov
2023-06-23 17:47 ` Maryam Tahhan
2023-06-23 17:24 ` Stanislav Fomichev
2023-06-23 18:57 ` Donald Hunter
2023-06-24 0:25 ` John Fastabend
2023-06-24 2:52 ` Alexei Starovoitov
2023-06-24 21:38 ` Jakub Kicinski
2023-06-25 1:12 ` Stanislav Fomichev
2023-06-26 21:36 ` Stanislav Fomichev
2023-06-26 22:37 ` Alexei Starovoitov
2023-06-26 23:29 ` Stanislav Fomichev
2023-06-27 13:35 ` Toke Høiland-Jørgensen
2023-06-27 21:43 ` John Fastabend
2023-06-27 22:56 ` Stanislav Fomichev
2023-06-27 23:33 ` John Fastabend
2023-06-27 23:50 ` Alexei Starovoitov
2023-06-28 18:52 ` Jakub Kicinski
2023-06-29 11:43 ` Toke Høiland-Jørgensen
2023-06-30 18:54 ` Stanislav Fomichev
2023-07-01 0:52 ` John Fastabend
2023-07-01 3:11 ` Jakub Kicinski
2023-07-03 18:30 ` John Fastabend
2023-07-03 19:33 ` Jakub Kicinski
2023-06-22 8:41 ` [RFC bpf-next v2 00/11] bpf: Netdev TX metadata Jesper Dangaard Brouer
2023-06-22 17:55 ` Stanislav Fomichev
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=20230621170244.1283336-6-sdf@google.com \
--to=sdf@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=song@kernel.org \
--cc=yhs@fb.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