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

Merge tag 'mlx5-fixes-2021-10-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-fixes-2021-10-20
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a689702a 1d000323

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv); 
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);



int mlx5e_fs_init(struct mlx5e_priv *priv);

void mlx5e_fs_cleanup(struct mlx5e_priv *priv);



int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);

void mlx5e_remove_vlan_trap(struct mlx5e_priv *priv);

int mlx5e_add_mac_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include "en_tc.h"

#include "rep/tc.h"

#include "rep/neigh.h"

#include "lag.h"

#include "lag_mp.h"



struct mlx5e_tc_tun_route_attr {

	struct net_device *out_dev;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c

+27 −24
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, 
	 * Pkt: MAC  IP     ESP  IP    L4

	 *

	 * Transport Mode:

	 * SWP:      OutL3       InL4

	 *           InL3

	 * SWP:      OutL3       OutL4

	 * Pkt: MAC  IP     ESP  L4

	 *

	 * Tunnel(VXLAN TCP/UDP) over Transport Mode
@@ -171,15 +170,18 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, 
		return;



	if (!xo->inner_ipproto) {

		eseg->swp_inner_l3_offset = skb_network_offset(skb) / 2;

		eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;

		if (skb->protocol == htons(ETH_P_IPV6))

			eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;

		if (xo->proto == IPPROTO_UDP)

			eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L4_UDP;

		return;

		switch (xo->proto) {

		case IPPROTO_UDP:

			eseg->swp_flags |= MLX5_ETH_WQE_SWP_OUTER_L4_UDP;

			fallthrough;

		case IPPROTO_TCP:

			/* IP | ESP | TCP */

			eseg->swp_outer_l4_offset = skb_inner_transport_offset(skb) / 2;

			break;

		default:

			break;

		}



	} else {

		/* Tunnel(VXLAN TCP/UDP) over Transport Mode */

		switch (xo->inner_ipproto) {

		case IPPROTO_UDP:
@@ -187,15 +189,16 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, 
			fallthrough;

		case IPPROTO_TCP:

			eseg->swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;

		eseg->swp_inner_l4_offset = (skb->csum_start + skb->head - skb->data) / 2;

			eseg->swp_inner_l4_offset =

				(skb->csum_start + skb->head - skb->data) / 2;

			if (skb->protocol == htons(ETH_P_IPV6))

				eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;

			break;

		default:

			break;

		}

	}



	return;

}



void mlx5e_ipsec_set_iv_esn(struct sk_buff *skb, struct xfrm_state *x,

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c

+16 −12
Original line number Diff line number Diff line
@@ -1186,10 +1186,6 @@ static int mlx5e_create_vlan_table(struct mlx5e_priv *priv) 
	struct mlx5e_flow_table *ft;

	int err;



	priv->fs.vlan = kvzalloc(sizeof(*priv->fs.vlan), GFP_KERNEL);

	if (!priv->fs.vlan)

		return -ENOMEM;



	ft = &priv->fs.vlan->ft;

	ft->num_groups = 0;
@@ -1198,10 +1194,8 @@ static int mlx5e_create_vlan_table(struct mlx5e_priv *priv) 
	ft_attr.prio = MLX5E_NIC_PRIO;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);

	if (IS_ERR(ft->t)) {

		err = PTR_ERR(ft->t);

		goto err_free_t;

	}

	if (IS_ERR(ft->t))

		return PTR_ERR(ft->t);



	ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL);

	if (!ft->g) {
@@ -1221,9 +1215,6 @@ static int mlx5e_create_vlan_table(struct mlx5e_priv *priv) 
	kfree(ft->g);

err_destroy_vlan_table:

	mlx5_destroy_flow_table(ft->t);

err_free_t:

	kvfree(priv->fs.vlan);

	priv->fs.vlan = NULL;



	return err;

}
@@ -1232,7 +1223,6 @@ static void mlx5e_destroy_vlan_table(struct mlx5e_priv *priv) 
{

	mlx5e_del_vlan_rules(priv);

	mlx5e_destroy_flow_table(&priv->fs.vlan->ft);

	kvfree(priv->fs.vlan);

}



static void mlx5e_destroy_inner_ttc_table(struct mlx5e_priv *priv)
@@ -1351,3 +1341,17 @@ void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv) 
	mlx5e_arfs_destroy_tables(priv);

	mlx5e_ethtool_cleanup_steering(priv);

}



int mlx5e_fs_init(struct mlx5e_priv *priv)

{

	priv->fs.vlan = kvzalloc(sizeof(*priv->fs.vlan), GFP_KERNEL);

	if (!priv->fs.vlan)

		return -ENOMEM;

	return 0;

}



void mlx5e_fs_cleanup(struct mlx5e_priv *priv)

{

	kvfree(priv->fs.vlan);

	priv->fs.vlan = NULL;

}

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+7 −0
Original line number Diff line number Diff line
@@ -4578,6 +4578,12 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 


	mlx5e_timestamp_init(priv);



	err = mlx5e_fs_init(priv);

	if (err) {

		mlx5_core_err(mdev, "FS initialization failed, %d\n", err);

		return err;

	}



	err = mlx5e_ipsec_init(priv);

	if (err)

		mlx5_core_err(mdev, "IPSec initialization failed, %d\n", err);
@@ -4595,6 +4601,7 @@ static void mlx5e_nic_cleanup(struct mlx5e_priv *priv) 
	mlx5e_health_destroy_reporters(priv);

	mlx5e_tls_cleanup(priv);

	mlx5e_ipsec_cleanup(priv);

	mlx5e_fs_cleanup(priv);

}



static int mlx5e_init_nic_rx(struct mlx5e_priv *priv)