Skip to content

Commit 8589ba4

Browse files
Jiri Pirkokuba-moo
Jiri Pirko
authored and
kuba-moo
committed
devlink: rename and reorder instances of struct devlink_cmd
In order to maintain naming consistency, rename and reorder all usages of struct struct devlink_cmd in the following way: 1) Remove "gen" and replace it with "cmd" to match the struct name 2) Order devl_cmds[] and the header file to match the order of enum devlink_command 3) Move devl_cmd_rate_get among the peers 4) Remove "inst" for DEVLINK_CMD_GET 5) Add "_get" suffix to all to match DEVLINK_CMD_*_GET (only rate had it done correctly) Signed-off-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent f874459 commit 8589ba4

File tree

3 files changed

+50
-51
lines changed

3 files changed

+50
-51
lines changed

‎net/devlink/devl_internal.h‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,22 @@ devlink_dump_state(struct netlink_callback *cb)
140140
}
141141

142142
/* Commands */
143-
extern const struct devlink_cmd devl_gen_inst;
144-
extern const struct devlink_cmd devl_gen_port;
145-
extern const struct devlink_cmd devl_gen_sb;
146-
extern const struct devlink_cmd devl_gen_sb_pool;
147-
extern const struct devlink_cmd devl_gen_sb_port_pool;
148-
extern const struct devlink_cmd devl_gen_sb_tc_pool_bind;
149-
extern const struct devlink_cmd devl_gen_selftests;
150-
extern const struct devlink_cmd devl_gen_param;
151-
extern const struct devlink_cmd devl_gen_region;
152-
extern const struct devlink_cmd devl_gen_info;
153-
extern const struct devlink_cmd devl_gen_health_reporter;
154-
extern const struct devlink_cmd devl_gen_trap;
155-
extern const struct devlink_cmd devl_gen_trap_group;
156-
extern const struct devlink_cmd devl_gen_trap_policer;
157-
extern const struct devlink_cmd devl_gen_linecard;
143+
extern const struct devlink_cmd devl_cmd_get;
144+
extern const struct devlink_cmd devl_cmd_port_get;
145+
extern const struct devlink_cmd devl_cmd_sb_get;
146+
extern const struct devlink_cmd devl_cmd_sb_pool_get;
147+
extern const struct devlink_cmd devl_cmd_sb_port_pool_get;
148+
extern const struct devlink_cmd devl_cmd_sb_tc_pool_bind_get;
149+
extern const struct devlink_cmd devl_cmd_param_get;
150+
extern const struct devlink_cmd devl_cmd_region_get;
151+
extern const struct devlink_cmd devl_cmd_info_get;
152+
extern const struct devlink_cmd devl_cmd_health_reporter_get;
153+
extern const struct devlink_cmd devl_cmd_trap_get;
154+
extern const struct devlink_cmd devl_cmd_trap_group_get;
155+
extern const struct devlink_cmd devl_cmd_trap_policer_get;
156+
extern const struct devlink_cmd devl_cmd_rate_get;
157+
extern const struct devlink_cmd devl_cmd_linecard_get;
158+
extern const struct devlink_cmd devl_cmd_selftests_get;
158159

159160
/* Ports */
160161
int devlink_port_netdevice_event(struct notifier_block *nb,
@@ -182,8 +183,6 @@ struct devlink_linecard *
182183
devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);
183184

184185
/* Rates */
185-
extern const struct devlink_cmd devl_gen_rate_get;
186-
187186
struct devlink_rate *
188187
devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);
189188
struct devlink_rate *

‎net/devlink/leftover.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
12361236
return err;
12371237
}
12381238

1239-
const struct devlink_cmd devl_gen_rate_get = {
1239+
const struct devlink_cmd devl_cmd_rate_get = {
12401240
.dump_one = devlink_nl_cmd_rate_get_dump_one,
12411241
};
12421242

@@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
13031303
cb->nlh->nlmsg_seq, NLM_F_MULTI);
13041304
}
13051305

