Commit c1a92c0a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-tag-modules' 



Andrew Lunn says:

====================
Make DSA tag drivers kernel modules

Historically, DSA tag drivers have been compiled into the kernel as
part of the DSA core. With the growing number of tag drivers, it makes
sense to allow this driver code to be compiled as a module, and loaded
on demand.

v2
--
Move name to end of structure, keeping the hot entries at the beginning.
More tag protocol to end of structure to keep hot members at the beginning.
Fix indent of #endif
Rewrite to move list pointer into a new structure
void functions, since there cannot be errors
Fix fall-through comment
Reorder patch for unused symbols to before tag drivers can be modules
tab/space cleanup
Help text wording
NET_DSA_TAG_BRCM_COMMON and NET_DSA_TAG_KZS_COMMON hidden

v3
--
boilerplate: Move kdoc next to macro
boilerplate: Fix THIS_MODULE indentation
Kconfig: More tabification
Kconfig: Punctuation

v4
--
Cover note {H}istorically
Kconfig: trailer
====================

Tested-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5f0d736e 0b9f9dfb

include/net/dsa.h

+97 −13
Original line number Diff line number Diff line
@@ -30,20 +30,32 @@ struct phy_device; 
struct fixed_phy_status;

struct phylink_link_state;



#define DSA_TAG_PROTO_NONE_VALUE		0

#define DSA_TAG_PROTO_BRCM_VALUE		1

#define DSA_TAG_PROTO_BRCM_PREPEND_VALUE	2

#define DSA_TAG_PROTO_DSA_VALUE			3

#define DSA_TAG_PROTO_EDSA_VALUE		4

#define DSA_TAG_PROTO_GSWIP_VALUE		5

#define DSA_TAG_PROTO_KSZ9477_VALUE		6

#define DSA_TAG_PROTO_KSZ9893_VALUE		7

#define DSA_TAG_PROTO_LAN9303_VALUE		8

#define DSA_TAG_PROTO_MTK_VALUE			9

#define DSA_TAG_PROTO_QCA_VALUE			10

#define DSA_TAG_PROTO_TRAILER_VALUE		11



enum dsa_tag_protocol {

	DSA_TAG_PROTO_NONE = 0,

	DSA_TAG_PROTO_BRCM,

	DSA_TAG_PROTO_BRCM_PREPEND,

	DSA_TAG_PROTO_DSA,

	DSA_TAG_PROTO_EDSA,

	DSA_TAG_PROTO_GSWIP,

	DSA_TAG_PROTO_KSZ9477,

	DSA_TAG_PROTO_KSZ9893,

	DSA_TAG_PROTO_LAN9303,

	DSA_TAG_PROTO_MTK,

	DSA_TAG_PROTO_QCA,

	DSA_TAG_PROTO_TRAILER,

	DSA_TAG_LAST,		/* MUST BE LAST */

	DSA_TAG_PROTO_NONE		= DSA_TAG_PROTO_NONE_VALUE,

	DSA_TAG_PROTO_BRCM		= DSA_TAG_PROTO_BRCM_VALUE,

	DSA_TAG_PROTO_BRCM_PREPEND	= DSA_TAG_PROTO_BRCM_PREPEND_VALUE,

	DSA_TAG_PROTO_DSA		= DSA_TAG_PROTO_DSA_VALUE,

	DSA_TAG_PROTO_EDSA		= DSA_TAG_PROTO_EDSA_VALUE,

	DSA_TAG_PROTO_GSWIP		= DSA_TAG_PROTO_GSWIP_VALUE,

	DSA_TAG_PROTO_KSZ9477		= DSA_TAG_PROTO_KSZ9477_VALUE,

	DSA_TAG_PROTO_KSZ9893		= DSA_TAG_PROTO_KSZ9893_VALUE,

	DSA_TAG_PROTO_LAN9303		= DSA_TAG_PROTO_LAN9303_VALUE,

	DSA_TAG_PROTO_MTK		= DSA_TAG_PROTO_MTK_VALUE,

	DSA_TAG_PROTO_QCA		= DSA_TAG_PROTO_QCA_VALUE,

