Commit ded6f77c authored by Jiri Pirko's avatar Jiri Pirko Committed by Paolo Abeni
Browse files

devlink: extend multicast filtering by port index 



Expose the previously introduced notification multicast messages
filtering infrastructure and allow the user to select messages using
port index.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 13b127d2

Documentation/netlink/specs/devlink.yaml

+1 −0
Original line number Diff line number Diff line
@@ -2264,3 +2264,4 @@ operations: 
          attributes:

            - bus-name

            - dev-name

            - port-index

net/devlink/devl_internal.h

+9 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ struct devlink_obj_desc { 
	struct rcu_head rcu;

	const char *bus_name;

	const char *dev_name;

	unsigned int port_index;

	bool port_index_valid;

	long data[];

};
@@ -206,6 +208,13 @@ static inline void devlink_nl_obj_desc_init(struct devlink_obj_desc *desc, 
	desc->dev_name = dev_name(devlink->dev);

}



static inline void devlink_nl_obj_desc_port_set(struct devlink_obj_desc *desc,

						struct devlink_port *devlink_port)

{

	desc->port_index = devlink_port->index;

	desc->port_index_valid = true;

}



int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data);



static inline void devlink_nl_notify_send_desc(struct devlink *devlink,

net/devlink/health.c

+5 −1
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter, 
				   enum devlink_command cmd)

{

	struct devlink *devlink = reporter->devlink;

	struct devlink_obj_desc desc;

	struct sk_buff *msg;

	int err;
@@ -509,7 +510,10 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter, 
		return;

	}



	devlink_nl_notify_send(devlink, msg);

	devlink_nl_obj_desc_init(&desc, devlink);

	if (reporter->devlink_port)

		devlink_nl_obj_desc_port_set(&desc, reporter->devlink_port);

	devlink_nl_notify_send_desc(devlink, msg, &desc);

}



void

net/devlink/netlink.c

+9 −1
Original line number Diff line number Diff line
@@ -73,8 +73,13 @@ int devlink_nl_notify_filter_set_doit(struct sk_buff *skb, 
		flt->dev_name = pos;

	}



	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {

		flt->port_index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);

		flt->port_index_valid = true;

	}



	/* Don't attach empty filter. */

	if (!flt->bus_name && !flt->dev_name) {

	if (!flt->bus_name && !flt->dev_name && !flt->port_index_valid) {

		kfree(flt);

		flt = NULL;

	}
@@ -101,6 +106,9 @@ static bool devlink_obj_desc_match(const struct devlink_obj_desc *desc, 
	if (desc->dev_name && flt->dev_name &&

	    strcmp(desc->dev_name, flt->dev_name))

		return false;

	if (desc->port_index_valid && flt->port_index_valid &&

	    desc->port_index != flt->port_index)

		return false;

	return true;

}

net/devlink/netlink_gen.c

+3 −2
Original line number Diff line number Diff line
@@ -561,9 +561,10 @@ static const struct nla_policy devlink_selftests_run_nl_policy[DEVLINK_ATTR_SELF 
};



/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */

static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {

static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {

	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },

	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },

	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },

};



/* Ops table for devlink */
@@ -1243,7 +1244,7 @@ const struct genl_split_ops devlink_nl_ops[74] = { 
		.cmd		= DEVLINK_CMD_NOTIFY_FILTER_SET,

		.doit		= devlink_nl_notify_filter_set_doit,

		.policy		= devlink_notify_filter_set_nl_policy,

		.maxattr	= DEVLINK_ATTR_DEV_NAME,

		.maxattr	= DEVLINK_ATTR_PORT_INDEX,

		.flags		= GENL_CMD_CAP_DO,

	},

};