1306-
const struct devlink_cmd devl_gen_inst = {
1306+
const struct devlink_cmd devl_cmd_get = {
13071307
.dump_one = devlink_nl_cmd_get_dump_one,
13081308
};
13091309

@@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
13591359
return err;
13601360
}
13611361

1362-
const struct devlink_cmd devl_gen_port = {
1362+
const struct devlink_cmd devl_cmd_port_get = {
13631363
.dump_one = devlink_nl_cmd_port_get_dump_one,
13641364
};
13651365

@@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg,
21372137
return err;
21382138
}
21392139

2140-
const struct devlink_cmd devl_gen_linecard = {
2140+
const struct devlink_cmd devl_cmd_linecard_get = {
21412141
.dump_one = devlink_nl_cmd_linecard_get_dump_one,
21422142
};
21432143

@@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
23922392
return err;
23932393
}
23942394

2395-
const struct devlink_cmd devl_gen_sb = {
2395+
const struct devlink_cmd devl_cmd_sb_get = {
23962396
.dump_one = devlink_nl_cmd_sb_get_dump_one,
23972397
};
23982398

@@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg,
25302530
return err;
25312531
}
25322532

2533-
const struct devlink_cmd devl_gen_sb_pool = {
2533+
const struct devlink_cmd devl_cmd_sb_pool_get = {
25342534
.dump_one = devlink_nl_cmd_sb_pool_get_dump_one,
25352535
};
25362536

@@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg,
27382738
return err;
27392739
}
27402740

2741-
const struct devlink_cmd devl_gen_sb_port_pool = {
2741+
const struct devlink_cmd devl_cmd_sb_port_pool_get = {
27422742
.dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one,
27432743
};
27442744

@@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,
29732973
return err;
29742974
}
29752975

2976-
const struct devlink_cmd devl_gen_sb_tc_pool_bind = {
2976+
const struct devlink_cmd devl_cmd_sb_tc_pool_bind_get = {
29772977
.dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one,
29782978
};
29792979

@@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg,
47854785
cb->extack);
47864786
}
47874787

4788-
const struct devlink_cmd devl_gen_selftests = {
4788+
const struct devlink_cmd devl_cmd_selftests_get = {
47894789
.dump_one = devlink_nl_cmd_selftests_get_dump_one,
47904790
};
47914791

@@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
52715271
return err;
52725272
}
52735273

5274-
const struct devlink_cmd devl_gen_param = {
5274+
const struct devlink_cmd devl_cmd_param_get = {
52755275
.dump_one = devlink_nl_cmd_param_get_dump_one,
52765276
};
52775277

@@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
59785978
return 0;
59795979
}
59805980

5981-
const struct devlink_cmd devl_gen_region = {
5981+
const struct devlink_cmd devl_cmd_region_get = {
59825982
.dump_one = devlink_nl_cmd_region_get_dump_one,
59835983
};
59845984

@@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
66256625
return err;
66266626
}
66276627

6628-
const struct devlink_cmd devl_gen_info = {
6628+
const struct devlink_cmd devl_cmd_info_get = {
66296629
.dump_one = devlink_nl_cmd_info_get_dump_one,
66306630
};
66316631

@@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg,
77937793
return 0;
77947794
}
77957795

7796-
const struct devlink_cmd devl_gen_health_reporter = {
7796+
const struct devlink_cmd devl_cmd_health_reporter_get = {
77977797
.dump_one = devlink_nl_cmd_health_reporter_get_dump_one,
77987798
};
77997799

@@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
83118311
return err;
83128312
}
83138313

8314-
const struct devlink_cmd devl_gen_trap = {
8314+
const struct devlink_cmd devl_cmd_trap_get = {
83158315
.dump_one = devlink_nl_cmd_trap_get_dump_one,
83168316
};
83178317

@@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg,
85248524
return err;
85258525
}
85268526

8527-
const struct devlink_cmd devl_gen_trap_group = {
8527+
const struct devlink_cmd devl_cmd_trap_group_get = {
85288528
.dump_one = devlink_nl_cmd_trap_group_get_dump_one,
85298529
};
85308530

@@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg,
88178817
return err;
88188818
}
88198819

