Skip to content

Commit fc56be4

Browse files
jpirkodavem330
jpirko
authored and
davem330
committed
devlink: convert occ_get op to separate registration
This resolves race during initialization where the resources with ops are registered before driver and the structures used by occ_get op is initialized. So keep occ_get callbacks registered only when all structs are initialized. The example flows, as it is in mlxsw: 1) driver load/asic probe: mlxsw_core -> mlxsw_sp_resources_register -> mlxsw_sp_kvdl_resources_register -> devlink_resource_register IDX mlxsw_spectrum -> mlxsw_sp_kvdl_init -> mlxsw_sp_kvdl_parts_init -> mlxsw_sp_kvdl_part_init -> devlink_resource_size_get IDX (to get the current setup size from devlink) -> devlink_resource_occ_get_register IDX (register current occupancy getter) 2) reload triggered by devlink command: -> mlxsw_devlink_core_bus_device_reload -> mlxsw_sp_fini -> mlxsw_sp_kvdl_fini -> devlink_resource_occ_get_unregister IDX (struct mlxsw_sp *mlxsw_sp is freed at this point, call to occ get which is using mlxsw_sp would cause use-after free) -> mlxsw_sp_init -> mlxsw_sp_kvdl_init -> mlxsw_sp_kvdl_parts_init -> mlxsw_sp_kvdl_part_init -> devlink_resource_size_get IDX (to get the current setup size from devlink) -> devlink_resource_occ_get_register IDX (register current occupancy getter) Fixes: d9f9b9a ("devlink: Add support for resource abstraction") Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5571196 commit fc56be4

File tree

6 files changed

+165
-106
lines changed

6 files changed

+165
-106
lines changed

‎drivers/net/ethernet/mellanox/mlxsw/spectrum.c‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3805,18 +3805,6 @@ static const struct mlxsw_config_profile mlxsw_sp_config_profile = {
38053805
},
38063806
};
38073807

3808-
static u64 mlxsw_sp_resource_kvd_linear_occ_get(struct devlink *devlink)
3809-
{
3810-
struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
3811-
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
3812-
3813-
return mlxsw_sp_kvdl_occ_get(mlxsw_sp);
3814-
}
3815-
3816-
static const struct devlink_resource_ops mlxsw_sp_resource_kvd_linear_ops = {
3817-
.occ_get = mlxsw_sp_resource_kvd_linear_occ_get,
3818-
};
3819-
38203808
static void
38213809
mlxsw_sp_resource_size_params_prepare(struct mlxsw_core *mlxsw_core,
38223810
struct devlink_resource_size_params *kvd_size_params,
@@ -3877,8 +3865,7 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core)
38773865
err = devlink_resource_register(devlink, MLXSW_SP_RESOURCE_NAME_KVD,
38783866
kvd_size, MLXSW_SP_RESOURCE_KVD,
38793867
DEVLINK_RESOURCE_ID_PARENT_TOP,
3880-
&kvd_size_params,
3881-
NULL);
3868+
&kvd_size_params);
38823869
if (err)
38833870
return err;
38843871

@@ -3887,8 +3874,7 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core)
38873874
linear_size,
38883875
MLXSW_SP_RESOURCE_KVD_LINEAR,
38893876
MLXSW_SP_RESOURCE_KVD,
3890-
&linear_size_params,
3891-
&mlxsw_sp_resource_kvd_linear_ops);
3877+
&linear_size_params);
38923878
if (err)
38933879
return err;
38943880

@@ -3905,8 +3891,7 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core)
39053891
double_size,
39063892
MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,
39073893
MLXSW_SP_RESOURCE_KVD,
3908-
&hash_double_size_params,
3909-
NULL);
3894+
&hash_double_size_params);
39103895
if (err)
39113896
return err;
39123897

@@ -3915,8 +3900,7 @@ static int mlxsw_sp_resources_register(struct mlxsw_core *mlxsw_core)
39153900
single_size,
39163901
MLXSW_SP_RESOURCE_KVD_HASH_SINGLE,
39173902
MLXSW_SP_RESOURCE_KVD,
3918-
&hash_single_size_params,
3919-
NULL);
3903+
&hash_single_size_params);
39203904
if (err)
39213905
return err;
39223906

‎drivers/net/ethernet/mellanox/mlxsw/spectrum.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp, int entry_index);
442442
int mlxsw_sp_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp,
443443
unsigned int entry_count,
444444
unsigned int *p_alloc_size);
445-
u64 mlxsw_sp_kvdl_occ_get(const struct mlxsw_sp *mlxsw_sp);
446445
int mlxsw_sp_kvdl_resources_register(struct mlxsw_core *mlxsw_core);
447446