	DSA_TAG_PROTO_TRAILER		= DSA_TAG_PROTO_TRAILER_VALUE,

};



struct packet_type;
@@ -56,8 +68,14 @@ struct dsa_device_ops { 
	int (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,

			    int *offset);

	unsigned int overhead;

	const char *name;

	enum dsa_tag_protocol proto;

};



#define DSA_TAG_DRIVER_ALIAS "dsa_tag-"

#define MODULE_ALIAS_DSA_TAG_DRIVER(__proto)				\

	MODULE_ALIAS(DSA_TAG_DRIVER_ALIAS __stringify(__proto##_VALUE))



struct dsa_switch_tree {

	struct list_head	list;
@@ -575,4 +593,70 @@ int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data); 
int dsa_port_get_phy_sset_count(struct dsa_port *dp);

void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up);



struct dsa_tag_driver {

	const struct dsa_device_ops *ops;

	struct list_head list;

	struct module *owner;

};



void dsa_tag_drivers_register(struct dsa_tag_driver *dsa_tag_driver_array[],

			      unsigned int count,

			      struct module *owner);

void dsa_tag_drivers_unregister(struct dsa_tag_driver *dsa_tag_driver_array[],

				unsigned int count);



#define dsa_tag_driver_module_drivers(__dsa_tag_drivers_array, __count)	\

static int __init dsa_tag_driver_module_init(void)			\

{									\

	dsa_tag_drivers_register(__dsa_tag_drivers_array, __count,	\

				 THIS_MODULE);				\

	return 0;							\

}									\

module_init(dsa_tag_driver_module_init);				\

									\

static void __exit dsa_tag_driver_module_exit(void)			\

{									\

	dsa_tag_drivers_unregister(__dsa_tag_drivers_array, __count);	\

}									\

module_exit(dsa_tag_driver_module_exit)



/**

 * module_dsa_tag_drivers() - Helper macro for registering DSA tag

 * drivers

 * @__ops_array: Array of tag driver strucutres

 *

 * Helper macro for DSA tag drivers which do not do anything special

 * in module init/exit. Each module may only use this macro once, and

 * calling it replaces module_init() and module_exit().

 */

#define module_dsa_tag_drivers(__ops_array)				\

dsa_tag_driver_module_drivers(__ops_array, ARRAY_SIZE(__ops_array))



#define DSA_TAG_DRIVER_NAME(__ops) dsa_tag_driver ## _ ## __ops



/* Create a static structure we can build a linked list of dsa_tag

 * drivers

 */

#define DSA_TAG_DRIVER(__ops)						\

static struct dsa_tag_driver DSA_TAG_DRIVER_NAME(__ops) = {		\

	.ops = &__ops,							\

}



/**

 * module_dsa_tag_driver() - Helper macro for registering a single DSA tag

 * driver

 * @__ops: Single tag driver structures

 *

 * Helper macro for DSA tag drivers which do not do anything special

 * in module init/exit. Each module may only use this macro once, and

 * calling it replaces module_init() and module_exit().

 */

#define module_dsa_tag_driver(__ops)					\

DSA_TAG_DRIVER(__ops);							\

									\

static struct dsa_tag_driver *dsa_tag_driver_array[] =	{		\

	&DSA_TAG_DRIVER_NAME(__ops)					\

};									\

module_dsa_tag_drivers(dsa_tag_driver_array)

#endif

net/dsa/Kconfig

+64 −19
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config HAVE_NET_DSA 


# Drivers must select NET_DSA and the appropriate tagging format



config NET_DSA

menuconfig NET_DSA

	tristate "Distributed Switch Architecture"

	depends on HAVE_NET_DSA

	depends on BRIDGE || BRIDGE=n
@@ -26,39 +26,84 @@ config NET_DSA_LEGACY 


	  This feature is scheduled for removal in 4.17.



# tagging formats

config NET_DSA_TAG_BRCM_COMMON

	tristate

	default n



config NET_DSA_TAG_BRCM

	bool

	tristate "Tag driver for Broadcom switches using in-frame headers"

	select NET_DSA_TAG_BRCM_COMMON

	help

	  Say Y if you want to enable support for tagging frames for the

	  Broadcom switches which place the tag after the MAC source address.





config NET_DSA_TAG_BRCM_PREPEND

	bool

	tristate "Tag driver for Broadcom switches using prepended headers"

	select NET_DSA_TAG_BRCM_COMMON

	help

	  Say Y if you want to enable support for tagging frames for the

	  Broadcom switches which places the tag before the Ethernet header

	  (prepended).



config NET_DSA_TAG_GSWIP

	tristate "Tag driver for Lantiq / Intel GSWIP switches"

	help

	  Say Y or M if you want to enable support for tagging frames for the

	  Lantiq / Intel GSWIP switches.



config NET_DSA_TAG_DSA

	bool

	tristate "Tag driver for Marvell switches using DSA headers"

	help

	  Say Y or M if you want to enable support for tagging frames for the

	  Marvell switches which use DSA headers.



config NET_DSA_TAG_EDSA

	bool

	tristate "Tag driver for Marvell switches using EtherType DSA headers"

	help

	  Say Y or M if you want to enable support for tagging frames for the

	  Marvell switches which use EtherType DSA headers.



config NET_DSA_TAG_GSWIP

	bool

config NET_DSA_TAG_MTK

	tristate "Tag driver for Mediatek switches"

	help

	  Say Y or M if you want to enable support for tagging frames for

	  Mediatek switches.



config NET_DSA_TAG_KSZ_COMMON

	tristate

	default n



config NET_DSA_TAG_KSZ

	bool

	tristate "Tag driver for Microchip 9893 family of switches"

	select NET_DSA_TAG_KSZ_COMMON

	help

	  Say Y if you want to enable support for tagging frames for the

	  Microchip 9893 family of switches.



config NET_DSA_TAG_KSZ9477

	bool

	select NET_DSA_TAG_KSZ

	tristate "Tag driver for Microchip 9477 family of switches"

	select NET_DSA_TAG_KSZ_COMMON

	help

	  Say Y if you want to enable support for tagging frames for the

	  Microchip 9477 family of switches.



config NET_DSA_TAG_LAN9303

	bool

config NET_DSA_TAG_QCA

	tristate "Tag driver for Qualcomm Atheros QCA8K switches"

	help

	  Say Y or M if you want to enable support for tagging frames for

	  the Qualcomm Atheros QCA8K switches.



config NET_DSA_TAG_MTK

	bool

config NET_DSA_TAG_LAN9303

	tristate "Tag driver for SMSC/Microchip LAN9303 family of switches"

	help

	  Say Y or M if you want to enable support for tagging frames for the

	  SMSC/Microchip LAN9303 family of switches.



config NET_DSA_TAG_TRAILER

	bool



config NET_DSA_TAG_QCA

	bool

	tristate "Tag driver for switches using a trailer tag"

	help

	  Say Y or M if you want to enable support for tagging frames at

	  with a trailed. e.g. Marvell 88E6060.



endif

net/dsa/Makefile

+9 −10
Original line number Diff line number Diff line
@@ -5,13 +5,12 @@ dsa_core-y += dsa.o dsa2.o master.o port.o slave.o switch.o 
dsa_core-$(CONFIG_NET_DSA_LEGACY) += legacy.o



# tagging formats

dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o

dsa_core-$(CONFIG_NET_DSA_TAG_BRCM_PREPEND) += tag_brcm.o

dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o

dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o

dsa_core-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o

dsa_core-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o

dsa_core-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o

dsa_core-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o

dsa_core-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o

dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
 
obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o

obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o

obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o

obj-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o

obj-$(CONFIG_NET_DSA_TAG_KSZ_COMMON) += tag_ksz.o

obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o

obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o

obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o

obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o

net/dsa/dsa.c

+85 −80
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 


#include "dsa_priv.h"



static LIST_HEAD(dsa_tag_drivers_list);

static DEFINE_MUTEX(dsa_tag_drivers_lock);



static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb,

					    struct net_device *dev)