8820-
const struct devlink_cmd devl_gen_trap_policer = {
8820+
const struct devlink_cmd devl_cmd_trap_policer_get = {
88218821
.dump_one = devlink_nl_cmd_trap_policer_get_dump_one,
88228822
};
88238823

‎net/devlink/netlink.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -177,23 +177,23 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops,
177177
devlink_put(devlink);
178178
}
179179

180-
static const struct devlink_cmd *devl_gen_cmds[] = {
181-
[DEVLINK_CMD_GET] = &devl_gen_inst,
182-
[DEVLINK_CMD_PORT_GET] = &devl_gen_port,
183-
[DEVLINK_CMD_SB_GET] = &devl_gen_sb,
184-
[DEVLINK_CMD_SB_POOL_GET] = &devl_gen_sb_pool,
185-
[DEVLINK_CMD_SB_PORT_POOL_GET] = &devl_gen_sb_port_pool,
186-
[DEVLINK_CMD_SB_TC_POOL_BIND_GET] = &devl_gen_sb_tc_pool_bind,
187-
[DEVLINK_CMD_PARAM_GET] = &devl_gen_param,
188-
[DEVLINK_CMD_REGION_GET] = &devl_gen_region,
189-
[DEVLINK_CMD_INFO_GET] = &devl_gen_info,
190-
[DEVLINK_CMD_HEALTH_REPORTER_GET] = &devl_gen_health_reporter,
191-
[DEVLINK_CMD_RATE_GET] = &devl_gen_rate_get,
192-
[DEVLINK_CMD_TRAP_GET] = &devl_gen_trap,
193-
[DEVLINK_CMD_TRAP_GROUP_GET] = &devl_gen_trap_group,
194-
[DEVLINK_CMD_TRAP_POLICER_GET] = &devl_gen_trap_policer,
195-
[DEVLINK_CMD_LINECARD_GET] = &devl_gen_linecard,
196-
[DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
180+
static const struct devlink_cmd *devl_cmds[] = {
181+
[DEVLINK_CMD_GET] = &devl_cmd_get,
182+
[DEVLINK_CMD_PORT_GET] = &devl_cmd_port_get,
183+
[DEVLINK_CMD_SB_GET] = &devl_cmd_sb_get,
184+
[DEVLINK_CMD_SB_POOL_GET] = &devl_cmd_sb_pool_get,
185+
[DEVLINK_CMD_SB_PORT_POOL_GET] = &devl_cmd_sb_port_pool_get,
186+
[DEVLINK_CMD_SB_TC_POOL_BIND_GET] = &devl_cmd_sb_tc_pool_bind_get,
187+
[DEVLINK_CMD_PARAM_GET] = &devl_cmd_param_get,
188+
[DEVLINK_CMD_REGION_GET] = &devl_cmd_region_get,
189+
[DEVLINK_CMD_INFO_GET] = &devl_cmd_info_get,
190+
[DEVLINK_CMD_HEALTH_REPORTER_GET] = &devl_cmd_health_reporter_get,
191+
[DEVLINK_CMD_TRAP_GET] = &devl_cmd_trap_get,
192+
[DEVLINK_CMD_TRAP_GROUP_GET] = &devl_cmd_trap_group_get,
193+
[DEVLINK_CMD_TRAP_POLICER_GET] = &devl_cmd_trap_policer_get,
194+
[DEVLINK_CMD_RATE_GET] = &devl_cmd_rate_get,
195+
[DEVLINK_CMD_LINECARD_GET] = &devl_cmd_linecard_get,
196+
[DEVLINK_CMD_SELFTESTS_GET] = &devl_cmd_selftests_get,
197197
};
198198

199199
int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
@@ -205,7 +205,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
205205
struct devlink *devlink;
206206
int err = 0;
207207

208-
cmd = devl_gen_cmds[info->op.cmd];
208+
cmd = devl_cmds[info->op.cmd];
209209

210210
while ((devlink = devlinks_xa_find_get(sock_net(msg->sk),
211211
&state->instance))) {

0 commit comments

Comments
 (0)