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

Merge branch 'mlxsw-Preparations-for-IPv6-UC-router' 



Jiri Pirko says:

====================
mlxsw: Preparations for IPv6 UC router

Ido says:

The purpose of this set is to prepare the driver for the introduction of
IPv6 FIB offload. It's mainly composed of small and non-functional
changes, that either add the IPv6 equivalent of existing IPv4 code or
aimed at making the introduction of IPv6-specific code easier.

The first five patches enable IPv6 forwarding in the device and allow us
to configure router interfaces (RIFs) based on inet6addr notifications.

The next six patches add support for programming IPv6 neighbours into
the device's table as well as dumping their activity and updating the
kernel accordingly.

The last 11 patches extend current infrastructure to allow us to program
IPv6 routes, set catch-all IPv6 trap in case of abort and make the code
more receptive towards up-coming changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7f81ff04 7dcc18ad

drivers/net/ethernet/mellanox/mlxsw/reg.h

+61 −3
Original line number Diff line number Diff line
@@ -3679,16 +3679,17 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IGMP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP_IPV4,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP_MISS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_HOST_MISS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_EVENT,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_MLD,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND,

};



/* reg_htgt_trap_group
@@ -3953,10 +3954,12 @@ MLXSW_ITEM32(reg, rgcr, pcp_rw, 0x18, 16, 2); 
 */

MLXSW_ITEM32(reg, rgcr, activity_dis, 0x20, 0, 8);



static inline void mlxsw_reg_rgcr_pack(char *payload, bool ipv4_en)

static inline void mlxsw_reg_rgcr_pack(char *payload, bool ipv4_en,

				       bool ipv6_en)

{

	MLXSW_REG_ZERO(rgcr, payload);

	mlxsw_reg_rgcr_ipv4_en_set(payload, ipv4_en);

	mlxsw_reg_rgcr_ipv6_en_set(payload, ipv6_en);

}



/* RITR - Router Interface Table Register
@@ -4204,10 +4207,12 @@ static inline void mlxsw_reg_ritr_pack(char *payload, bool enable, 
	MLXSW_REG_ZERO(ritr, payload);

	mlxsw_reg_ritr_enable_set(payload, enable);

	mlxsw_reg_ritr_ipv4_set(payload, 1);

	mlxsw_reg_ritr_ipv6_set(payload, 1);

	mlxsw_reg_ritr_type_set(payload, type);

	mlxsw_reg_ritr_op_set(payload, op);

	mlxsw_reg_ritr_rif_set(payload, rif);

	mlxsw_reg_ritr_ipv4_fe_set(payload, 1);

	mlxsw_reg_ritr_ipv6_fe_set(payload, 1);

	mlxsw_reg_ritr_lb_en_set(payload, 1);

	mlxsw_reg_ritr_virtual_router_set(payload, vr_id);

	mlxsw_reg_ritr_mtu_set(payload, mtu);
@@ -4719,6 +4724,7 @@ MLXSW_ITEM32(reg, ralue, prefix_len, 0x08, 0, 8); 
 * Access: Index

 */

MLXSW_ITEM32(reg, ralue, dip4, 0x18, 0, 32);

MLXSW_ITEM_BUF(reg, ralue, dip6, 0x0C, 16);



enum mlxsw_reg_ralue_entry_type {