448447
struct mlxsw_sp_acl_rule_info {

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,9 @@ static u64 mlxsw_sp_kvdl_part_occ(struct mlxsw_sp_kvdl_part *part)
315315
return occ;
316316
}
317317

318-
u64 mlxsw_sp_kvdl_occ_get(const struct mlxsw_sp *mlxsw_sp)
318+
static u64 mlxsw_sp_kvdl_occ_get(void *priv)
319319
{
320+
const struct mlxsw_sp *mlxsw_sp = priv;
320321
u64 occ = 0;
321322
int i;
322323

@@ -326,48 +327,33 @@ u64 mlxsw_sp_kvdl_occ_get(const struct mlxsw_sp *mlxsw_sp)
326327
return occ;
327328
}
328329

329-
static u64 mlxsw_sp_kvdl_single_occ_get(struct devlink *devlink)
330+
static u64 mlxsw_sp_kvdl_single_occ_get(void *priv)
330331
{
331-
struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
332-
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
332+
const struct mlxsw_sp *mlxsw_sp = priv;
333333
struct mlxsw_sp_kvdl_part *part;
334334

335335
part = mlxsw_sp->kvdl->parts[MLXSW_SP_KVDL_PART_ID_SINGLE];
336336
return mlxsw_sp_kvdl_part_occ(part);
337337
}
338338

339-
static u64 mlxsw_sp_kvdl_chunks_occ_get(struct devlink *devlink)
339+
static u64 mlxsw_sp_kvdl_chunks_occ_get(void *priv)
340340
{
341-
struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
342-
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
341+
const struct mlxsw_sp *mlxsw_sp = priv;
343342
struct mlxsw_sp_kvdl_part *part;
344343

345344
part = mlxsw_sp->kvdl->parts[MLXSW_SP_KVDL_PART_ID_CHUNKS];
346345
return mlxsw_sp_kvdl_part_occ(part);
347346
}
348347

349-
static u64 mlxsw_sp_kvdl_large_chunks_occ_get(struct devlink *devlink)
348+
static u64 mlxsw_sp_kvdl_large_chunks_occ_get(void *priv)
350349
{
351-
struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
352-
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
350+
const struct mlxsw_sp *mlxsw_sp = priv;
353351
struct mlxsw_sp_kvdl_part *part;
354352

355353
part = mlxsw_sp->kvdl->parts[MLXSW_SP_KVDL_PART_ID_LARGE_CHUNKS];
356354
return mlxsw_sp_kvdl_part_occ(part);
357355
}
358356

359-
static const struct devlink_resource_ops mlxsw_sp_kvdl_single_ops = {
360-
.occ_get = mlxsw_sp_kvdl_single_occ_get,
361-
};
362-
363-
static const struct devlink_resource_ops mlxsw_sp_kvdl_chunks_ops = {
364-
.occ_get = mlxsw_sp_kvdl_chunks_occ_get,
365-
};
366-
367-
static const struct devlink_resource_ops mlxsw_sp_kvdl_chunks_large_ops = {
368-
.occ_get = mlxsw_sp_kvdl_large_chunks_occ_get,
369-
};
370-
371357
int mlxsw_sp_kvdl_resources_register(struct mlxsw_core *mlxsw_core)
372358
{
373359
struct devlink *devlink = priv_to_devlink(mlxsw_core);
@@ -386,8 +372,7 @@ int mlxsw_sp_kvdl_resources_register(struct mlxsw_core *mlxsw_core)
386372
MLXSW_SP_KVDL_SINGLE_SIZE,
387373
MLXSW_SP_RESOURCE_KVD_LINEAR_SINGLE,
388374
MLXSW_SP_RESOURCE_KVD_LINEAR,
389-
&size_params,
390-
&mlxsw_sp_kvdl_single_ops);
375+
&size_params);
391376
if (err)
392377
return err;
393378

@@ -398,8 +383,7 @@ int mlxsw_sp_kvdl_resources_register(struct mlxsw_core *mlxsw_core)
398383
MLXSW_SP_KVDL_CHUNKS_SIZE,
399384
MLXSW_SP_RESOURCE_KVD_LINEAR_CHUNKS,
400385
MLXSW_SP_RESOURCE_KVD_LINEAR,
401-
&size_params,
402-
&mlxsw_sp_kvdl_chunks_ops);
386+
&size_params);
403387
if (err)
404388
return err;
405389

