devlink: finish file split and get retire leftover.c
Subsystems (3)
Jiri Pirko
maintainerv2 cover devlink: finish file split and get retire leftover.c
From: Jiri Pirko <[email protected]>
This patchset finishes a move Jakub started and Moshe continued in the past. I was planning to do this for a long time, so here it is, finally.
This patchset does not change any behaviour. It just splits leftover.c into per-object files and do necessary changes, like declaring functions used from other code, on the way.
The last 3 patches are pushing the rest of the code into appropriate existing files.
---v1->v2:
patch #2 rebased on top of recent net-next changes
Jiri Pirko (15):
devlink: push object register/unregister notifications into separate
helpers
devlink: push port related code into separate file
devlink: push shared buffer related code into separate file
devlink: move and rename devlink_dpipe_send_and_alloc_skb() helper
devlink: push dpipe related code into separate file
devlink: push resource related code into separate file
devlink: push param related code into separate file
devlink: push region related code into separate file
devlink: use tracepoint_enabled() helper
devlink: push trap related code into separate file
devlink: push rate related code into separate file
devlink: push linecard related code into separate file
devlink: move tracepoint definitions into core.c
devlink: move small_ops definition into netlink.c
devlink: move devlink_notify_register/unregister() to dev.c
net/devlink/Makefile | 3 +- net/devlink/core.c | 6 + net/devlink/dev.c | 28 +- net/devlink/devl_internal.h | 95 +- net/devlink/dpipe.c | 917 ++++ net/devlink/leftover.c | 9531 ----------------------------------- net/devlink/linecard.c | 606 +++ net/devlink/netlink.c | 266 + net/devlink/param.c | 865 ++++ net/devlink/port.c | 1515 ++++++ net/devlink/rate.c | 722 +++ net/devlink/region.c | 1260 +++++ net/devlink/resource.c | 579 +++ net/devlink/sb.c | 996 ++++ net/devlink/trap.c | 1861 +++++++ 15 files changed, 9710 insertions(+), 9540 deletions(-) create mode 100644 net/devlink/dpipe.c delete mode 100644 net/devlink/leftover.c create mode 100644 net/devlink/linecard.c create mode 100644 net/devlink/param.c create mode 100644 net/devlink/port.c create mode 100644 net/devlink/rate.c create mode 100644 net/devlink/region.c create mode 100644 net/devlink/resource.c create mode 100644 net/devlink/sb.c create mode 100644 net/devlink/trap.c
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 1/15 devlink: push object register/unregister notifications into separate helpers
From: Jiri Pirko <[email protected]>
In preparations of leftover.c split to individual files, avoid need to have object structures exposed in devl_internal.h and allow to have them maintained in object files.
The register/unregister notifications need to know the structures to iterate lists. To avoid the need, introduce per-object register/unregister notification helpers and use them.
--- net/devlink/leftover.c | 247 +++++++++++++++++++++++++++-------------- 1 file changed, 163 insertions(+), 84 deletions(-)
net/devlink/leftover.c +163 -84
@@ -1058,6 +1058,26 @@ static void devlink_port_notify(struct devlink_port *devlink_port, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_ports_notify (struct devlink *devlink, +enum devlink_command cmd) +{ +struct devlink_port *devlink_port; +unsigned long port_index; + +xa_for_each (&devlink->ports, port_index, devlink_port) +devlink_port_notify (devlink_port, cmd); +} + +static void devlink_ports_notify_register (struct devlink *devlink) +{ +devlink_ports_notify (devlink,DEVLINK_CMD_PORT_NEW ); +} + +static void devlink_ports_notify_unregister (struct devlink *devlink) +{ +devlink_ports_notify (devlink,DEVLINK_CMD_PORT_DEL ); +} +static void devlink_rate_notify (struct devlink_rate *devlink_rate,enum devlink_command cmd) {
@@ -1084,6 +1104,22 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_rates_notify_register (struct devlink *devlink) +{ +struct devlink_rate *rate_node; + +list_for_each_entry (rate_node, &devlink->rate_list, list) +devlink_rate_notify (rate_node,DEVLINK_CMD_RATE_NEW ); +} + +static void devlink_rates_notify_unregister (struct devlink *devlink) +{ +struct devlink_rate *rate_node; + +list_for_each_entry_reverse (rate_node, &devlink->rate_list, list) +devlink_rate_notify (rate_node,DEVLINK_CMD_RATE_DEL ); +} +static int devlink_nl_rate_get_dump_one (struct sk_buff *msg,struct devlink *devlink,struct netlink_callback *cb,int flags)
@@ -1928,6 +1964,22 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard, msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_linecards_notify_register (struct devlink *devlink) +{ +struct devlink_linecard *linecard; + +list_for_each_entry (linecard, &devlink->linecard_list, list) +devlink_linecard_notify (linecard,DEVLINK_CMD_LINECARD_NEW ); +} + +static void devlink_linecards_notify_unregister (struct devlink *devlink) +{ +struct devlink_linecard *linecard; + +list_for_each_entry_reverse (linecard, &devlink->linecard_list, list) +devlink_linecard_notify (linecard,DEVLINK_CMD_LINECARD_DEL ); +} +int devlink_nl_linecard_get_doit (struct sk_buff *skb,struct genl_info *info) {struct devlink *devlink = info->user_ptr[0 ];
@@ -4285,6 +4337,26 @@ static void devlink_param_notify(struct devlink *devlink, msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_params_notify (struct devlink *devlink, +enum devlink_command cmd) +{ +struct devlink_param_item *param_item; +unsigned long param_id; + +xa_for_each (&devlink->params, param_id, param_item) +devlink_param_notify (devlink,0 , param_item, cmd); +} + +static void devlink_params_notify_register (struct devlink *devlink) +{ +devlink_params_notify (devlink,DEVLINK_CMD_PARAM_NEW ); +} + +static void devlink_params_notify_unregister (struct devlink *devlink) +{ +devlink_params_notify (devlink,DEVLINK_CMD_PARAM_DEL ); +} + static int devlink_nl_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink, struct netlink_callback *cb,
@@ -4694,6 +4766,22 @@ static void devlink_nl_region_notify(struct devlink_region *region, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_regions_notify_register (struct devlink *devlink) +{ +struct devlink_region *region; + +list_for_each_entry (region, &devlink->region_list, list) +devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_NEW ); +} + +static void devlink_regions_notify_unregister (struct devlink *devlink) +{ +struct devlink_region *region; + +list_for_each_entry_reverse (region, &devlink->region_list, list) +devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_DEL ); +} +/** * __devlink_snapshot_id_increment - Increment number of snapshots using an id * @devlink: devlink instance
@@ -6662,98 +6750,36 @@ const struct genl_small_ops devlink_nl_small_ops[40] = {/* -- No new ops here! Use split ops going forward! -- */ }; -static void -devlink_trap_policer_notify (struct devlink *devlink, -const struct devlink_trap_policer_item *policer_item, -enum devlink_command cmd); -static void -devlink_trap_group_notify (struct devlink *devlink, -const struct devlink_trap_group_item *group_item, -enum devlink_command cmd); -static void devlink_trap_notify (struct devlink *devlink, -const struct devlink_trap_item *trap_item, -enum devlink_command cmd); +static void devlink_trap_policers_notify_register (struct devlink *devlink); +static void devlink_trap_policers_notify_unregister (struct devlink *devlink); +static void devlink_trap_groups_notify_register (struct devlink *devlink); +static void devlink_trap_groups_notify_unregister (struct devlink *devlink); +static void devlink_traps_notify_register (struct devlink *devlink); +static void devlink_traps_notify_unregister (struct devlink *devlink);void devlink_notify_register (struct devlink *devlink) { -struct devlink_trap_policer_item *policer_item; -struct devlink_trap_group_item *group_item; -struct devlink_param_item *param_item; -struct devlink_trap_item *trap_item; -struct devlink_port *devlink_port; -struct devlink_linecard *linecard; -struct devlink_rate *rate_node; -struct devlink_region *region; -unsigned long port_index; -unsigned long param_id; -devlink_notify (devlink,DEVLINK_CMD_NEW ); -list_for_each_entry (linecard, &devlink->linecard_list, list) -devlink_linecard_notify (linecard,DEVLINK_CMD_LINECARD_NEW ); - -xa_for_each (&devlink->ports, port_index, devlink_port) -devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_NEW ); - -list_for_each_entry (policer_item, &devlink->trap_policer_list, list) -devlink_trap_policer_notify (devlink, policer_item, -DEVLINK_CMD_TRAP_POLICER_NEW ); - -list_for_each_entry (group_item, &devlink->trap_group_list, list) -devlink_trap_group_notify (devlink, group_item, -DEVLINK_CMD_TRAP_GROUP_NEW ); - -list_for_each_entry (trap_item, &devlink->trap_list, list) -devlink_trap_notify (devlink, trap_item,DEVLINK_CMD_TRAP_NEW ); - -list_for_each_entry (rate_node, &devlink->rate_list, list) -devlink_rate_notify (rate_node,DEVLINK_CMD_RATE_NEW ); - -list_for_each_entry (region, &devlink->region_list, list) -devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_NEW ); - -xa_for_each (&devlink->params, param_id, param_item) -devlink_param_notify (devlink,0 , param_item, -DEVLINK_CMD_PARAM_NEW ); +devlink_linecards_notify_register (devlink); +devlink_ports_notify_register (devlink); +devlink_trap_policers_notify_register (devlink); +devlink_trap_groups_notify_register (devlink); +devlink_traps_notify_register (devlink); +devlink_rates_notify_register (devlink); +devlink_regions_notify_register (devlink); +devlink_params_notify_register (devlink); }void devlink_notify_unregister (struct devlink *devlink) { -struct devlink_trap_policer_item *policer_item; -struct devlink_trap_group_item *group_item; -struct devlink_param_item *param_item; -struct devlink_trap_item *trap_item; -struct devlink_port *devlink_port; -struct devlink_linecard *linecard; -struct devlink_rate *rate_node; -struct devlink_region *region; -unsigned long port_index; -unsigned long param_id; - -xa_for_each (&devlink->params, param_id, param_item) -devlink_param_notify (devlink,0 , param_item, -DEVLINK_CMD_PARAM_DEL ); - -list_for_each_entry_reverse (region, &devlink->region_list, list) -devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_DEL ); - -list_for_each_entry_reverse (rate_node, &devlink->rate_list, list) -devlink_rate_notify (rate_node,DEVLINK_CMD_RATE_DEL ); - -list_for_each_entry_reverse (trap_item, &devlink->trap_list, list) -devlink_trap_notify (devlink, trap_item,DEVLINK_CMD_TRAP_DEL ); - -list_for_each_entry_reverse (group_item, &devlink->trap_group_list, list) -devlink_trap_group_notify (devlink, group_item, -DEVLINK_CMD_TRAP_GROUP_DEL ); -list_for_each_entry_reverse (policer_item, &devlink->trap_policer_list, - list) -devlink_trap_policer_notify (devlink, policer_item, -DEVLINK_CMD_TRAP_POLICER_DEL ); - -xa_for_each (&devlink->ports, port_index, devlink_port) -devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_DEL ); -list_for_each_entry_reverse (linecard, &devlink->linecard_list, list) -devlink_linecard_notify (linecard,DEVLINK_CMD_LINECARD_DEL ); +devlink_params_notify_unregister (devlink); +devlink_regions_notify_unregister (devlink); +devlink_rates_notify_unregister (devlink); +devlink_traps_notify_unregister (devlink); +devlink_trap_groups_notify_unregister (devlink); +devlink_trap_policers_notify_unregister (devlink); +devlink_ports_notify_unregister (devlink); +devlink_linecards_notify_unregister (devlink);devlink_notify (devlink,DEVLINK_CMD_DEL ); }
@@ -8879,6 +8905,24 @@ devlink_trap_group_notify(struct devlink *devlink, msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_trap_groups_notify_register (struct devlink *devlink) +{ +struct devlink_trap_group_item *group_item; + +list_for_each_entry (group_item, &devlink->trap_group_list, list) +devlink_trap_group_notify (devlink, group_item, +DEVLINK_CMD_TRAP_GROUP_NEW ); +} + +static void devlink_trap_groups_notify_unregister (struct devlink *devlink) +{ +struct devlink_trap_group_item *group_item; + +list_for_each_entry_reverse (group_item, &devlink->trap_group_list, list) +devlink_trap_group_notify (devlink, group_item, +DEVLINK_CMD_TRAP_GROUP_DEL ); +} +static int devlink_trap_item_group_link (struct devlink *devlink,struct devlink_trap_item *trap_item)
@@ -8921,6 +8965,22 @@ static void devlink_trap_notify(struct devlink *devlink, msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_traps_notify_register (struct devlink *devlink) +{ +struct devlink_trap_item *trap_item; + +list_for_each_entry (trap_item, &devlink->trap_list, list) +devlink_trap_notify (devlink, trap_item,DEVLINK_CMD_TRAP_NEW ); +} + +static void devlink_traps_notify_unregister (struct devlink *devlink) +{ +struct devlink_trap_item *trap_item; + +list_for_each_entry_reverse (trap_item, &devlink->trap_list, list) +devlink_trap_notify (devlink, trap_item,DEVLINK_CMD_TRAP_DEL ); +} +static int devlink_trap_register (struct devlink *devlink,const struct devlink_trap *trap,void *priv)
@@ -9382,6 +9442,25 @@ devlink_trap_policer_notify(struct devlink *devlink, msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL); } +static void devlink_trap_policers_notify_register (struct devlink *devlink) +{ +struct devlink_trap_policer_item *policer_item; + +list_for_each_entry (policer_item, &devlink->trap_policer_list, list) +devlink_trap_policer_notify (devlink, policer_item, +DEVLINK_CMD_TRAP_POLICER_NEW ); +} + +static void devlink_trap_policers_notify_unregister (struct devlink *devlink) +{ +struct devlink_trap_policer_item *policer_item; + +list_for_each_entry_reverse (policer_item, &devlink->trap_policer_list, + list) +devlink_trap_policer_notify (devlink, policer_item, +DEVLINK_CMD_TRAP_POLICER_DEL ); +} +static int devlink_trap_policer_register (struct devlink *devlink,const struct devlink_trap_policer *policer)
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 2/15 devlink: push port related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put port related code into a separate file.
---v1->v2:
- rebased on top of recent net-next
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 32 +- net/devlink/leftover.c | 1550 +---------------------------------- net/devlink/port.c | 1515 ++++++++++++++++++++++++++++++++++ 4 files changed, 1558 insertions(+), 1541 deletions(-) create mode 100644 net/devlink/port.c
net/devlink/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o health.o +obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o health.o
net/devlink/devl_internal.h +31 -1
@@ -3,6 +3,7 @@* Copyright (c) 2016 Jiri Pirko <[email protected]> */ +#include <linux/etherdevice.h> #include <linux/mutex.h> #include <linux/netdevice.h> #include <linux/notifier.h>
@@ -11,6 +12,8 @@#include <linux/xarray.h> #include <net/devlink.h> #include <net/net_namespace.h> +#include <net/rtnetlink.h> +#include <rdma/ib_verbs.h> #include "netlink_gen.h"
@@ -149,16 +152,37 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)/* Notify */ void devlink_notify (struct devlink *devlink,enum devlink_command cmd); +void devlink_ports_notify_register (struct devlink *devlink); +void devlink_ports_notify_unregister (struct devlink *devlink);/* Ports */ +#define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \ + WARN_ON_ONCE(!(devlink_port)->initialized) + +struct devlink_port *devlink_port_get_by_index (struct devlink *devlink, +unsigned int port_index);int devlink_port_netdevice_event (struct notifier_block *nb,unsigned long event,void *ptr); -struct devlink_port *devlink_port_get_from_info (struct devlink *devlink,struct genl_info *info);struct devlink_port *devlink_port_get_from_attrs (struct devlink *devlink,struct nlattr **attrs); +/* Linecards */ +struct devlink_linecard { +struct list_head list; +struct devlink *devlink; +unsigned int index; +const struct devlink_linecard_ops *ops; +void *priv; +enum devlink_linecard_state state; +struct mutex state_lock;/* Protects state */ +const char *type; +struct devlink_linecard_type *types; +unsigned int types_count; +struct devlink *nested_devlink; +}; +/* Reload */ bool devlink_reload_actions_valid (const struct devlink_ops *ops); int devlink_reload(struct devlink *devlink, struct net *dest_net,
@@ -190,6 +214,12 @@ int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)int devlink_nl_cmd_eswitch_set_doit (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_flash_update (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_selftests_run (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_port_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_port_split_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_port_unsplit_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_port_new_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_port_del_doit (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/leftover.c +11 -1539
1,604 lines not on this page · raw message
net/devlink/port.c new file +1515 -0
1,327 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.41.0
Part of the diff is not shown here. View the raw message.
Jiri Pirko
maintainerPATCH v2 3/15 devlink: push shared buffer related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put sb related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 9 + net/devlink/leftover.c | 1338 +++++------------------------------ net/devlink/sb.c | 996 ++++++++++++++++++++++++++ 4 files changed, 1180 insertions(+), 1165 deletions(-) create mode 100644 net/devlink/sb.c
net/devlink/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o health.o +obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o health.o \
net/devlink/devl_internal.h +9 -0
@@ -220,6 +220,15 @@ int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_port_new_doit (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_port_del_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_sb_pool_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_sb_port_pool_set_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_sb_tc_pool_bind_set_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_sb_occ_snapshot_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_sb_occ_max_clear_doit (struct sk_buff *skb, +struct genl_info *info);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/leftover.c +174 -1164
1,411 lines not on this page · raw message
net/devlink/sb.c new file +996 -0
996 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 4/15 devlink: move and rename devlink_dpipe_send_and_alloc_skb() helper
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Since both dpipe and resource code is using this helper, in preparation for code split to separate files, move devlink_dpipe_send_and_alloc_skb() helper into netlink.c. Rename it on the way.
--- net/devlink/devl_internal.h | 2 ++ net/devlink/leftover.c | 34 +++++++++------------------------- net/devlink/netlink.c | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-)
net/devlink/devl_internal.h +2 -0
@@ -150,6 +150,8 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)return 0 ; } +int devlink_nl_msg_reply_and_new (struct sk_buff **msg,struct genl_info *info); +/* Notify */ void devlink_notify (struct devlink *devlink,enum devlink_command cmd);void devlink_ports_notify_register (struct devlink *devlink);
net/devlink/leftover.c +9 -25
@@ -1277,22 +1277,6 @@ static int devlink_dpipe_table_put(struct sk_buff *skb,return -EMSGSIZE ; } -static int devlink_dpipe_send_and_alloc_skb (struct sk_buff **pskb, -struct genl_info *info) -{ -int err; - -if (*pskb) { - err =genlmsg_reply (*pskb, info); -if (err) -return err; - } - *pskb =genlmsg_new (GENLMSG_DEFAULT_SIZE ,GFP_KERNEL ); -if (!*pskb) -return -ENOMEM ; -return 0 ; -} - static int devlink_dpipe_tables_fill(struct genl_info *info, enum devlink_command cmd, int flags, struct list_head *dpipe_tables,
@@ -1311,7 +1295,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, table =list_first_entry (dpipe_tables, struct devlink_dpipe_table, list); start_again: - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err;
@@ -1358,7 +1342,7 @@ static int devlink_dpipe_tables_fill(struct genl_info *info, nlh =nlmsg_put (skb, info->snd_portid, info->snd_seq,NLMSG_DONE ,0 , flags |NLM_F_MULTI );if (!nlh) { - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err; goto send_done;
@@ -1551,8 +1535,8 @@ int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx)struct devlink *devlink;int err; - err =devlink_dpipe_send_and_alloc_skb (&dump_ctx->skb, - dump_ctx->info); + err =devlink_nl_msg_reply_and_new (&dump_ctx->skb, + dump_ctx->info);if (err)return err;
@@ -1638,7 +1622,7 @@ static int devlink_dpipe_entries_fill(struct genl_info *info, nlh =nlmsg_put (dump_ctx.skb, info->snd_portid, info->snd_seq,NLMSG_DONE ,0 , flags |NLM_F_MULTI );if (!nlh) { - err =devlink_dpipe_send_and_alloc_skb (&dump_ctx.skb, info); + err =devlink_nl_msg_reply_and_new (&dump_ctx.skb, info);if (err)return err; goto send_done;
@@ -1746,7 +1730,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, i =0 ; start_again: - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err;
@@ -1782,7 +1766,7 @@ static int devlink_dpipe_headers_fill(struct genl_info *info, nlh =nlmsg_put (skb, info->snd_portid, info->snd_seq,NLMSG_DONE ,0 , flags |NLM_F_MULTI );if (!nlh) { - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err; goto send_done;
@@ -2047,7 +2031,7 @@ static int devlink_resource_fill(struct genl_info *info, resource =list_first_entry (&devlink->resource_list, struct devlink_resource, list); start_again: - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err;
@@ -2086,7 +2070,7 @@ static int devlink_resource_fill(struct genl_info *info, nlh =nlmsg_put (skb, info->snd_portid, info->snd_seq,NLMSG_DONE ,0 , flags |NLM_F_MULTI );if (!nlh) { - err =devlink_dpipe_send_and_alloc_skb (&skb, info); + err =devlink_nl_msg_reply_and_new (&skb, info);if (err)return err; goto send_done;
net/devlink/netlink.c +15 -0
@@ -82,6 +82,21 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_REGION_DIRECT] = { .type = NLA_FLAG }, }; +int devlink_nl_msg_reply_and_new (struct sk_buff **msg,struct genl_info *info) +{ +int err; + +if (*msg) { + err =genlmsg_reply (*msg, info); +if (err) +return err; + } + *msg =genlmsg_new (GENLMSG_DEFAULT_SIZE ,GFP_KERNEL ); +if (!*msg) +return -ENOMEM ; +return 0 ; +} +struct devlink *devlink_get_from_attrs_lock (struct net *net,struct nlattr **attrs) {
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 5/15 devlink: push dpipe related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put dpipe related code into a separate file.
--- net/devlink/Makefile | 3 +- net/devlink/devl_internal.h | 7 + net/devlink/dpipe.c | 917 ++++++++++++++++++++++++++++++++++++ net/devlink/leftover.c | 894 ----------------------------------- 4 files changed, 926 insertions(+), 895 deletions(-) create mode 100644 net/devlink/dpipe.c
net/devlink/Makefile +2 -1
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o health.o \ +obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ + health.o
net/devlink/devl_internal.h +7 -0
@@ -231,6 +231,13 @@ int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_sb_occ_max_clear_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_dpipe_table_get (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_dpipe_entries_get (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_dpipe_headers_get (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_dpipe_table_counters_set (struct sk_buff *skb, +struct genl_info *info);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/dpipe.c new file +917 -0
917 lines not on this page · raw message
net/devlink/leftover.c +0 -894
918 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 6/15 devlink: push resource related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put resource related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 2 + net/devlink/leftover.c | 574 ----------------------------------- net/devlink/resource.c | 579 ++++++++++++++++++++++++++++++++++++ 4 files changed, 582 insertions(+), 575 deletions(-) create mode 100644 net/devlink/resource.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - health.o + resource.o health.o
net/devlink/devl_internal.h +2 -0
@@ -238,6 +238,8 @@ int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_dpipe_table_counters_set (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_resource_set (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_resource_dump (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/leftover.c +0 -574
592 lines not on this page · raw message
net/devlink/resource.c new file +579 -0
579 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 7/15 devlink: push param related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put param related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 9 + net/devlink/leftover.c | 859 ----------------------------------- net/devlink/param.c | 865 ++++++++++++++++++++++++++++++++++++ 4 files changed, 875 insertions(+), 860 deletions(-) create mode 100644 net/devlink/param.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - resource.o health.o + resource.o param.o health.o
net/devlink/devl_internal.h +9 -0
@@ -156,6 +156,8 @@ int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);void devlink_notify (struct devlink *devlink,enum devlink_command cmd);void devlink_ports_notify_register (struct devlink *devlink);void devlink_ports_notify_unregister (struct devlink *devlink); +void devlink_params_notify_register (struct devlink *devlink); +void devlink_params_notify_unregister (struct devlink *devlink);/* Ports */ #define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \
@@ -240,6 +242,13 @@ int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_resource_set (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_resource_dump (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_param_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_port_param_get_dumpit (struct sk_buff *msg, +struct netlink_callback *cb); +int devlink_nl_cmd_port_param_get_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_port_param_set_doit (struct sk_buff *skb, +struct genl_info *info);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/leftover.c +0 -859
871 lines not on this page · raw message
net/devlink/param.c new file +865 -0
865 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 8/15 devlink: push region related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put region related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 6 + net/devlink/leftover.c | 1506 +++-------------------------------- net/devlink/region.c | 1260 +++++++++++++++++++++++++++++ 4 files changed, 1392 insertions(+), 1382 deletions(-) create mode 100644 net/devlink/region.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - resource.o param.o health.o + resource.o param.o region.o health.o
net/devlink/devl_internal.h +6 -0
@@ -158,6 +158,8 @@ void devlink_ports_notify_register(struct devlink *devlink);void devlink_ports_notify_unregister (struct devlink *devlink);void devlink_params_notify_register (struct devlink *devlink);void devlink_params_notify_unregister (struct devlink *devlink); +void devlink_regions_notify_register (struct devlink *devlink); +void devlink_regions_notify_unregister (struct devlink *devlink);/* Ports */ #define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \
@@ -249,6 +251,10 @@ int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_port_param_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_region_new (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_region_del (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_region_read_dumpit (struct sk_buff *skb, +struct netlink_callback *cb);int devlink_nl_cmd_health_reporter_set_doit (struct sk_buff *skb,struct genl_info *info); int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
net/devlink/leftover.c +125 -1381
1,549 lines not on this page · raw message
net/devlink/region.c new file +1260 -0
1,260 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 9/15 devlink: use tracepoint_enabled() helper
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
In preparation for the trap code move, use tracepoint_enabled() helper instead of trace_devlink_trap_report_enabled() which would not be defined in that scope.
--- net/devlink/leftover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/devlink/leftover.c +1 -1
@@ -3131,7 +3131,7 @@ void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb,devlink_trap_stats_update (trap_item->stats, skb->len);devlink_trap_stats_update (trap_item->group_item->stats, skb->len); -if (trace_devlink_trap_report_enabled ()) { +if (tracepoint_enabled (devlink_trap_report)) {struct devlink_trap_metadata metadata = {}; devlink_trap_report_metadata_set(&metadata, trap_item,
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 10/15 devlink: push trap related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put trap related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 11 + net/devlink/leftover.c | 2915 +++++++---------------------------- net/devlink/trap.c | 1861 ++++++++++++++++++++++ 4 files changed, 2400 insertions(+), 2389 deletions(-) create mode 100644 net/devlink/trap.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - resource.o param.o region.o health.o + resource.o param.o region.o health.o trap.o
net/devlink/devl_internal.h +11 -0
@@ -160,6 +160,12 @@ void devlink_params_notify_register(struct devlink *devlink);void devlink_params_notify_unregister (struct devlink *devlink);void devlink_regions_notify_register (struct devlink *devlink);void devlink_regions_notify_unregister (struct devlink *devlink); +void devlink_trap_policers_notify_register (struct devlink *devlink); +void devlink_trap_policers_notify_unregister (struct devlink *devlink); +void devlink_trap_groups_notify_register (struct devlink *devlink); +void devlink_trap_groups_notify_unregister (struct devlink *devlink); +void devlink_traps_notify_register (struct devlink *devlink); +void devlink_traps_notify_unregister (struct devlink *devlink);/* Ports */ #define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \
@@ -267,3 +273,8 @@ int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_health_reporter_test_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_trap_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_trap_group_set_doit (struct sk_buff *skb, +struct genl_info *info); +int devlink_nl_cmd_trap_policer_set_doit (struct sk_buff *skb, +struct genl_info *info);
net/devlink/leftover.c +527 -2388
2,975 lines not on this page · raw message
net/devlink/trap.c new file +1861 -0
1,861 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.41.0
Part of the diff is not shown here. View the raw message.
Jiri Pirko
maintainerPATCH v2 11/15 devlink: push rate related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put rate related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 5 + net/devlink/leftover.c | 718 ----------------------------------- net/devlink/rate.c | 722 ++++++++++++++++++++++++++++++++++++ 4 files changed, 728 insertions(+), 719 deletions(-) create mode 100644 net/devlink/rate.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - resource.o param.o region.o health.o trap.o + resource.o param.o region.o health.o trap.o rate.o
net/devlink/devl_internal.h +5 -0
@@ -166,6 +166,8 @@ void devlink_trap_groups_notify_register(struct devlink *devlink);void devlink_trap_groups_notify_unregister (struct devlink *devlink);void devlink_traps_notify_register (struct devlink *devlink);void devlink_traps_notify_unregister (struct devlink *devlink); +void devlink_rates_notify_register (struct devlink *devlink); +void devlink_rates_notify_unregister (struct devlink *devlink);/* Ports */ #define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \
@@ -278,3 +280,6 @@ int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info);int devlink_nl_cmd_trap_policer_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_rate_set_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_rate_new_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_rate_del_doit (struct sk_buff *skb,struct genl_info *info);
net/devlink/leftover.c +0 -718
742 lines not on this page · raw message
net/devlink/rate.c new file +722 -0
722 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 12/15 devlink: push linecard related code into separate file
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Cut out another chunk from leftover.c and put linecard related code into a separate file.
--- net/devlink/Makefile | 2 +- net/devlink/devl_internal.h | 34 +- net/devlink/leftover.c | 599 ----------------------------------- net/devlink/linecard.c | 606 ++++++++++++++++++++++++++++++++++++ 4 files changed, 626 insertions(+), 615 deletions(-) create mode 100644 net/devlink/linecard.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ - resource.o param.o region.o health.o trap.o rate.o + resource.o param.o region.o health.o trap.o rate.o linecard.o
net/devlink/devl_internal.h +19 -15
@@ -168,6 +168,8 @@ void devlink_traps_notify_register(struct devlink *devlink);void devlink_traps_notify_unregister (struct devlink *devlink);void devlink_rates_notify_register (struct devlink *devlink);void devlink_rates_notify_unregister (struct devlink *devlink); +void devlink_linecards_notify_register (struct devlink *devlink); +void devlink_linecards_notify_unregister (struct devlink *devlink);/* Ports */ #define ASSERT_DEVLINK_PORT_INITIALIZED (devlink_port) \
@@ -182,21 +184,6 @@ devlink_port_get_from_info(struct devlink *devlink, struct genl_info *info);struct devlink_port *devlink_port_get_from_attrs (struct devlink *devlink,struct nlattr **attrs); -/* Linecards */ -struct devlink_linecard { -struct list_head list; -struct devlink *devlink; -unsigned int index; -const struct devlink_linecard_ops *ops; -void *priv; -enum devlink_linecard_state state; -struct mutex state_lock;/* Protects state */ -const char *type; -struct devlink_linecard_type *types; -unsigned int types_count; -struct devlink *nested_devlink; -}; -/* Reload */ bool devlink_reload_actions_valid (const struct devlink_ops *ops); int devlink_reload(struct devlink *devlink, struct net *dest_net,
@@ -222,6 +209,21 @@ int devlink_resources_validate(struct devlink *devlink,int devlink_rate_nodes_check (struct devlink *devlink,u16 mode,struct netlink_ext_ack *extack); +/* Linecards */ +struct devlink_linecard { +struct list_head list; +struct devlink *devlink; +unsigned int index; +const struct devlink_linecard_ops *ops; +void *priv; +enum devlink_linecard_state state; +struct mutex state_lock;/* Protects state */ +const char *type; +struct devlink_linecard_type *types; +unsigned int types_count; +struct devlink *nested_devlink; +}; +/* Devlink nl cmds */ int devlink_nl_cmd_reload (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_eswitch_get_doit (struct sk_buff *skb,struct genl_info *info);
@@ -283,3 +285,5 @@ int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb,int devlink_nl_cmd_rate_set_doit (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_rate_new_doit (struct sk_buff *skb,struct genl_info *info);int devlink_nl_cmd_rate_del_doit (struct sk_buff *skb,struct genl_info *info); +int devlink_nl_cmd_linecard_set_doit (struct sk_buff *skb, +struct genl_info *info);
net/devlink/leftover.c +0 -599
608 lines not on this page · raw message
net/devlink/linecard.c new file +606 -0
606 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 13/15 devlink: move tracepoint definitions into core.c
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Move remaining tracepoint definitions to most suitable file core.c.
--- net/devlink/core.c | 6 ++++++ net/devlink/leftover.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
net/devlink/core.c +6 -0
@@ -5,9 +5,15 @@*/ #include <net/genetlink.h> +#define CREATE_TRACE_POINTS +#include <trace/events/devlink.h> #include "devl_internal.h" +EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_hwmsg); +EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_hwerr); +EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_trap_report); +DEFINE_XARRAY_FLAGS (devlinks,XA_FLAGS_ALLOC );void *devlink_priv (struct devlink *devlink)
net/devlink/leftover.c +0 -6
@@ -28,15 +28,9 @@#include <net/net_namespace.h> #include <net/sock.h> #include <net/devlink.h> -#define CREATE_TRACE_POINTS -#include <trace/events/devlink.h> #include "devl_internal.h" -EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_hwmsg); -EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_hwerr); -EXPORT_TRACEPOINT_SYMBOL_GPL (devlink_trap_report); -const struct genl_small_ops devlink_nl_small_ops[40 ] = { { .cmd =DEVLINK_CMD_PORT_SET ,
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 14/15 devlink: move small_ops definition into netlink.c
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Move the generic netlink small_ops definition where they are consumed, into netlink.c
--- net/devlink/devl_internal.h | 2 - net/devlink/leftover.c | 251 ------------------------------------ net/devlink/netlink.c | 251 ++++++++++++++++++++++++++++++++++++ 3 files changed, 251 insertions(+), 253 deletions(-)
net/devlink/devl_internal.h +0 -2
@@ -121,8 +121,6 @@ typedef int devlink_nl_dump_one_func_t(struct sk_buff *msg,struct netlink_callback *cb, int flags); -extern const struct genl_small_ops devlink_nl_small_ops[40 ]; -struct devlink *devlink_get_from_attrs_lock (struct net *net,struct nlattr **attrs);
net/devlink/leftover.c +0 -251
257 lines not on this page · raw message
net/devlink/netlink.c +251 -0
257 lines not on this page · raw message
Signature · 1 line
2.41.0
Jiri Pirko
maintainerPATCH v2 15/15 devlink: move devlink_notify_register/unregister() to dev.c
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
At last, move the last bits out of leftover.c,
the devlink_notify_register/unregister() functions to dev.c
--- net/devlink/Makefile | 2 +- net/devlink/dev.c | 28 +++++++++++++++++- net/devlink/devl_internal.h | 6 ++-- net/devlink/leftover.c | 58 ------------------------------------- 4 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 net/devlink/leftover.c
net/devlink/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ +obj-y := core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \ resource.o param.o region.o health.o trap.o rate.o linecard.o
net/devlink/dev.c +27 -1
@@ -174,7 +174,7 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,return -EMSGSIZE ; } -void devlink_notify (struct devlink *devlink,enum devlink_command cmd) +static void devlink_notify (struct devlink *devlink,enum devlink_command cmd) {struct sk_buff *msg;int err;
@@ -230,6 +230,32 @@ int devlink_nl_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)return devlink_nl_dumpit (msg, cb, devlink_nl_get_dump_one); } +void devlink_notify_register (struct devlink *devlink) +{ +devlink_notify (devlink,DEVLINK_CMD_NEW ); +devlink_linecards_notify_register (devlink); +devlink_ports_notify_register (devlink); +devlink_trap_policers_notify_register (devlink); +devlink_trap_groups_notify_register (devlink); +devlink_traps_notify_register (devlink); +devlink_rates_notify_register (devlink); +devlink_regions_notify_register (devlink); +devlink_params_notify_register (devlink); +} + +void devlink_notify_unregister (struct devlink *devlink) +{ +devlink_params_notify_unregister (devlink); +devlink_regions_notify_unregister (devlink); +devlink_rates_notify_unregister (devlink); +devlink_traps_notify_unregister (devlink); +devlink_trap_groups_notify_unregister (devlink); +devlink_trap_policers_notify_unregister (devlink); +devlink_ports_notify_unregister (devlink); +devlink_linecards_notify_unregister (devlink); +devlink_notify (devlink,DEVLINK_CMD_DEL ); +} +static void devlink_reload_failed_set (struct devlink *devlink,bool reload_failed) {
net/devlink/devl_internal.h +2 -4
@@ -124,9 +124,6 @@ typedef int devlink_nl_dump_one_func_t(struct sk_buff *msg,struct devlink *devlink_get_from_attrs_lock (struct net *net,struct nlattr **attrs); -void devlink_notify_unregister (struct devlink *devlink); -void devlink_notify_register (struct devlink *devlink); -int devlink_nl_dumpit (struct sk_buff *msg,struct netlink_callback *cb,devlink_nl_dump_one_func_t *dump_one);
@@ -151,7 +148,8 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)int devlink_nl_msg_reply_and_new (struct sk_buff **msg,struct genl_info *info);/* Notify */ -void devlink_notify (struct devlink *devlink,enum devlink_command cmd); +void devlink_notify_register (struct devlink *devlink); +void devlink_notify_unregister (struct devlink *devlink);void devlink_ports_notify_register (struct devlink *devlink);void devlink_ports_notify_unregister (struct devlink *devlink);void devlink_params_notify_register (struct devlink *devlink);
net/devlink/leftover.c deleted +0 -58
58 lines not on this page · raw message
Signature · 1 line
2.41.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Mon, 28 Aug 2023 08:16:42 +0200 you wrote:
From: Jiri Pirko <[email protected]>
This patchset finishes a move Jakub started and Moshe continued in the past. I was planning to do this for a long time, so here it is, finally.
This patchset does not change any behaviour. It just splits
leftover.cinto per-object files and do necessary changes, like declaring functions used from other code, on the way.[...]
Here is the summary with links:
- [net-next,v2,01/15] devlink: push object register/unregister notifications into separate helpers
https://git.kernel.org/netdev/net-next/c/56e65312830e - [net-next,v2,02/15] devlink: push port related code into separate file https://git.kernel.org/netdev/net-next/c/eec1e5ea1d71 - [net-next,v2,03/15] devlink: push shared buffer related code into separate file https://git.kernel.org/netdev/net-next/c/2b4d8bb08889 - [net-next,v2,04/15] devlink: move and rename devlink_dpipe_send_and_alloc_skb() helper https://git.kernel.org/netdev/net-next/c/2475ed158c47 - [net-next,v2,05/15] devlink: push dpipe related code into separate file https://git.kernel.org/netdev/net-next/c/a9fd44b15fc5 - [net-next,v2,06/15] devlink: push resource related code into separate file https://git.kernel.org/netdev/net-next/c/a9f960074ecd - [net-next,v2,07/15] devlink: push param related code into separate file https://git.kernel.org/netdev/net-next/c/830c41e1e987 - [net-next,v2,08/15] devlink: push region related code into separate file https://git.kernel.org/netdev/net-next/c/1aa47ca1f52e - [net-next,v2,09/15] devlink: use tracepoint_enabled() helper https://git.kernel.org/netdev/net-next/c/85facf94fd80 - [net-next,v2,10/15] devlink: push trap related code into separate file https://git.kernel.org/netdev/net-next/c/4bbdec80ff27 - [net-next,v2,11/15] devlink: push rate related code into separate file https://git.kernel.org/netdev/net-next/c/7cc7194e85ca - [net-next,v2,12/15] devlink: push linecard related code into separate file https://git.kernel.org/netdev/net-next/c/9edbe6f36c5f - [net-next,v2,13/15] devlink: move tracepoint definitions into core.c https://git.kernel.org/netdev/net-next/c/890c55667437 - [net-next,v2,14/15] devlink: move small_ops definition into netlink.c https://git.kernel.org/netdev/net-next/c/29a390d17748 - [net-next,v2,15/15] devlink: move devlink_notify_register/unregister() to dev.c https://git.kernel.org/netdev/net-next/c/71179ac5c211
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html