Commit 77b0fff5 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Add support for VXLAN GPE 



Add a new bnxt_udp_tunnels_p7 struct to support the new P7 chips that
can parse VXLAN GPE packets.  Add VXLAN GPE tunnel type handling to
the .set_port() and .unset_port() functions.  .ndo_features_check()
is also enhanced to support VXLAN GPE which may encapsulate inner
IP packets instead of ethernet packets.

Reviewed-by: default avatarDamodharam Ammepalli <damodharam.ammepalli@broadcom.com>
Reviewed-by: default avatarAjit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20231212005122.2401-9-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e6f8a5a8

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+38 −5
Original line number Diff line number Diff line
@@ -5179,6 +5179,11 @@ static int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, u8 tunnel_type) 
		bp->nge_port = 0;

		bp->nge_fw_dst_port_id = INVALID_HW_RING_ID;

		break;

	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE:

		req->tunnel_dst_port_id = cpu_to_le16(bp->vxlan_gpe_fw_dst_port_id);

		bp->vxlan_gpe_port = 0;

		bp->vxlan_gpe_fw_dst_port_id = INVALID_HW_RING_ID;

		break;

	default:

		break;

	}
@@ -5222,6 +5227,11 @@ static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port, 
		bp->nge_port = port;

		bp->nge_fw_dst_port_id = le16_to_cpu(resp->tunnel_dst_port_id);

		break;

	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE:

		bp->vxlan_gpe_port = port;

		bp->vxlan_gpe_fw_dst_port_id =

			le16_to_cpu(resp->tunnel_dst_port_id);

		break;

	default:

		break;

	}
@@ -12002,9 +12012,10 @@ static bool bnxt_udp_tunl_check(struct bnxt *bp, struct sk_buff *skb) 
	struct udphdr *uh = udp_hdr(skb);

	__be16 udp_port = uh->dest;



	if (udp_port != bp->vxlan_port && udp_port != bp->nge_port)

	if (udp_port != bp->vxlan_port && udp_port != bp->nge_port &&

	    udp_port != bp->vxlan_gpe_port)

		return false;

	if (skb->inner_protocol_type == ENCAP_TYPE_ETHER) {

	if (skb->inner_protocol == htons(ETH_P_TEB)) {

		struct ethhdr *eh = inner_eth_hdr(skb);



		switch (eh->h_proto) {
@@ -12015,6 +12026,11 @@ static bool bnxt_udp_tunl_check(struct bnxt *bp, struct sk_buff *skb) 
						 skb_inner_network_offset(skb),

						 NULL);

		}

	} else if (skb->inner_protocol == htons(ETH_P_IP)) {

		return true;

	} else if (skb->inner_protocol == htons(ETH_P_IPV6)) {

		return bnxt_exthdr_check(bp, skb, skb_inner_network_offset(skb),

					 NULL);

	}

	return false;

}
@@ -13674,8 +13690,10 @@ static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int tabl 


	if (ti->type == UDP_TUNNEL_TYPE_VXLAN)

		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN;

	else

	else if (ti->type == UDP_TUNNEL_TYPE_GENEVE)

		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE;

	else

		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE;



	return bnxt_hwrm_tunnel_dst_port_alloc(bp, ti->port, cmd);

}
@@ -13688,8 +13706,10 @@ static int bnxt_udp_tunnel_unset_port(struct net_device *netdev, unsigned int ta 


	if (ti->type == UDP_TUNNEL_TYPE_VXLAN)

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN;

	else

	else if (ti->type == UDP_TUNNEL_TYPE_GENEVE)

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE;

	else

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE;



	return bnxt_hwrm_tunnel_dst_port_free(bp, cmd);

}
@@ -13703,6 +13723,16 @@ static const struct udp_tunnel_nic_info bnxt_udp_tunnels = { 
		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },

		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },

	},

}, bnxt_udp_tunnels_p7 = {

	.set_port	= bnxt_udp_tunnel_set_port,

	.unset_port	= bnxt_udp_tunnel_unset_port,

	.flags		= UDP_TUNNEL_NIC_INFO_MAY_SLEEP |

			  UDP_TUNNEL_NIC_INFO_OPEN_ONLY,

	.tables		= {

		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },

		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },

		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN_GPE, },

	},

};



static int bnxt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
@@ -14298,6 +14328,9 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
			NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_GRE |

			NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM |

			NETIF_F_GSO_IPXIP4 | NETIF_F_GSO_PARTIAL;

	if (bp->flags & BNXT_FLAG_CHIP_P7)

		dev->udp_tunnel_nic_info = &bnxt_udp_tunnels_p7;

	else

		dev->udp_tunnel_nic_info = &bnxt_udp_tunnels;



	dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+2 −0
Original line number Diff line number Diff line
@@ -2284,8 +2284,10 @@ struct bnxt { 


	u16			vxlan_fw_dst_port_id;

	u16			nge_fw_dst_port_id;

	u16			vxlan_gpe_fw_dst_port_id;

	__be16			vxlan_port;

	__be16			nge_port;

	__be16			vxlan_gpe_port;

	u8			port_partition_type;

	u8			port_count;

	u16			br_mode;