@@ -410,13 +394,13 @@ int mlxsw_sp_kvdl_resources_register(struct mlxsw_core *mlxsw_core)
410394
MLXSW_SP_KVDL_LARGE_CHUNKS_SIZE,
411395
MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS,
412396
MLXSW_SP_RESOURCE_KVD_LINEAR,
413-
&size_params,
414-
&mlxsw_sp_kvdl_chunks_large_ops);
397+
&size_params);
415398
return err;
416399
}
417400

418401
int mlxsw_sp_kvdl_init(struct mlxsw_sp *mlxsw_sp)
419402
{
403+
struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
420404
struct mlxsw_sp_kvdl *kvdl;
421405
int err;
422406

@@ -429,6 +413,23 @@ int mlxsw_sp_kvdl_init(struct mlxsw_sp *mlxsw_sp)
429413
if (err)
430414
goto err_kvdl_parts_init;
431415

416+
devlink_resource_occ_get_register(devlink,
417+
MLXSW_SP_RESOURCE_KVD_LINEAR,
418+
mlxsw_sp_kvdl_occ_get,
419+
mlxsw_sp);
420+
devlink_resource_occ_get_register(devlink,
421+
MLXSW_SP_RESOURCE_KVD_LINEAR_SINGLE,
422+
mlxsw_sp_kvdl_single_occ_get,
423+
mlxsw_sp);
424+
devlink_resource_occ_get_register(devlink,
425+
MLXSW_SP_RESOURCE_KVD_LINEAR_CHUNKS,
426+
mlxsw_sp_kvdl_chunks_occ_get,
427+
mlxsw_sp);
428+
devlink_resource_occ_get_register(devlink,
429+
MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS,
430+
mlxsw_sp_kvdl_large_chunks_occ_get,
431+
mlxsw_sp);
432+
432433
return 0;
433434

434435
err_kvdl_parts_init:
@@ -438,6 +439,16 @@ int mlxsw_sp_kvdl_init(struct mlxsw_sp *mlxsw_sp)
438439

439440
void mlxsw_sp_kvdl_fini(struct mlxsw_sp *mlxsw_sp)
440441
{
442+
struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
443+
444+
devlink_resource_occ_get_unregister(devlink,
445+
MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS);
446+
devlink_resource_occ_get_unregister(devlink,
447+
MLXSW_SP_RESOURCE_KVD_LINEAR_CHUNKS);
448+
devlink_resource_occ_get_unregister(devlink,
449+
MLXSW_SP_RESOURCE_KVD_LINEAR_SINGLE);
450+
devlink_resource_occ_get_unregister(devlink,
451+
MLXSW_SP_RESOURCE_KVD_LINEAR);
441452
mlxsw_sp_kvdl_parts_fini(mlxsw_sp);
442453
kfree(mlxsw_sp->kvdl);
443454
}

‎drivers/net/netdevsim/devlink.c‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,52 +30,36 @@ static struct net *nsim_devlink_net(struct devlink *devlink)
3030

3131
/* IPv4
3232
*/
33-
static u64 nsim_ipv4_fib_resource_occ_get(struct devlink *devlink)
33+
static u64 nsim_ipv4_fib_resource_occ_get(void *priv)
3434
{
35-
struct net *net = nsim_devlink_net(devlink);
35+
struct net *net = priv;
3636

3737
return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, false);
3838
}
3939

40-
static struct devlink_resource_ops nsim_ipv4_fib_res_ops = {
41-
.occ_get = nsim_ipv4_fib_resource_occ_get,
42-
};
43-
44-
static u64 nsim_ipv4_fib_rules_res_occ_get(struct devlink *devlink)
40+
static u64 nsim_ipv4_fib_rules_res_occ_get(void *priv)
4541
{
46-
struct net *net = nsim_devlink_net(devlink);
42+
struct net *net = priv;
4743

4844
return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, false);
4945
}
5046

51-
static struct devlink_resource_ops nsim_ipv4_fib_rules_res_ops = {
52-
.occ_get = nsim_ipv4_fib_rules_res_occ_get,
53-
};
54-
5547
/* IPv6
5648
*/
57-
static u64 nsim_ipv6_fib_resource_occ_get(struct devlink *devlink)
49+
static u64 nsim_ipv6_fib_resource_occ_get(void *priv)
5850
{
59-
struct net *net = nsim_devlink_net(devlink);
51+
struct net *net = priv;
6052

6153
return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, false);
6254
}
6355

