Commit dfefcb0c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-move-devlink-dev-code-to-a-separate-file' 

Moshe Shemesh says:

====================
devlink: Move devlink dev code to a separate file

This patchset is moving code from the file leftover.c to new file dev.c.
About 1.3K lines are moved by this patchset covering most of the devlink
dev object callbacks and functionality: reload, eswitch, info, flash and
selftest.
====================

Link: https://lore.kernel.org/r/1675349226-284034-1-git-send-email-moshe@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d795527d 7c976c7c

net/devlink/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-y := leftover.o core.o netlink.o
 
obj-y := leftover.o core.o netlink.o dev.o

net/devlink/dev.c

0 → 100644
+1343 −0

File added.

Preview size limit exceeded, changes collapsed.

net/devlink/devl_internal.h

+30 −0
Original line number Diff line number Diff line
@@ -139,6 +139,16 @@ devlink_dump_state(struct netlink_callback *cb) 
	return (struct devlink_nl_dump_state *)cb->ctx;

}



static inline int

devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)

{

	if (nla_put_string(msg, DEVLINK_ATTR_BUS_NAME, devlink->dev->bus->name))

		return -EMSGSIZE;

	if (nla_put_string(msg, DEVLINK_ATTR_DEV_NAME, dev_name(devlink->dev)))

		return -EMSGSIZE;

	return 0;

}



/* Commands */

extern const struct devlink_cmd devl_cmd_get;

extern const struct devlink_cmd devl_cmd_port_get;
@@ -157,6 +167,9 @@ extern const struct devlink_cmd devl_cmd_rate_get; 
extern const struct devlink_cmd devl_cmd_linecard_get;

extern const struct devlink_cmd devl_cmd_selftests_get;



/* Notify */

void devlink_notify(struct devlink *devlink, enum devlink_command cmd);



/* Ports */

int devlink_port_netdevice_event(struct notifier_block *nb,

				 unsigned long event, void *ptr);
@@ -176,6 +189,12 @@ static inline bool devlink_reload_supported(const struct devlink_ops *ops) 
	return ops->reload_down && ops->reload_up;

}



/* Resources */

struct devlink_resource;

int devlink_resources_validate(struct devlink *devlink,

			       struct devlink_resource *resource,

			       struct genl_info *info);



/* Line cards */

struct devlink_linecard;
@@ -183,8 +202,19 @@ struct devlink_linecard * 
devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);



/* Rates */

int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,

			     struct netlink_ext_ack *extack);

struct devlink_rate *

devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);

struct devlink_rate *

devlink_rate_node_get_from_info(struct devlink *devlink,

				struct genl_info *info);

/* Devlink nl cmds */

int devlink_nl_cmd_get_doit(struct sk_buff *skb, struct genl_info *info);

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);

int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);

int devlink_nl_cmd_info_get_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_get_doit(struct sk_buff *skb, struct genl_info *info);

int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info);

net/devlink/leftover.c

+61 −1409

File changed.

Preview size limit exceeded, changes collapsed.