{
@@ -35,106 +38,103 @@ static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb, 
}



static const struct dsa_device_ops none_ops = {

	.name	= "none",

	.proto	= DSA_TAG_PROTO_NONE,

	.xmit	= dsa_slave_notag_xmit,

	.rcv	= NULL,

};



const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {

#ifdef CONFIG_NET_DSA_TAG_BRCM

	[DSA_TAG_PROTO_BRCM] = &brcm_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND

	[DSA_TAG_PROTO_BRCM_PREPEND] = &brcm_prepend_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_DSA

	[DSA_TAG_PROTO_DSA] = &dsa_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_EDSA

	[DSA_TAG_PROTO_EDSA] = &edsa_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_GSWIP

	[DSA_TAG_PROTO_GSWIP] = &gswip_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_KSZ9477

	[DSA_TAG_PROTO_KSZ9477] = &ksz9477_netdev_ops,

	[DSA_TAG_PROTO_KSZ9893] = &ksz9893_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_LAN9303

	[DSA_TAG_PROTO_LAN9303] = &lan9303_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_MTK

	[DSA_TAG_PROTO_MTK] = &mtk_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_QCA

	[DSA_TAG_PROTO_QCA] = &qca_netdev_ops,

#endif

#ifdef CONFIG_NET_DSA_TAG_TRAILER

	[DSA_TAG_PROTO_TRAILER] = &trailer_netdev_ops,

#endif

	[DSA_TAG_PROTO_NONE] = &none_ops,

};

