Commit 4b151e75 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-finish-file-split-and-get-retire-leftover-c' 

Jiri Pirko says:

====================
devlink: finish file split and get retire leftover.c

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.
====================

Link: https://lore.kernel.org/r/20230828061657.300667-1-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8be6f88b 71179ac5

net/devlink/Makefile

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



obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o health.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/core.c

+6 −0
Original line number Diff line number Diff line
@@ -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/dev.c

+27 −1
Original line number Diff line number Diff line
@@ -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

+88 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2016 Jiri Pirko <jiri@mellanox.com>

 */



#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"
@@ -118,14 +121,9 @@ 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);



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);
@@ -147,13 +145,36 @@ 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_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);

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

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

	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,
@@ -184,12 +205,62 @@ 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);

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_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_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_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_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,
@@ -202,3 +273,13 @@ 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);

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/dpipe.c

0 → 100644
+917 −0

File added.

Preview size limit exceeded, changes collapsed.