Skip to content

Commit 29a390d

Browse files
Jiri Pirkokuba-moo
Jiri Pirko
authored and
kuba-moo
committed
devlink: move small_ops definition into netlink.c
Move the generic netlink small_ops definition where they are consumed, into netlink.c Signed-off-by: Jiri Pirko <jiri@nvidia.com> Link: https://lore.kernel.org/r/20230828061657.300667-15-jiri@resnulli.us Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 890c556 commit 29a390d

3 files changed

Lines changed: 251 additions & 253 deletions

File tree

‎net/devlink/devl_internal.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ typedef int devlink_nl_dump_one_func_t(struct sk_buff *msg,
121121
struct netlink_callback *cb,
122122
int flags);
123123

124-
extern const struct genl_small_ops devlink_nl_small_ops[40];
125-
126124
struct devlink *
127125
devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
128126

‎net/devlink/leftover.c‎

Lines changed: 0 additions & 251 deletions
Original file line numberDiff line numberDiff line change
@@ -31,257 +31,6 @@
3131

3232
#include "devl_internal.h"
3333

34-
const struct genl_small_ops devlink_nl_small_ops[40] = {
35-
{
36-
.cmd = DEVLINK_CMD_PORT_SET,
37-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
38-
.doit = devlink_nl_cmd_port_set_doit,
39-
.flags = GENL_ADMIN_PERM,
40-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
41-
},
42-
{
43-
.cmd = DEVLINK_CMD_RATE_SET,
44-
.doit = devlink_nl_cmd_rate_set_doit,
45-
.flags = GENL_ADMIN_PERM,
46-
},
47-
{
48-
.cmd = DEVLINK_CMD_RATE_NEW,
49-
.doit = devlink_nl_cmd_rate_new_doit,
50-
.flags = GENL_ADMIN_PERM,
51-
},
52-
{
53-
.cmd = DEVLINK_CMD_RATE_DEL,
54-
.doit = devlink_nl_cmd_rate_del_doit,
55-
.flags = GENL_ADMIN_PERM,
56-
},
57-
{
58-
.cmd = DEVLINK_CMD_PORT_SPLIT,
59-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
60-
.doit = devlink_nl_cmd_port_split_doit,
61-
.flags = GENL_ADMIN_PERM,
62-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
63-
},
64-
{
65-
.cmd = DEVLINK_CMD_PORT_UNSPLIT,
66-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
67-
.doit = devlink_nl_cmd_port_unsplit_doit,
68-
.flags = GENL_ADMIN_PERM,
69-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
70-
},
71-
{
72-
.cmd = DEVLINK_CMD_PORT_NEW,
73-
.doit = devlink_nl_cmd_port_new_doit,
74-
.flags = GENL_ADMIN_PERM,
75-
},
76-
{
77-
.cmd = DEVLINK_CMD_PORT_DEL,
78-
.doit = devlink_nl_cmd_port_del_doit,
79-
.flags = GENL_ADMIN_PERM,
80-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
81-
},
82-
83-
{
84-
.cmd = DEVLINK_CMD_LINECARD_SET,
85-
.doit = devlink_nl_cmd_linecard_set_doit,
86-
.flags = GENL_ADMIN_PERM,
87-
},
88-
{
89-
.cmd = DEVLINK_CMD_SB_POOL_SET,
90-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
91-
.doit = devlink_nl_cmd_sb_pool_set_doit,
92-
.flags = GENL_ADMIN_PERM,
93-
},
94-
{
95-
.cmd = DEVLINK_CMD_SB_PORT_POOL_SET,
96-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
97-
.doit = devlink_nl_cmd_sb_port_pool_set_doit,
98-
.flags = GENL_ADMIN_PERM,
99-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
100-
},
101-
{
102-
.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET,
103-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
104-
.doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,
105-
.flags = GENL_ADMIN_PERM,
106-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
107-
},
108-
{
109-
.cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,
110-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
111-
.doit = devlink_nl_cmd_sb_occ_snapshot_doit,
112-
.flags = GENL_ADMIN_PERM,
113-
},
114-
{
115-
.cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,
116-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
117-
.doit = devlink_nl_cmd_sb_occ_max_clear_doit,
118-
.flags = GENL_ADMIN_PERM,
119-
},
120-
{
121-
.cmd = DEVLINK_CMD_ESWITCH_GET,
122-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
123-
.doit = devlink_nl_cmd_eswitch_get_doit,
124-
.flags = GENL_ADMIN_PERM,
125-
},
126-
{
127-
.cmd = DEVLINK_CMD_ESWITCH_SET,
128-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
129-
.doit = devlink_nl_cmd_eswitch_set_doit,
130-
.flags = GENL_ADMIN_PERM,
131-
},
132-
{
133-
.cmd = DEVLINK_CMD_DPIPE_TABLE_GET,
134-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
135-
.doit = devlink_nl_cmd_dpipe_table_get,
136-
/* can be retrieved by unprivileged users */
137-
},
138-
{
139-
.cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,
140-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
141-
.doit = devlink_nl_cmd_dpipe_entries_get,
142-
/* can be retrieved by unprivileged users */
143-
},
144-
{
145-
.cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,
146-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
147-
.doit = devlink_nl_cmd_dpipe_headers_get,
148-
/* can be retrieved by unprivileged users */
149-
},
150-
{
151-
.cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
152-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
153-
.doit = devlink_nl_cmd_dpipe_table_counters_set,
154-
.flags = GENL_ADMIN_PERM,
155-
},
156-
{
157-
.cmd = DEVLINK_CMD_RESOURCE_SET,
158-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
159-
.doit = devlink_nl_cmd_resource_set,
160-
.flags = GENL_ADMIN_PERM,
161-
},
162-
{
163-
.cmd = DEVLINK_CMD_RESOURCE_DUMP,
164-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
165-
.doit = devlink_nl_cmd_resource_dump,
166-
/* can be retrieved by unprivileged users */
167-
},
168-
{
169-
.cmd = DEVLINK_CMD_RELOAD,
170-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
171-
.doit = devlink_nl_cmd_reload,
172-
.flags = GENL_ADMIN_PERM,
173-
},
174-
{
175-
.cmd = DEVLINK_CMD_PARAM_SET,
176-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
177-
.doit = devlink_nl_cmd_param_set_doit,
178-
.flags = GENL_ADMIN_PERM,
179-
},
180-
{
181-
.cmd = DEVLINK_CMD_PORT_PARAM_GET,
182-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
183-
.doit = devlink_nl_cmd_port_param_get_doit,
184-
.dumpit = devlink_nl_cmd_port_param_get_dumpit,
185-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
186-
/* can be retrieved by unprivileged users */
187-
},
188-
{
189-
.cmd = DEVLINK_CMD_PORT_PARAM_SET,
190-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
191-
.doit = devlink_nl_cmd_port_param_set_doit,
192-
.flags = GENL_ADMIN_PERM,
193-
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
194-
},
195-
{
196-
.cmd = DEVLINK_CMD_REGION_NEW,
197-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
198-
.doit = devlink_nl_cmd_region_new,
199-
.flags = GENL_ADMIN_PERM,
200-
},
201-
{
202-
.cmd = DEVLINK_CMD_REGION_DEL,
203-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
204-
.doit = devlink_nl_cmd_region_del,
205-
.flags = GENL_ADMIN_PERM,
206-
},
207-
{
208-
.cmd = DEVLINK_CMD_REGION_READ,
209-
.validate = GENL_DONT_VALIDATE_STRICT |
210-
GENL_DONT_VALIDATE_DUMP_STRICT,
211-
.dumpit = devlink_nl_cmd_region_read_dumpit,
212-
.flags = GENL_ADMIN_PERM,
213-
},
214-
{
215-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_SET,
216-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
217-
.doit = devlink_nl_cmd_health_reporter_set_doit,
218-
.flags = GENL_ADMIN_PERM,
219-
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
220-
},
221-
{
222-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
223-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
224-
.doit = devlink_nl_cmd_health_reporter_recover_doit,
225-
.flags = GENL_ADMIN_PERM,
226-
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
227-
},
228-
{
229-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
230-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
231-
.doit = devlink_nl_cmd_health_reporter_diagnose_doit,
232-
.flags = GENL_ADMIN_PERM,
233-
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
234-
},
235-
{
236-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
237-
.validate = GENL_DONT_VALIDATE_STRICT |
238-
GENL_DONT_VALIDATE_DUMP_STRICT,
239-
.dumpit = devlink_nl_cmd_health_reporter_dump_get_dumpit,
240-
.flags = GENL_ADMIN_PERM,
241-
},
242-
{
243-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
244-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
245-
.doit = devlink_nl_cmd_health_reporter_dump_clear_doit,
246-
.flags = GENL_ADMIN_PERM,
247-
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
248-
},
249-
{
250-
.cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST,
251-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
252-
.doit = devlink_nl_cmd_health_reporter_test_doit,
253-
.flags = GENL_ADMIN_PERM,
254-
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
255-
},
256-
{
257-
.cmd = DEVLINK_CMD_FLASH_UPDATE,
258-
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
259-
.doit = devlink_nl_cmd_flash_update,
260-
.flags = GENL_ADMIN_PERM,
261-
},
262-
{
263-
.cmd = DEVLINK_CMD_TRAP_SET,
264-
.doit = devlink_nl_cmd_trap_set_doit,
265-
.flags = GENL_ADMIN_PERM,
266-
},
267-
{
268-
.cmd = DEVLINK_CMD_TRAP_GROUP_SET,
269-
.doit = devlink_nl_cmd_trap_group_set_doit,
270-
.flags = GENL_ADMIN_PERM,
271-
},
272-
{
273-
.cmd = DEVLINK_CMD_TRAP_POLICER_SET,
274-
.doit = devlink_nl_cmd_trap_policer_set_doit,
275-
.flags = GENL_ADMIN_PERM,
276-
},
277-
{
278-
.cmd = DEVLINK_CMD_SELFTESTS_RUN,
279-
.doit = devlink_nl_cmd_selftests_run,
280-
.flags = GENL_ADMIN_PERM,
281-
},
282-
/* -- No new ops here! Use split ops going forward! -- */
283-
};
284-
28534
void devlink_notify_register(struct devlink *devlink)
28635
{
28736
devlink_notify(devlink, DEVLINK_CMD_NEW);

0 commit comments

Comments
 (0)