Skip to content

Commit 940656f

Browse files
borkmannborkmann
committed
Merge branch 'bpf-big-map-entries'
Jakub Kicinski says: ==================== This series makes the control message parsing for interacting with BPF maps more flexible. Up until now we had a hard limit in the ABI for key and value size to be 64B at most. Using TLV capability allows us to support large map entries. ==================== Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2 parents cb86d0f + 0c9864c commit 940656f

File tree

7 files changed

+142
-22
lines changed

7 files changed

+142
-22
lines changed

‎drivers/net/ethernet/netronome/nfp/bpf/cmsg.c

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,32 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size)
8989
return skb;
9090
}
9191

92+
static unsigned int
93+
nfp_bpf_cmsg_map_req_size(struct nfp_app_bpf *bpf, unsigned int n)
94+
{
95+
unsigned int size;
96+
97+
size = sizeof(struct cmsg_req_map_op);
98+
size += (bpf->cmsg_key_sz + bpf->cmsg_val_sz) * n;
99+
100+
return size;
101+
}
102+
92103
static struct sk_buff *
93104
nfp_bpf_cmsg_map_req_alloc(struct nfp_app_bpf *bpf, unsigned int n)
105+
{
106+
return nfp_bpf_cmsg_alloc(bpf, nfp_bpf_cmsg_map_req_size(bpf, n));
107+
}
108+
109+
static unsigned int
110+
nfp_bpf_cmsg_map_reply_size(struct nfp_app_bpf *bpf, unsigned int n)
94111
{
95112
unsigned int size;
96113

97-
size = sizeof(struct cmsg_req_map_op);
98-
size += sizeof(struct cmsg_key_value_pair) * n;
114+
size = sizeof(struct cmsg_reply_map_op);
115+
size += (bpf->cmsg_key_sz + bpf->cmsg_val_sz) * n;
99116

100-
return nfp_bpf_cmsg_alloc(bpf, size);
117+
return size;
101118
}
102119

103120
static u8 nfp_bpf_cmsg_get_type(struct sk_buff *skb)
@@ -338,6 +355,34 @@ void nfp_bpf_ctrl_free_map(struct nfp_app_bpf *bpf, struct nfp_bpf_map *nfp_map)
338355
dev_consume_skb_any(skb);
339356
}
340357

358+
static void *
359+
nfp_bpf_ctrl_req_key(struct nfp_app_bpf *bpf, struct cmsg_req_map_op *req,
360+
unsigned int n)
361+
{
362+
return &req->data[bpf->cmsg_key_sz * n + bpf->cmsg_val_sz * n];
363+
}
364+
365+
static void *
366+
nfp_bpf_ctrl_req_val(struct nfp_app_bpf *bpf, struct cmsg_req_map_op *req,
367+
unsigned int n)
368+
{
369+
return &req->data[bpf->cmsg_key_sz * (n + 1) + bpf->cmsg_val_sz * n];
370+
}
371+
372+
static void *
373+
nfp_bpf_ctrl_reply_key(struct nfp_app_bpf *bpf, struct cmsg_reply_map_op *reply,
374+
unsigned int n)
375+
{
376+
return &reply->data[bpf->cmsg_key_sz * n + bpf->cmsg_val_sz * n];
377+
}
378+
379+
static void *
380+
nfp_bpf_ctrl_reply_val(struct nfp_app_bpf *bpf, struct cmsg_reply_map_op *reply,
381+
unsigned int n)
382+
{
383+
return &reply->data[bpf->cmsg_key_sz * (n + 1) + bpf->cmsg_val_sz * n];
384+
}
385+
341386
static int
342387
nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap,
343388
enum nfp_bpf_cmsg_type op,
@@ -366,12 +411,13 @@ nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap,
366411

367412
/* Copy inputs */
368413
if (key)
369-
memcpy(&req->elem[0].key, key, map->key_size);
414+
memcpy(nfp_bpf_ctrl_req_key(bpf, req, 0), key, map->key_size);
370415
if (value)
371-
memcpy(&req->elem[0].value, value, map->value_size);
416+
memcpy(nfp_bpf_ctrl_req_val(bpf, req, 0), value,
417+
map->value_size);
372418