	MLXSW_REG_RALUE_ENTRY_TYPE_MARKER_ENTRY = 1,
@@ -4852,6 +4858,16 @@ static inline void mlxsw_reg_ralue_pack4(char *payload, 
	mlxsw_reg_ralue_dip4_set(payload, dip);

}



static inline void mlxsw_reg_ralue_pack6(char *payload,

					 enum mlxsw_reg_ralxx_protocol protocol,

					 enum mlxsw_reg_ralue_op op,

					 u16 virtual_router, u8 prefix_len,

					 const void *dip)

{

	mlxsw_reg_ralue_pack(payload, protocol, op, virtual_router, prefix_len);

	mlxsw_reg_ralue_dip6_memcpy_to(payload, dip);

}



static inline void

mlxsw_reg_ralue_act_remote_pack(char *payload,

				enum mlxsw_reg_ralue_trap_action trap_action,
@@ -4955,6 +4971,7 @@ MLXSW_ITEM32(reg, rauht, rif, 0x00, 0, 16); 
 * Access: Index

 */

MLXSW_ITEM32(reg, rauht, dip4, 0x1C, 0x0, 32);

MLXSW_ITEM_BUF(reg, rauht, dip6, 0x10, 16);



enum mlxsw_reg_rauht_trap_action {

	MLXSW_REG_RAUHT_TRAP_ACTION_NOP,
@@ -5019,6 +5036,15 @@ static inline void mlxsw_reg_rauht_pack4(char *payload, 
	mlxsw_reg_rauht_dip4_set(payload, dip);

}



static inline void mlxsw_reg_rauht_pack6(char *payload,

					 enum mlxsw_reg_rauht_op op, u16 rif,

					 const char *mac, const char *dip)

{

	mlxsw_reg_rauht_pack(payload, op, rif, mac);

	mlxsw_reg_rauht_type_set(payload, MLXSW_REG_RAUHT_TYPE_IPV6);

	mlxsw_reg_rauht_dip6_memcpy_to(payload, dip);

}



/* RALEU - Router Algorithmic LPM ECMP Update Register

 * ---------------------------------------------------

 * The register enables updating the ECMP section in the action for multiple
@@ -5217,6 +5243,30 @@ MLXSW_ITEM32_INDEXED(reg, rauhtd, ipv4_ent_rif, MLXSW_REG_RAUHTD_BASE_LEN, 0, 
MLXSW_ITEM32_INDEXED(reg, rauhtd, ipv4_ent_dip, MLXSW_REG_RAUHTD_BASE_LEN, 0,

		     32, MLXSW_REG_RAUHTD_IPV4_ENT_LEN, 0x04, false);



#define MLXSW_REG_RAUHTD_IPV6_ENT_LEN 0x20



/* reg_rauhtd_ipv6_ent_a

 * Activity. Set for new entries. Set if a packet lookup has hit on the

 * specific entry.

 * Access: RO

 */

MLXSW_ITEM32_INDEXED(reg, rauhtd, ipv6_ent_a, MLXSW_REG_RAUHTD_BASE_LEN, 16, 1,

		     MLXSW_REG_RAUHTD_IPV6_ENT_LEN, 0x00, false);



/* reg_rauhtd_ipv6_ent_rif

 * Router interface.

 * Access: RO

 */

MLXSW_ITEM32_INDEXED(reg, rauhtd, ipv6_ent_rif, MLXSW_REG_RAUHTD_BASE_LEN, 0,

		     16, MLXSW_REG_RAUHTD_IPV6_ENT_LEN, 0x00, false);



/* reg_rauhtd_ipv6_ent_dip

 * Destination IPv6 address.

 * Access: RO

 */

MLXSW_ITEM_BUF_INDEXED(reg, rauhtd, ipv6_ent_dip, MLXSW_REG_RAUHTD_BASE_LEN,

		       16, MLXSW_REG_RAUHTD_IPV6_ENT_LEN, 0x10);



static inline void mlxsw_reg_rauhtd_ent_ipv4_unpack(char *payload,

						    int ent_index, u16 *p_rif,

						    u32 *p_dip)
@@ -5225,6 +5275,14 @@ static inline void mlxsw_reg_rauhtd_ent_ipv4_unpack(char *payload, 
	*p_dip = mlxsw_reg_rauhtd_ipv4_ent_dip_get(payload, ent_index);

}



static inline void mlxsw_reg_rauhtd_ent_ipv6_unpack(char *payload,

						    int rec_index, u16 *p_rif,

						    char *p_dip)

{

	*p_rif = mlxsw_reg_rauhtd_ipv6_ent_rif_get(payload, rec_index);

	mlxsw_reg_rauhtd_ipv6_ent_dip_memcpy_from(payload, rec_index, p_dip);

}



/* MFCR - Management Fan Control Register

 * --------------------------------------

 * This register controls the settings of the Fan Speed PWM mechanism.

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+40 −7
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <net/tc_act/tc_mirred.h>

#include <net/netevent.h>

#include <net/tc_act/tc_sample.h>

#include <net/addrconf.h>



#include "spectrum.h"

#include "pci.h"
@@ -3345,12 +3346,35 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	MLXSW_SP_RXL_MARK(MTUERROR, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(TTLERROR, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(LBERROR, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(OSPF, TRAP_TO_CPU, OSPF, false),

	MLXSW_SP_RXL_MARK(IP2ME, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV6_UNSPECIFIED_ADDRESS, TRAP_TO_CPU, ROUTER_EXP,

			  false),

	MLXSW_SP_RXL_MARK(IPV6_LINK_LOCAL_DEST, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(IPV6_LINK_LOCAL_SRC, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(IPV6_ALL_NODES_LINK, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(IPV6_ALL_ROUTERS_LINK, TRAP_TO_CPU, ROUTER_EXP,

			  false),

	MLXSW_SP_RXL_MARK(IPV4_OSPF, TRAP_TO_CPU, OSPF, false),

	MLXSW_SP_RXL_MARK(IPV6_OSPF, TRAP_TO_CPU, OSPF, false),

	MLXSW_SP_RXL_MARK(IPV6_DHCP, TRAP_TO_CPU, DHCP, false),

	MLXSW_SP_RXL_MARK(RTR_INGRESS0, TRAP_TO_CPU, REMOTE_ROUTE, false),

	MLXSW_SP_RXL_MARK(HOST_MISS_IPV4, TRAP_TO_CPU, ARP_MISS, false),

	MLXSW_SP_RXL_MARK(BGP_IPV4, TRAP_TO_CPU, BGP_IPV4, false),

	MLXSW_SP_RXL_MARK(IPV4_BGP, TRAP_TO_CPU, BGP, false),

	MLXSW_SP_RXL_MARK(IPV6_BGP, TRAP_TO_CPU, BGP, false),

	MLXSW_SP_RXL_MARK(L3_IPV6_ROUTER_SOLICITATION, TRAP_TO_CPU, IPV6_ND,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_ROUTER_ADVERTISMENT, TRAP_TO_CPU, IPV6_ND,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_NEIGHBOR_SOLICITATION, TRAP_TO_CPU, IPV6_ND,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_NEIGHBOR_ADVERTISMENT, TRAP_TO_CPU, IPV6_ND,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_REDIRECTION, TRAP_TO_CPU, IPV6_ND, false),

	MLXSW_SP_RXL_MARK(IPV6_MC_LINK_LOCAL_DEST, TRAP_TO_CPU, ROUTER_EXP,

			  false),

	MLXSW_SP_RXL_MARK(HOST_MISS_IPV4, TRAP_TO_CPU, HOST_MISS, false),

	MLXSW_SP_RXL_MARK(HOST_MISS_IPV6, TRAP_TO_CPU, HOST_MISS, false),

	MLXSW_SP_RXL_MARK(ROUTER_ALERT_IPV4, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(ROUTER_ALERT_IPV6, TRAP_TO_CPU, ROUTER_EXP, false),

	/* PKT Sample trap */

	MLXSW_RXL(mlxsw_sp_rx_listener_sample_func, PKT_SAMPLE, MIRROR_TO_CPU,

		  false, SP_IP2ME, DISCARD),
@@ -3389,12 +3413,13 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core) 
			rate = 16 * 1024;

			burst_size = 10;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP_IPV4:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP_MISS:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_HOST_MISS:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:

			rate = 1024;

			burst_size = 7;

			break;
@@ -3443,7 +3468,7 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core) 
			priority = 5;

