Commit 12af29e7 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Jakub Kicinski
Browse files

devlink: Move health common function to health file 



Now that all devlink health callbacks and related code are in file
health.c move common health functions and devlink_health_reporter struct
to be local in health.c file.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c9311ee1

net/devlink/devl_internal.h

+0 −47
Original line number Diff line number Diff line
@@ -200,53 +200,6 @@ int devlink_resources_validate(struct devlink *devlink, 
			       struct devlink_resource *resource,

			       struct genl_info *info);



/* Health */

struct devlink_health_reporter {

	struct list_head list;

	void *priv;

	const struct devlink_health_reporter_ops *ops;

	struct devlink *devlink;

	struct devlink_port *devlink_port;

	struct devlink_fmsg *dump_fmsg;

	struct mutex dump_lock; /* lock parallel read/write from dump buffers */

	u64 graceful_period;

	bool auto_recover;

	bool auto_dump;

	u8 health_state;

	u64 dump_ts;

	u64 dump_real_ts;

	u64 error_count;

	u64 recovery_count;

	u64 last_recovery_ts;

};



struct devlink_health_reporter *

devlink_health_reporter_find_by_name(struct devlink *devlink,

				     const char *reporter_name);

struct devlink_health_reporter *

devlink_port_health_reporter_find_by_name(struct devlink_port *devlink_port,

					  const char *reporter_name);

struct devlink_health_reporter *

devlink_health_reporter_get_from_attrs(struct devlink *devlink,

				       struct nlattr **attrs);

struct devlink_health_reporter *

devlink_health_reporter_get_from_info(struct devlink *devlink,

				      struct genl_info *info);

int

devlink_nl_health_reporter_fill(struct sk_buff *msg,

				struct devlink_health_reporter *reporter,

				enum devlink_command cmd, u32 portid,

				u32 seq, int flags);

int devlink_health_do_dump(struct devlink_health_reporter *reporter,

			   void *priv_ctx,

			   struct netlink_ext_ack *extack);

int devlink_fmsg_dumpit(struct devlink_fmsg *fmsg, struct sk_buff *skb,

			struct netlink_callback *cb,

			enum devlink_command cmd);



struct devlink_fmsg *devlink_fmsg_alloc(void);

void devlink_fmsg_free(struct devlink_fmsg *fmsg);



/* Line cards */

struct devlink_linecard;

net/devlink/health.c

+32 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct devlink_fmsg { 
			      */

};



struct devlink_fmsg *devlink_fmsg_alloc(void)

static struct devlink_fmsg *devlink_fmsg_alloc(void)

{

	struct devlink_fmsg *fmsg;
@@ -40,7 +40,7 @@ struct devlink_fmsg *devlink_fmsg_alloc(void) 
	return fmsg;

}



void devlink_fmsg_free(struct devlink_fmsg *fmsg)

static void devlink_fmsg_free(struct devlink_fmsg *fmsg)

{

	struct devlink_fmsg_item *item, *tmp;
@@ -51,6 +51,25 @@ void devlink_fmsg_free(struct devlink_fmsg *fmsg) 
	kfree(fmsg);

}



struct devlink_health_reporter {

	struct list_head list;

	void *priv;

	const struct devlink_health_reporter_ops *ops;

	struct devlink *devlink;

	struct devlink_port *devlink_port;

	struct devlink_fmsg *dump_fmsg;

	struct mutex dump_lock; /* lock parallel read/write from dump buffers */

	u64 graceful_period;

	bool auto_recover;

	bool auto_dump;

	u8 health_state;

	u64 dump_ts;

	u64 dump_real_ts;

	u64 error_count;

	u64 recovery_count;

	u64 last_recovery_ts;

};



void *

devlink_health_reporter_priv(struct devlink_health_reporter *reporter)

{
@@ -70,7 +89,7 @@ __devlink_health_reporter_find_by_name(struct list_head *reporter_list, 
	return NULL;

}



struct devlink_health_reporter *

static struct devlink_health_reporter *

devlink_health_reporter_find_by_name(struct devlink *devlink,

				     const char *reporter_name)

{
@@ -78,7 +97,7 @@ devlink_health_reporter_find_by_name(struct devlink *devlink, 
						      reporter_name);

}



struct devlink_health_reporter *

static struct devlink_health_reporter *

devlink_port_health_reporter_find_by_name(struct devlink_port *devlink_port,

					  const char *reporter_name)

{
@@ -239,7 +258,7 @@ devlink_health_reporter_destroy(struct devlink_health_reporter *reporter) 
}

EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);



int

static int

devlink_nl_health_reporter_fill(struct sk_buff *msg,

				struct devlink_health_reporter *reporter,

				enum devlink_command cmd, u32 portid,
@@ -310,7 +329,7 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg, 
	return -EMSGSIZE;

}



struct devlink_health_reporter *

static struct devlink_health_reporter *

devlink_health_reporter_get_from_attrs(struct devlink *devlink,

				       struct nlattr **attrs)

{
@@ -330,7 +349,7 @@ devlink_health_reporter_get_from_attrs(struct devlink *devlink, 
								 reporter_name);

}



struct devlink_health_reporter *

static struct devlink_health_reporter *

devlink_health_reporter_get_from_info(struct devlink *devlink,

				      struct genl_info *info)

{
@@ -517,7 +536,7 @@ devlink_health_dump_clear(struct devlink_health_reporter *reporter) 
	reporter->dump_fmsg = NULL;

}



int devlink_health_do_dump(struct devlink_health_reporter *reporter,

static int devlink_health_do_dump(struct devlink_health_reporter *reporter,

				  void *priv_ctx,

				  struct netlink_ext_ack *extack)

{
@@ -1157,7 +1176,7 @@ static int devlink_fmsg_snd(struct devlink_fmsg *fmsg, 
	return err;

}



int devlink_fmsg_dumpit(struct devlink_fmsg *fmsg, struct sk_buff *skb,

static int devlink_fmsg_dumpit(struct devlink_fmsg *fmsg, struct sk_buff *skb,

			       struct netlink_callback *cb,

			       enum devlink_command cmd)

{