373419
skb = nfp_bpf_cmsg_communicate(bpf, skb, op,
374-
sizeof(*reply) + sizeof(*reply->elem));
420+
nfp_bpf_cmsg_map_reply_size(bpf, 1));
375421
if (IS_ERR(skb))
376422
return PTR_ERR(skb);
377423

@@ -382,9 +428,11 @@ nfp_bpf_ctrl_entry_op(struct bpf_offloaded_map *offmap,
382428

383429
/* Copy outputs */
384430
if (out_key)
385-
memcpy(out_key, &reply->elem[0].key, map->key_size);
431+
memcpy(out_key, nfp_bpf_ctrl_reply_key(bpf, reply, 0),
432+
map->key_size);
386433
if (out_value)
387-
memcpy(out_value, &reply->elem[0].value, map->value_size);
434+
memcpy(out_value, nfp_bpf_ctrl_reply_val(bpf, reply, 0),
435+
map->value_size);
388436

389437
dev_consume_skb_any(skb);
390438

@@ -428,6 +476,13 @@ int nfp_bpf_ctrl_getnext_entry(struct bpf_offloaded_map *offmap,
428476
key, NULL, 0, next_key, NULL);
429477
}
430478

479+
unsigned int nfp_bpf_ctrl_cmsg_mtu(struct nfp_app_bpf *bpf)
480+
{
481+
return max3((unsigned int)NFP_NET_DEFAULT_MTU,
482+
nfp_bpf_cmsg_map_req_size(bpf, 1),
483+
nfp_bpf_cmsg_map_reply_size(bpf, 1));
484+
}
485+
431486
void nfp_bpf_ctrl_msg_rx(struct nfp_app *app, struct sk_buff *skb)
432487
{
433488
struct nfp_app_bpf *bpf = app->priv;

‎drivers/net/ethernet/netronome/nfp/bpf/fw.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ enum bpf_cap_tlv_type {
5252
NFP_BPF_CAP_TYPE_RANDOM = 4,
5353
NFP_BPF_CAP_TYPE_QUEUE_SELECT = 5,
5454
NFP_BPF_CAP_TYPE_ADJUST_TAIL = 6,
55+
NFP_BPF_CAP_TYPE_ABI_VERSION = 7,
5556
};
5657

5758
struct nfp_bpf_cap_tlv_func {
@@ -98,6 +99,7 @@ enum nfp_bpf_cmsg_type {
9899
#define CMSG_TYPE_MAP_REPLY_BIT 7
99100
#define __CMSG_REPLY(req) (BIT(CMSG_TYPE_MAP_REPLY_BIT) | (req))
100101

102+
/* BPF ABIv2 fixed-length control message fields */
101103
#define CMSG_MAP_KEY_LW 16
102104
#define CMSG_MAP_VALUE_LW 16
103105

@@ -147,24 +149,19 @@ struct cmsg_reply_map_free_tbl {
147149
__be32 count;
148150
};
149151

150-
struct cmsg_key_value_pair {
151-
__be32 key[CMSG_MAP_KEY_LW];
152-
__be32 value[CMSG_MAP_VALUE_LW];
153-
};
154-
155152
struct cmsg_req_map_op {
156153
struct cmsg_hdr hdr;
157154
__be32 tid;
158155
__be32 count;
159156
__be32 flags;
160-
struct cmsg_key_value_pair elem[0];
157+
u8 data[0];
161158
};
162159

163160
struct cmsg_reply_map_op {
164161
struct cmsg_reply_map_simple reply_hdr;
165162
__be32 count;
166163
__be32 resv;
167-
struct cmsg_key_value_pair elem[0];
164+
u8 data[0];
168165
};
169166

170167
struct cmsg_bpf_event {

‎drivers/net/ethernet/netronome/nfp/bpf/main.c

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ const struct rhashtable_params nfp_bpf_maps_neutral_params = {
5454
static bool nfp_net_ebpf_capable(struct nfp_net *nn)
5555
{
5656
#ifdef __LITTLE_ENDIAN
57-
if (nn->cap & NFP_NET_CFG_CTRL_BPF &&
58-
nn_readb(nn, NFP_NET_CFG_BPF_ABI) == NFP_NET_BPF_ABI)
59-
return true;
60-
#endif
57+
struct nfp_app_bpf *bpf = nn->app->priv;
58+
59+
return nn->cap & NFP_NET_CFG_CTRL_BPF &&
60+
bpf->abi_version &&
61+
nn_readb(nn, NFP_NET_CFG_BPF_ABI) == bpf->abi_version;
62+
#else
6163
return false;
64+
#endif
6265
}
6366

6467
static int
@@ -342,6 +345,26 @@ nfp_bpf_parse_cap_adjust_tail(struct nfp_app_bpf *bpf, void __iomem *value,
342345
return 0;
343346
}
344347

348+
static int
349+
nfp_bpf_parse_cap_abi_version(struct nfp_app_bpf *bpf, void __iomem *value,
350+
u32 length)
351+
{
352+
if (length < 4) {
353+
nfp_err(bpf->app->cpp, "truncated ABI version TLV: %d\n",
354+
length);
355+
return -EINVAL;
356+
}
357+
358+
bpf->abi_version = readl(value);
359+
if (bpf->abi_version < 2 || bpf->abi_version > 3) {
360+
nfp_warn(bpf->app->cpp, "unsupported BPF ABI version: %d\n",
361+
bpf->abi_version);
362+
bpf->abi_version = 0;
363+
}
364+
365+
return 0;
366+
}
367+
345368
static int nfp_bpf_parse_capabilities(struct nfp_app *app)
346369
{
347370
struct nfp_cpp *cpp = app->pf->cpp;
@@ -393,6 +416,11 @@ static int nfp_bpf_parse_capabilities(struct nfp_app *app)
393416
length))
394417
goto err_release_free;
395418
break;
419+
case NFP_BPF_CAP_TYPE_ABI_VERSION:
420+
if (nfp_bpf_parse_cap_abi_version(app->priv, value,
421+
length))
422+
goto err_release_free;
423+
break;
396424
default:
397425
nfp_dbg(cpp, "unknown BPF capability: %d\n", type);
398426
break;
@@ -414,6 +442,11 @@ static int nfp_bpf_parse_capabilities(struct nfp_app *app)
414442
return -EINVAL;
415443
}
416444

445+
static void nfp_bpf_init_capabilities(struct nfp_app_bpf *bpf)
446+
{
447+
bpf->abi_version = 2; /* Original BPF ABI version */
448+
}
449+
417450
static int nfp_bpf_ndo_init(struct nfp_app *app, struct net_device *netdev)
418451
{
419452
struct nfp_app_bpf *bpf = app->priv;
@@ -447,10 +480,21 @@ static int nfp_bpf_init(struct nfp_app *app)
447480
if (err)
448481
goto err_free_bpf;
449482

483+
nfp_bpf_init_capabilities(bpf);
484+
450485
err = nfp_bpf_parse_capabilities(app);
451486
if (err)
452487
goto err_free_neutral_maps;
453488

489+
if (bpf->abi_version < 3) {
490+
bpf->cmsg_key_sz = CMSG_MAP_KEY_LW * 4;
491+
bpf->cmsg_val_sz = CMSG_MAP_VALUE_LW * 4;
492+
} else {
493+
bpf->cmsg_key_sz = bpf->maps.max_key_sz;
494+
bpf->cmsg_val_sz = bpf->maps.max_val_sz;
495+
app->ctrl_mtu = nfp_bpf_ctrl_cmsg_mtu(bpf);
496+
}
497+
454498
bpf->bpf_dev = bpf_offload_dev_create();
455499
err = PTR_ERR_OR_ZERO(bpf->bpf_dev);
456500
if (err)

‎drivers/net/ethernet/netronome/nfp/bpf/main.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,17 @@ enum pkt_vec {
121121
* @cmsg_replies: received cmsg replies waiting to be consumed
122122
* @cmsg_wq: work queue for waiting for cmsg replies
123123
*
124+
* @cmsg_key_sz: size of key in cmsg element array
125+
* @cmsg_val_sz: size of value in cmsg element array
126+
*
124127
* @map_list: list of offloaded maps
125128
* @maps_in_use: number of currently offloaded maps
126129
* @map_elems_in_use: number of elements allocated to offloaded maps
127130
*
128131
* @maps_neutral: hash table of offload-neutral maps (on pointer)
129132
*
133+
* @abi_version: global BPF ABI version
134+
*
130135
* @adjust_head: adjust head capability
131136
* @adjust_head.flags: extra flags for adjust head
132137
* @adjust_head.off_min: minimal packet offset within buffer required
@@ -164,12 +169,17 @@ struct nfp_app_bpf {
164169
struct sk_buff_head cmsg_replies;
165170
struct wait_queue_head cmsg_wq;
166171

172+
unsigned int cmsg_key_sz;
173+
unsigned int cmsg_val_sz;
174+
167175
struct list_head map_list;
168176
unsigned int maps_in_use;
169177
unsigned int map_elems_in_use;
170178

171179
struct rhashtable maps_neutral;
172180

181+
u32 abi_version;
182+
173183
struct nfp_bpf_cap_adjust_head {
174184
u32 flags;
175185
int off_min;
@@ -492,6 +502,7 @@ nfp_bpf_goto_meta(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
492502

493503
void *nfp_bpf_relo_for_vnic(struct nfp_prog *nfp_prog, struct nfp_bpf_vnic *bv);
494504

505+
unsigned int nfp_bpf_ctrl_cmsg_mtu(struct nfp_app_bpf *bpf);
495506
long long int
496507
nfp_bpf_ctrl_alloc_map(struct nfp_app_bpf *bpf, struct bpf_map *map);
497508
void

‎drivers/net/ethernet/netronome/nfp/nfp_app.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040

4141
#include "nfp_net_repr.h"
4242

43+
#define NFP_APP_CTRL_MTU_MAX U32_MAX
44+
4345
struct bpf_prog;
4446
struct net_device;
4547
struct netdev_bpf;
@@ -178,6 +180,7 @@ struct nfp_app_type {
178180
* @ctrl: pointer to ctrl vNIC struct
179181
* @reprs: array of pointers to representors
180182
* @type: pointer to const application ops and info
183+
* @ctrl_mtu: MTU to set on the control vNIC (set in .init())
181184
* @priv: app-specific priv data
182185
*/
183186
struct nfp_app {
@@ -189,6 +192,7 @@ struct nfp_app {
189192
struct nfp_reprs __rcu *reprs[NFP_REPR_TYPE_MAX + 1];
190193

191194
const struct nfp_app_type *type;
195+
unsigned int ctrl_mtu;
192196
void *priv;
193197
};
194198

‎drivers/net/ethernet/netronome/nfp/nfp_net_common.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,10 +3877,20 @@ int nfp_net_init(struct nfp_net *nn)
38773877
return err;
38783878

38793879
/* Set default MTU and Freelist buffer size */
3880-
if (nn->max_mtu < NFP_NET_DEFAULT_MTU)
3880+
if (!nfp_net_is_data_vnic(nn) && nn->app->ctrl_mtu) {
3881+
if (nn->app->ctrl_mtu <= nn->max_mtu) {
3882+
nn->dp.mtu = nn->app->ctrl_mtu;
3883+
} else {
3884+
if (nn->app->ctrl_mtu != NFP_APP_CTRL_MTU_MAX)
3885+
nn_warn(nn, "app requested MTU above max supported %u > %u\n",
3886+
nn->app->ctrl_mtu, nn->max_mtu);
3887+
nn->dp.mtu = nn->max_mtu;
3888+
}
3889+
} else if (nn->max_mtu < NFP_NET_DEFAULT_MTU) {
38813890
nn->dp.mtu = nn->max_mtu;
3882-
else
3891+
} else {
38833892
nn->dp.mtu = NFP_NET_DEFAULT_MTU;
3893+
}
38843894
nn->dp.fl_bufsz = nfp_net_calc_fl_bufsz(&nn->dp);
38853895

38863896
if (nfp_app_ctrl_uses_data_vnics(nn->app))

‎drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@
264264
* %NFP_NET_CFG_BPF_ADDR: DMA address of the buffer with JITed BPF code
265265
*/
266266
#define NFP_NET_CFG_BPF_ABI 0x0080
267-
#define NFP_NET_BPF_ABI 2
268267
#define NFP_NET_CFG_BPF_CAP 0x0081
269268
#define NFP_NET_BPF_CAP_RELO (1 << 0) /* seamless reload */
270269
#define NFP_NET_CFG_BPF_MAX_LEN 0x0082

0 commit comments

Comments
 (0)