DSA_TAG_DRIVER(none_ops);



const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)

static void dsa_tag_driver_register(struct dsa_tag_driver *dsa_tag_driver,

				    struct module *owner)

{

	dsa_tag_driver->owner = owner;



	mutex_lock(&dsa_tag_drivers_lock);

	list_add_tail(&dsa_tag_driver->list, &dsa_tag_drivers_list);

	mutex_unlock(&dsa_tag_drivers_lock);

}



void dsa_tag_drivers_register(struct dsa_tag_driver *dsa_tag_driver_array[],

			      unsigned int count, struct module *owner)

{

	const char *protocol_name[DSA_TAG_LAST] = {

#ifdef CONFIG_NET_DSA_TAG_BRCM

		[DSA_TAG_PROTO_BRCM] = "brcm",

#endif

#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND

		[DSA_TAG_PROTO_BRCM_PREPEND] = "brcm-prepend",

#endif

#ifdef CONFIG_NET_DSA_TAG_DSA

		[DSA_TAG_PROTO_DSA] = "dsa",

#endif

#ifdef CONFIG_NET_DSA_TAG_EDSA

		[DSA_TAG_PROTO_EDSA] = "edsa",

#endif

#ifdef CONFIG_NET_DSA_TAG_GSWIP

		[DSA_TAG_PROTO_GSWIP] = "gswip",

#endif

#ifdef CONFIG_NET_DSA_TAG_KSZ9477

		[DSA_TAG_PROTO_KSZ9477] = "ksz9477",

		[DSA_TAG_PROTO_KSZ9893] = "ksz9893",

#endif

#ifdef CONFIG_NET_DSA_TAG_LAN9303

		[DSA_TAG_PROTO_LAN9303] = "lan9303",

#endif

#ifdef CONFIG_NET_DSA_TAG_MTK

		[DSA_TAG_PROTO_MTK] = "mtk",

#endif

#ifdef CONFIG_NET_DSA_TAG_QCA

		[DSA_TAG_PROTO_QCA] = "qca",

#endif

#ifdef CONFIG_NET_DSA_TAG_TRAILER

		[DSA_TAG_PROTO_TRAILER] = "trailer",

#endif

		[DSA_TAG_PROTO_NONE] = "none",

	};

	unsigned int i;



	BUILD_BUG_ON(ARRAY_SIZE(protocol_name) != DSA_TAG_LAST);

	for (i = 0; i < count; i++)

		dsa_tag_driver_register(dsa_tag_driver_array[i], owner);

}



	for (i = 0; i < ARRAY_SIZE(dsa_device_ops); i++)

		if (ops == dsa_device_ops[i])

			return protocol_name[i];

static void dsa_tag_driver_unregister(struct dsa_tag_driver *dsa_tag_driver)