			tc = 5;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP_IPV4:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP:

			priority = 4;

			tc = 4;
@@ -3455,10 +3480,11 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core) 
			tc = 3;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:

			priority = 2;

			tc = 2;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP_MISS:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_HOST_MISS:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:

			priority = 1;
@@ -4368,6 +4394,10 @@ static struct notifier_block mlxsw_sp_inetaddr_nb __read_mostly = { 
	.priority = 10,	/* Must be called before FIB notifier block */

};



static struct notifier_block mlxsw_sp_inet6addr_nb __read_mostly = {

	.notifier_call = mlxsw_sp_inet6addr_event,

};



static struct notifier_block mlxsw_sp_router_netevent_nb __read_mostly = {

	.notifier_call = mlxsw_sp_router_netevent_event,

};
@@ -4388,6 +4418,7 @@ static int __init mlxsw_sp_module_init(void) 


	register_netdevice_notifier(&mlxsw_sp_netdevice_nb);

	register_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	register_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);

	register_netevent_notifier(&mlxsw_sp_router_netevent_nb);



	err = mlxsw_core_driver_register(&mlxsw_sp_driver);
@@ -4404,6 +4435,7 @@ err_pci_driver_register: 
	mlxsw_core_driver_unregister(&mlxsw_sp_driver);

