From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by mail.toke.dk (Postfix) with ESMTPS id 3F7CFA17DC5 for ; Fri, 7 Jul 2023 21:30:19 +0200 (CEST) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20221208 header.b=OKXQqOly Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1b8130aceefso30344445ad.2 for ; Fri, 07 Jul 2023 12:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688758217; x=1691350217; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tiu69YMe2M+wf4vbIlXmUvKcMNINiQeYanMmI5AOt4s=; b=OKXQqOlyynsQJhOyVPnqD/bFpdqEp8ugLvHEc91O6ItK+f44sM9EakNc+gyOsRdBdT 0NlYKejJBNAQFcJ+3jJOGjNNUKgn8H9JtJwjkPA2QNutCsXMluQnmgCa3bV0KZfxw6Vg bFd3vnOOLWuppe3JjeVOKY0/SOkAgzZxsw56e9Un1DlD/kxRzWHg/agVHydxWXCgi+9A 0gF2UUZWdBSoWx4EtTUWfL72YKNA51KpZLV9A7H69Qw0V53Jzy0ymOnFouLd/HiW00f/ edJUrC2/DJAq5i8N4SM2rLm/h+ZyHk+MjBNISIUsOs0YDBWYWfKFzHQp9tMgHDd5DHdR 7g6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688758217; x=1691350217; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tiu69YMe2M+wf4vbIlXmUvKcMNINiQeYanMmI5AOt4s=; b=D3Ct440xpr7Kw0jkryf4S1siZhTiefFDvX6JSH6GzNuc61lZkuXAUB5ksfTIY8n3y1 JtXZpcQD2+Cwl8FTQvWiNsp7cWWuG32lZLDWGB3gmytzmceYahrZ+nLCUoZ9mJgeHiLp 0m/4jnHD0J7BCJEjyZbj74+WSARE9KrXIJLU/GIlj/phDT9rAYHS+fSzd0DL4ypHoN1n yCzz31eCJoLUOKoZZs3cmMcnjZxZfqiLtssz9Ttl3yhwggNzEzXsOgYDwKryp2SY4yQ+ 6MWCcJzHVeCsNNt1jLF1hYgzxnJdZQsQ+GAj0Lufi/EFlLVLf6imu8kITT7nM7V3RYo3 hs5A== X-Gm-Message-State: ABy/qLa0vRj518I+B0e8VjHJ5mZ6IAPCJ2x7XmBqMLWAbEaX2dG9SLSq e+c1NMPZKL+RgIC5rW34FjJjCM8= X-Google-Smtp-Source: APBJJlFH2HMTcWpgEIHGrf9Hp7SUBEchBVje2Sf7hJhOlQ2k/NwoH55R1nb2gSXRyhWVvGmBVY/BNx4= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a17:902:7c8a:b0:1b8:246f:de22 with SMTP id y10-20020a1709027c8a00b001b8246fde22mr5260849pll.8.1688758217456; Fri, 07 Jul 2023 12:30:17 -0700 (PDT) Date: Fri, 7 Jul 2023 12:29:57 -0700 In-Reply-To: <20230707193006.1309662-1-sdf@google.com> Mime-Version: 1.0 References: <20230707193006.1309662-1-sdf@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230707193006.1309662-6-sdf@google.com> From: Stanislav Fomichev To: bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID-Hash: YP3MBJ3B3CVSMJ4QBOAI5IBJGATOT6II X-Message-ID-Hash: YP3MBJ3B3CVSMJ4QBOAI5IBJGATOT6II X-MailFrom: 3yWeoZAMKCWYWHJKSSKPI.GSQbHT-LMRXWbHT-TVSNIGX.RIX@flex--sdf.bounces.google.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header 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, kuba@kernel.org, toke@kernel.org, willemb@google.com, dsahern@kernel.org, magnus.karlsson@intel.com, bjorn@kernel.org, maciej.fijalkowski@intel.com, hawk@kernel.org, netdev@vger.kernel.org, xdp-hints@xdp-project.net X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] [RFC bpf-next v3 05/14] bpf: Implement devtx timestamp kfunc List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 Signed-off-by: Stanislav Fomichev --- include/linux/netdevice.h | 4 +++ include/net/offload.h | 12 +++++++ kernel/bpf/offload.c | 6 ++++ net/core/devtx.c | 73 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b828c7a75be2..5be6649ea3fa 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1654,10 +1654,14 @@ struct net_device_ops { bool cycles); }; +struct devtx_ctx; + 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_request_tx_timestamp)(const struct devtx_ctx *ctx); + int (*xmo_tx_timestamp)(const struct devtx_ctx *ctx, u64 *timestamp); }; /** diff --git a/include/net/offload.h b/include/net/offload.h index de0fac38a95b..7e2c19c5aaef 100644 --- a/include/net/offload.h +++ b/include/net/offload.h @@ -12,9 +12,21 @@ bpf_xdp_metadata_rx_hash, \ xmo_rx_hash) +#define DEVTX_SUBMIT_KFUNC_xxx \ + NETDEV_METADATA_KFUNC(DEVTX_KFUNC_REQUEST_TX_TIMESTAMP, \ + bpf_devtx_request_tx_timestamp, \ + xmo_request_tx_timestamp) + +#define DEVTX_COMPLETE_KFUNC_xxx \ + NETDEV_METADATA_KFUNC(DEVTX_KFUNC_TX_TIMESTAMP, \ + bpf_devtx_tx_timestamp, \ + xmo_tx_timestamp) + enum { #define NETDEV_METADATA_KFUNC(name, _, __) name, XDP_METADATA_KFUNC_xxx +DEVTX_SUBMIT_KFUNC_xxx +DEVTX_COMPLETE_KFUNC_xxx #undef NETDEV_METADATA_KFUNC MAX_NETDEV_METADATA_KFUNC, }; diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index a4423803b3dd..fe793387c972 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -862,6 +862,8 @@ void *bpf_dev_bound_resolve_kfunc(struct bpf_prog *prog, u32 func_id) #define NETDEV_METADATA_KFUNC(name, _, xmo) \ if (func_id == bpf_dev_bound_kfunc_id(name)) p = ops->xmo; XDP_METADATA_KFUNC_xxx + DEVTX_SUBMIT_KFUNC_xxx + DEVTX_COMPLETE_KFUNC_xxx #undef NETDEV_METADATA_KFUNC out: @@ -873,12 +875,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_SUBMIT_KFUNC_xxx +DEVTX_COMPLETE_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_SUBMIT_KFUNC_xxx +DEVTX_COMPLETE_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 6ae1aecce2c5..991a52fe81a3 100644 --- a/net/core/devtx.c +++ b/net/core/devtx.c @@ -76,3 +76,76 @@ void devtx_hooks_unregister(struct btf_id_set8 *set) mutex_unlock(&devtx_hooks_lock); } EXPORT_SYMBOL_GPL(devtx_hooks_unregister); + +__diag_push(); +__diag_ignore_all("-Wmissing-prototypes", + "Global functions as their definitions will be in vmlinux BTF"); + +/** + * bpf_devtx_request_tx_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_request_tx_timestamp(const struct devtx_ctx *ctx) +{ + return -EOPNOTSUPP; +} + +/** + * bpf_devtx_tx_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_tx_timestamp(const struct devtx_ctx *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_SUBMIT_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_COMPLETE_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.255.g8b1d071c50-goog