{

	mutex_lock(&dsa_tag_drivers_lock);

	list_del(&dsa_tag_driver->list);

	mutex_unlock(&dsa_tag_drivers_lock);

}

EXPORT_SYMBOL_GPL(dsa_tag_drivers_register);



	return protocol_name[DSA_TAG_PROTO_NONE];

void dsa_tag_drivers_unregister(struct dsa_tag_driver *dsa_tag_driver_array[],

				unsigned int count)

{

	unsigned int i;



	for (i = 0; i < count; i++)

		dsa_tag_driver_unregister(dsa_tag_driver_array[i]);

}

EXPORT_SYMBOL_GPL(dsa_tag_drivers_unregister);



const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)

{

	return ops->name;

};



const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol)

const struct dsa_device_ops *dsa_tag_driver_get(int tag_protocol)

{

	struct dsa_tag_driver *dsa_tag_driver;

	const struct dsa_device_ops *ops;

	char module_name[128];

	bool found = false;



	snprintf(module_name, 127, "%s%d", DSA_TAG_DRIVER_ALIAS,

		 tag_protocol);



	if (tag_protocol >= DSA_TAG_LAST)

		return ERR_PTR(-EINVAL);

	ops = dsa_device_ops[tag_protocol];

	request_module(module_name);



	if (!ops)

		return ERR_PTR(-ENOPROTOOPT);

	mutex_lock(&dsa_tag_drivers_lock);

	list_for_each_entry(dsa_tag_driver, &dsa_tag_drivers_list, list) {

		ops = dsa_tag_driver->ops;

		if (ops->proto == tag_protocol) {

			found = true;

			break;

		}

	}



	if (found) {

		if (!try_module_get(dsa_tag_driver->owner))

			ops = ERR_PTR(-ENOPROTOOPT);

	} else {

		ops = ERR_PTR(-ENOPROTOOPT);

	}



	mutex_unlock(&dsa_tag_drivers_lock);



	return ops;

}



void dsa_tag_driver_put(const struct dsa_device_ops *ops)

{

	struct dsa_tag_driver *dsa_tag_driver;



	mutex_lock(&dsa_tag_drivers_lock);

	list_for_each_entry(dsa_tag_driver, &dsa_tag_drivers_list, list) {

		if (dsa_tag_driver->ops == ops) {

			module_put(dsa_tag_driver->owner);

			break;

		}

	}

	mutex_unlock(&dsa_tag_drivers_lock);

}



static int dev_is_class(struct device *dev, void *class)

{

	if (dev->class != NULL && !strcmp(dev->class->name, class))
@@ -352,12 +352,17 @@ static int __init dsa_init_module(void) 


	dev_add_pack(&dsa_pack_type);



	dsa_tag_driver_register(&DSA_TAG_DRIVER_NAME(none_ops),

				THIS_MODULE);



	return 0;

}

module_init(dsa_init_module);



static void __exit dsa_cleanup_module(void)

{

	dsa_tag_driver_unregister(&DSA_TAG_DRIVER_NAME(none_ops));



	dsa_slave_unregister_notifier();

	dev_remove_pack(&dsa_pack_type);

	dsa_legacy_unregister();

net/dsa/dsa2.c

+3 −1
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ static void dsa_port_teardown(struct dsa_port *dp) 
	case DSA_PORT_TYPE_UNUSED:

		break;

	case DSA_PORT_TYPE_CPU:

		dsa_tag_driver_put(dp->tag_ops);

		/* fall-through */

	case DSA_PORT_TYPE_DSA:

		dsa_port_link_unregister_of(dp);

		break;
@@ -577,7 +579,7 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master) 
	enum dsa_tag_protocol tag_protocol;



	tag_protocol = ds->ops->get_tag_protocol(ds, dp->index);

	tag_ops = dsa_resolve_tag_protocol(tag_protocol);

	tag_ops = dsa_tag_driver_get(tag_protocol);

	if (IS_ERR(tag_ops)) {

		dev_warn(ds->dev, "No tagger for this switch\n");

		return PTR_ERR(tag_ops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE