From: Larysa Zaremba <larysa.zaremba@intel.com>
To: bpf@vger.kernel.org
Cc: Larysa Zaremba <larysa.zaremba@intel.com>,
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,
David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Jesper Dangaard Brouer <hawk@kernel.org>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Alexander Lobakin <alexandr.lobakin@intel.com>,
Magnus Karlsson <magnus.karlsson@gmail.com>,
Maryam Tahhan <mtahhan@redhat.com>,
xdp-hints@xdp-project.net, netdev@vger.kernel.org,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Tariq Toukan <tariqt@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Subject: [xdp-hints] [PATCH bpf-next v8 07/18] xsk: add functions to fill control buffer
Date: Tue, 5 Dec 2023 22:08:36 +0100 [thread overview]
Message-ID: <20231205210847.28460-8-larysa.zaremba@intel.com> (raw)
In-Reply-To: <20231205210847.28460-1-larysa.zaremba@intel.com>
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Commit 94ecc5ca4dbf ("xsk: Add cb area to struct xdp_buff_xsk") has added
a buffer for custom data to xdp_buff_xsk. Particularly, this memory is used
for data, consumed by XDP hints kfuncs. It does not always change on
a per-packet basis and some parts can be set for example, at the same time
as RX queue info.
Add functions to fill all cbs in xsk_buff_pool with the same metadata.
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
---
include/net/xdp_sock_drv.h | 17 +++++++++++++++++
include/net/xsk_buff_pool.h | 2 ++
net/xdp/xsk_buff_pool.c | 12 ++++++++++++
3 files changed, 31 insertions(+)
diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
index 81e02de3f453..b62bb8525a5f 100644
--- a/include/net/xdp_sock_drv.h
+++ b/include/net/xdp_sock_drv.h
@@ -14,6 +14,12 @@
#ifdef CONFIG_XDP_SOCKETS
+struct xsk_cb_desc {
+ void *src;
+ u8 off;
+ u8 bytes;
+};
+
void xsk_tx_completed(struct xsk_buff_pool *pool, u32 nb_entries);
bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc);
u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, u32 max);
@@ -47,6 +53,12 @@ static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,
xp_set_rxq_info(pool, rxq);
}
+static inline void xsk_pool_fill_cb(struct xsk_buff_pool *pool,
+ struct xsk_cb_desc *desc)
+{
+ xp_fill_cb(pool, desc);
+}
+
static inline unsigned int xsk_pool_get_napi_id(struct xsk_buff_pool *pool)
{
#ifdef CONFIG_NET_RX_BUSY_POLL
@@ -274,6 +286,11 @@ static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,
{
}
+static inline void xsk_pool_fill_cb(struct xsk_buff_pool *pool,
+ struct xsk_cb_desc *desc)
+{
+}
+
static inline unsigned int xsk_pool_get_napi_id(struct xsk_buff_pool *pool)
{
return 0;
diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h
index 8d48d37ab7c0..99dd7376df6a 100644
--- a/include/net/xsk_buff_pool.h
+++ b/include/net/xsk_buff_pool.h
@@ -12,6 +12,7 @@
struct xsk_buff_pool;
struct xdp_rxq_info;
+struct xsk_cb_desc;
struct xsk_queue;
struct xdp_desc;
struct xdp_umem;
@@ -135,6 +136,7 @@ static inline void xp_init_xskb_dma(struct xdp_buff_xsk *xskb, struct xsk_buff_p
/* AF_XDP ZC drivers, via xdp_sock_buff.h */
void xp_set_rxq_info(struct xsk_buff_pool *pool, struct xdp_rxq_info *rxq);
+void xp_fill_cb(struct xsk_buff_pool *pool, struct xsk_cb_desc *desc);
int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev,
unsigned long attrs, struct page **pages, u32 nr_pages);
void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs);
diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index 4f6f538a5462..28711cc44ced 100644
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -125,6 +125,18 @@ void xp_set_rxq_info(struct xsk_buff_pool *pool, struct xdp_rxq_info *rxq)
}
EXPORT_SYMBOL(xp_set_rxq_info);
+void xp_fill_cb(struct xsk_buff_pool *pool, struct xsk_cb_desc *desc)
+{
+ u32 i;
+
+ for (i = 0; i < pool->heads_cnt; i++) {
+ struct xdp_buff_xsk *xskb = &pool->heads[i];
+
+ memcpy(xskb->cb + desc->off, desc->src, desc->bytes);
+ }
+}
+EXPORT_SYMBOL(xp_fill_cb);
+
static void xp_disable_drv_zc(struct xsk_buff_pool *pool)
{
struct netdev_bpf bpf;
--
2.41.0
next prev parent reply other threads:[~2023-12-05 21:11 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 21:08 [xdp-hints] [PATCH bpf-next v8 00/18] XDP metadata via kfuncs for ice + VLAN hint Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 01/18] ice: make RX hash reading code more reusable Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 02/18] ice: make RX HW timestamp " Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 03/18] ice: Make ptype internal to descriptor info processing Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 04/18] ice: Introduce ice_xdp_buff Larysa Zaremba
2023-12-12 13:07 ` [xdp-hints] " Maciej Fijalkowski
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 05/18] ice: Support HW timestamp hint Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 06/18] ice: Support RX hash XDP hint Larysa Zaremba
2023-12-05 21:08 ` Larysa Zaremba [this message]
2023-12-12 13:51 ` [xdp-hints] Re: [PATCH bpf-next v8 07/18] xsk: add functions to fill control buffer Magnus Karlsson
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 08/18] ice: Support XDP hints in AF_XDP ZC mode Larysa Zaremba
2023-12-12 13:20 ` [xdp-hints] " Maciej Fijalkowski
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 09/18] xdp: Add VLAN tag hint Larysa Zaremba
2023-12-06 8:25 ` [xdp-hints] " Jesper Dangaard Brouer
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 10/18] ice: Implement " Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 11/18] ice: use VLAN proto from ring packet context in skb path Larysa Zaremba
2023-12-12 13:26 ` [xdp-hints] " Maciej Fijalkowski
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 12/18] veth: Implement VLAN tag XDP hint Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 13/18] net: make vlan_get_tag() return -ENODATA instead of -EINVAL Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 14/18] mlx5: implement VLAN tag XDP hint Larysa Zaremba
2023-12-06 8:52 ` [xdp-hints] " Jesper Dangaard Brouer
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 15/18] selftests/bpf: Allow VLAN packets in xdp_hw_metadata Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 16/18] selftests/bpf: Add flags and VLAN hint to xdp_hw_metadata Larysa Zaremba
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 17/18] selftests/bpf: Add AF_INET packet generation to xdp_metadata Larysa Zaremba
2023-12-05 22:59 ` [xdp-hints] " Stanislav Fomichev
2023-12-05 21:08 ` [xdp-hints] [PATCH bpf-next v8 18/18] selftests/bpf: Check VLAN tag and proto in xdp_metadata Larysa Zaremba
2023-12-14 0:30 ` [xdp-hints] Re: [PATCH bpf-next v8 00/18] XDP metadata via kfuncs for ice + VLAN hint patchwork-bot+netdevbpf
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
List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205210847.28460-8-larysa.zaremba@intel.com \
--to=larysa.zaremba@intel.com \
--cc=alexandr.lobakin@intel.com \
--cc=alexei.starovoitov@gmail.com \
--cc=anatoly.burakov@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@gmail.com \
--cc=martin.lau@linux.dev \
--cc=mtahhan@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=tariqt@mellanox.com \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
--cc=xdp-hints@xdp-project.net \
--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