Commit 1eb4ef12 authored by Somnath Kotur's avatar Somnath Kotur Committed by Paolo Abeni
Browse files

bnxt_en: Implement .set_port / .unset_port UDP tunnel callbacks 



As per the new udp tunnel framework, drivers which need to know the
details of a port entry (i.e. port type) when it gets deleted should
use the .set_port / .unset_port callbacks.

Implementing the current .udp_tunnel_sync callback would mean that the
deleted tunnel port entry would be all zeros.  This used to work on
older firmware because it would not check the input when deleting a
tunnel port.  With newer firmware, the delete will now fail and
subsequent tunnel port allocation will fail as a result.

Fixes: 442a35a5 ("bnxt: convert to new udp_tunnel_nic infra")
Reviewed-by: default avatarKalesh Anakkur Purayil <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 319a7827

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

+18 −7
Original line number Diff line number Diff line
@@ -13036,26 +13036,37 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) 


#endif /* CONFIG_RFS_ACCEL */



static int bnxt_udp_tunnel_sync(struct net_device *netdev, unsigned int table)

static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,

				    unsigned int entry, struct udp_tunnel_info *ti)

{

	struct bnxt *bp = netdev_priv(netdev);

	struct udp_tunnel_info ti;

	unsigned int cmd;



	udp_tunnel_nic_get_port(netdev, table, 0, &ti);

	if (ti.type == UDP_TUNNEL_TYPE_VXLAN)

	if (ti->type == UDP_TUNNEL_TYPE_VXLAN)

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN;

	else

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE;



	if (ti.port)

		return bnxt_hwrm_tunnel_dst_port_alloc(bp, ti.port, cmd);

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

}



static int bnxt_udp_tunnel_unset_port(struct net_device *netdev, unsigned int table,

				      unsigned int entry, struct udp_tunnel_info *ti)

{

	struct bnxt *bp = netdev_priv(netdev);

	unsigned int cmd;



	if (ti->type == UDP_TUNNEL_TYPE_VXLAN)

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN;

	else

		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE;



	return bnxt_hwrm_tunnel_dst_port_free(bp, cmd);

}



static const struct udp_tunnel_nic_info bnxt_udp_tunnels = {

	.sync_table	= bnxt_udp_tunnel_sync,

	.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		= {