err_core_driver_register:

	unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_netdevice_notifier(&mlxsw_sp_netdevice_nb);

	return err;
@@ -4414,6 +4446,7 @@ static void __exit mlxsw_sp_module_exit(void) 
	mlxsw_pci_driver_unregister(&mlxsw_sp_pci_driver);

	mlxsw_core_driver_unregister(&mlxsw_sp_driver);

	unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_netdevice_notifier(&mlxsw_sp_netdevice_nb);

}

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ int mlxsw_sp_router_netevent_event(struct notifier_block *unused, 
int mlxsw_sp_netdevice_router_port_event(struct net_device *dev);

int mlxsw_sp_inetaddr_event(struct notifier_block *unused,

			    unsigned long event, void *ptr);

int mlxsw_sp_inet6addr_event(struct notifier_block *unused,

			     unsigned long event, void *ptr);

int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,

				 struct netdev_notifier_changeupper_info *info);

void

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+501 −245

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/mellanox/mlxsw/trap.h

+18 −2
Original line number Diff line number Diff line
@@ -61,16 +61,32 @@ enum { 
	MLXSW_TRAP_ID_MTUERROR = 0x52,

	MLXSW_TRAP_ID_TTLERROR = 0x53,

	MLXSW_TRAP_ID_LBERROR = 0x54,

	MLXSW_TRAP_ID_OSPF = 0x55,

	MLXSW_TRAP_ID_IPV4_OSPF = 0x55,

	MLXSW_TRAP_ID_IP2ME = 0x5F,

	MLXSW_TRAP_ID_IPV6_UNSPECIFIED_ADDRESS = 0x60,

	MLXSW_TRAP_ID_IPV6_LINK_LOCAL_DEST = 0x61,

	MLXSW_TRAP_ID_IPV6_LINK_LOCAL_SRC = 0x62,

	MLXSW_TRAP_ID_IPV6_ALL_NODES_LINK = 0x63,

	MLXSW_TRAP_ID_IPV6_OSPF = 0x64,

	MLXSW_TRAP_ID_IPV6_MLDV12_LISTENER_QUERY = 0x65,

	MLXSW_TRAP_ID_IPV6_MLDV1_LISTENER_REPORT = 0x66,

	MLXSW_TRAP_ID_IPV6_MLDV1_LISTENER_DONE = 0x67,

	MLXSW_TRAP_ID_IPV6_MLDV2_LISTENER_REPORT = 0x68,

	MLXSW_TRAP_ID_IPV6_DHCP = 0x69,

	MLXSW_TRAP_ID_IPV6_ALL_ROUTERS_LINK = 0x6F,

	MLXSW_TRAP_ID_RTR_INGRESS0 = 0x70,

	MLXSW_TRAP_ID_BGP_IPV4 = 0x88,

	MLXSW_TRAP_ID_IPV4_BGP = 0x88,

	MLXSW_TRAP_ID_IPV6_BGP = 0x89,

	MLXSW_TRAP_ID_L3_IPV6_ROUTER_SOLICITATION = 0x8A,

	MLXSW_TRAP_ID_L3_IPV6_ROUTER_ADVERTISMENT = 0x8B,

	MLXSW_TRAP_ID_L3_IPV6_NEIGHBOR_SOLICITATION = 0x8C,

	MLXSW_TRAP_ID_L3_IPV6_NEIGHBOR_ADVERTISMENT = 0x8D,

	MLXSW_TRAP_ID_L3_IPV6_REDIRECTION = 0x8E,

	MLXSW_TRAP_ID_HOST_MISS_IPV4 = 0x90,

	MLXSW_TRAP_ID_IPV6_MC_LINK_LOCAL_DEST = 0x91,

	MLXSW_TRAP_ID_HOST_MISS_IPV6 = 0x92,

	MLXSW_TRAP_ID_ROUTER_ALERT_IPV4 = 0xD6,

	MLXSW_TRAP_ID_ROUTER_ALERT_IPV6 = 0xD7,

	MLXSW_TRAP_ID_ACL0 = 0x1C0,



	MLXSW_TRAP_ID_MAX = 0x1FF

CRA Git | Maintained and supported by SUSTech CRA and CCSE