64-
static struct devlink_resource_ops nsim_ipv6_fib_res_ops = {
65-
.occ_get = nsim_ipv6_fib_resource_occ_get,
66-
};
67-
68-
static u64 nsim_ipv6_fib_rules_res_occ_get(struct devlink *devlink)
56+
static u64 nsim_ipv6_fib_rules_res_occ_get(void *priv)
6957
{
70-
struct net *net = nsim_devlink_net(devlink);
58+
struct net *net = priv;
7159

7260
return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, false);
7361
}
7462

75-
static struct devlink_resource_ops nsim_ipv6_fib_rules_res_ops = {
76-
.occ_get = nsim_ipv6_fib_rules_res_occ_get,
77-
};
78-
7963
static int devlink_resources_register(struct devlink *devlink)
8064
{
8165
struct devlink_resource_size_params params = {
@@ -91,7 +75,7 @@ static int devlink_resources_register(struct devlink *devlink)
9175
err = devlink_resource_register(devlink, "IPv4", (u64)-1,
9276
NSIM_RESOURCE_IPV4,
9377
DEVLINK_RESOURCE_ID_PARENT_TOP,
94-
&params, NULL);
78+
&params);
9579
if (err) {
9680
pr_err("Failed to register IPv4 top resource\n");
9781
goto out;
@@ -100,8 +84,7 @@ static int devlink_resources_register(struct devlink *devlink)
10084
n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, true);
10185
err = devlink_resource_register(devlink, "fib", n,
10286
NSIM_RESOURCE_IPV4_FIB,
103-
NSIM_RESOURCE_IPV4,
104-
&params, &nsim_ipv4_fib_res_ops);
87+
NSIM_RESOURCE_IPV4, &params);
10588
if (err) {
10689
pr_err("Failed to register IPv4 FIB resource\n");
10790
return err;
@@ -110,8 +93,7 @@ static int devlink_resources_register(struct devlink *devlink)
11093
n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, true);
11194
err = devlink_resource_register(devlink, "fib-rules", n,
11295
NSIM_RESOURCE_IPV4_FIB_RULES,
113-
NSIM_RESOURCE_IPV4,
114-
&params, &nsim_ipv4_fib_rules_res_ops);
96+
NSIM_RESOURCE_IPV4, &params);
11597
if (err) {
11698
pr_err("Failed to register IPv4 FIB rules resource\n");
11799
return err;
@@ -121,7 +103,7 @@ static int devlink_resources_register(struct devlink *devlink)
121103
err = devlink_resource_register(devlink, "IPv6", (u64)-1,
122104
NSIM_RESOURCE_IPV6,
123105
DEVLINK_RESOURCE_ID_PARENT_TOP,
124-
&params, NULL);
106+
&params);
125107
if (err) {
126108
pr_err("Failed to register IPv6 top resource\n");
127109
goto out;
@@ -130,8 +112,7 @@ static int devlink_resources_register(struct devlink *devlink)
130112
n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, true);
131113
err = devlink_resource_register(devlink, "fib", n,
132114
NSIM_RESOURCE_IPV6_FIB,
133-
NSIM_RESOURCE_IPV6,
134-
&params, &nsim_ipv6_fib_res_ops);
115+
NSIM_RESOURCE_IPV6, &params);
135116
if (err) {
136117
pr_err("Failed to register IPv6 FIB resource\n");
137118
return err;
@@ -140,12 +121,28 @@ static int devlink_resources_register(struct devlink *devlink)
140121
n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, true);
141122
err = devlink_resource_register(devlink, "fib-rules", n,
142123
NSIM_RESOURCE_IPV6_FIB_RULES,
143-
NSIM_RESOURCE_IPV6,
144-
&params, &nsim_ipv6_fib_rules_res_ops);
124+
NSIM_RESOURCE_IPV6, &params);
145125
if (err) {
146126
pr_err("Failed to register IPv6 FIB rules resource\n");
147127
return err;
148128
}
129+
130+
devlink_resource_occ_get_register(devlink,
131+
NSIM_RESOURCE_IPV4_FIB,
132+
nsim_ipv4_fib_resource_occ_get,
133+
net);
134+
devlink_resource_occ_get_register(devlink,
135+
NSIM_RESOURCE_IPV4_FIB_RULES,
136+
nsim_ipv4_fib_rules_res_occ_get,
137+
net);
138+
devlink_resource_occ_get_register(devlink,
139+
NSIM_RESOURCE_IPV6_FIB,
140+
nsim_ipv6_fib_resource_occ_get,
141+
net);
142+
devlink_resource_occ_get_register(devlink,
143+
NSIM_RESOURCE_IPV6_FIB_RULES,
144+
nsim_ipv6_fib_rules_res_occ_get,
145+
net);
149146
out:
150147
return err;
151148
}

0 commit comments

Comments
 (0)