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

Merge tag 'mlx5-fixes-2020-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes-2020-09-18

This series introduces some fixes to mlx5 driver.

Please pull and let me know if there is any problem.

v1->v2:
 Remove missing patch from -stable list.

For -stable v5.1
 ('net/mlx5: Fix FTE cleanup')

For -stable v5.3
 ('net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported')
 ('net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported')

For -stable v5.7
 ('net/mlx5e: Fix memory leak of tunnel info when rule under multipath not ready')

For -stable v5.8
 ('net/mlx5e: Use RCU to protect rq->xdp_prog')
 ('net/mlx5e: Fix endianness when calculating pedit mask first bit')
 ('net/mlx5e: Use synchronize_rcu to sync with NAPI')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b617c11 cb39ccc5

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

+1 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ struct mlx5e_rq { 
	struct dim         dim; /* Dynamic Interrupt Moderation */



	/* XDP */

	struct bpf_prog       *xdp_prog;

	struct bpf_prog __rcu *xdp_prog;

	struct mlx5e_xdpsq    *xdpsq;

	DECLARE_BITMAP(flags, 8);

	struct page_pool      *page_pool;
@@ -1005,7 +1005,6 @@ int mlx5e_update_nic_rx(struct mlx5e_priv *priv); 
void mlx5e_update_carrier(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

int mlx5e_open(struct net_device *netdev);

void mlx5e_update_ndo_stats(struct mlx5e_priv *priv);



void mlx5e_queue_update_stats(struct mlx5e_priv *priv);

int mlx5e_bits_invert(unsigned long a, int size);

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void mlx5e_monitor_counters_work(struct work_struct *work) 
					       monitor_counters_work);



	mutex_lock(&priv->state_lock);

	mlx5e_update_ndo_stats(priv);

	mlx5e_stats_update_ndo_stats(priv);

	mutex_unlock(&priv->state_lock);

	mlx5e_monitor_counter_arm(priv);

}

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

+2 −5
Original line number Diff line number Diff line
@@ -490,11 +490,8 @@ bool mlx5e_fec_in_caps(struct mlx5_core_dev *dev, int fec_policy) 
	int err;

	int i;



	if (!MLX5_CAP_GEN(dev, pcam_reg))

		return -EOPNOTSUPP;



	if (!MLX5_CAP_PCAM_REG(dev, pplm))

		return -EOPNOTSUPP;

	if (!MLX5_CAP_GEN(dev, pcam_reg) || !MLX5_CAP_PCAM_REG(dev, pplm))

		return false;



	MLX5_SET(pplm_reg, in, local_port, 1);

	err =  mlx5_core_access_reg(dev, in, sz, out, sz, MLX5_REG_PPLM, 0, 0);

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

+16 −5
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 
err_rule:

	mlx5e_mod_hdr_detach(ct_priv->esw->dev,

			     &esw->offloads.mod_hdr, zone_rule->mh);

	mapping_remove(ct_priv->labels_mapping, attr->ct_attr.ct_labels_id);

err_mod_hdr:

	kfree(spec);

	return err;
@@ -958,8 +959,18 @@ mlx5_tc_ct_add_no_trk_match(struct mlx5e_priv *priv, 
	return 0;

}



void mlx5_tc_ct_match_del(struct mlx5e_priv *priv, struct mlx5_ct_attr *ct_attr)

{

	struct mlx5_tc_ct_priv *ct_priv = mlx5_tc_ct_get_ct_priv(priv);



	if (!ct_priv || !ct_attr->ct_labels_id)

		return;



	mapping_remove(ct_priv->labels_mapping, ct_attr->ct_labels_id);

}



int

mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,

mlx5_tc_ct_match_add(struct mlx5e_priv *priv,

		     struct mlx5_flow_spec *spec,

		     struct flow_cls_offload *f,

		     struct mlx5_ct_attr *ct_attr,

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

+16 −10
Original line number Diff line number Diff line
@@ -87,8 +87,11 @@ mlx5_tc_ct_init(struct mlx5_rep_uplink_priv *uplink_priv); 
void

mlx5_tc_ct_clean(struct mlx5_rep_uplink_priv *uplink_priv);



void

mlx5_tc_ct_match_del(struct mlx5e_priv *priv, struct mlx5_ct_attr *ct_attr);



int

mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,

mlx5_tc_ct_match_add(struct mlx5e_priv *priv,

		     struct mlx5_flow_spec *spec,

		     struct flow_cls_offload *f,

		     struct mlx5_ct_attr *ct_attr,
@@ -130,8 +133,11 @@ mlx5_tc_ct_clean(struct mlx5_rep_uplink_priv *uplink_priv) 
{

}



static inline void

mlx5_tc_ct_match_del(struct mlx5e_priv *priv, struct mlx5_ct_attr *ct_attr) {}



static inline int

mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,

mlx5_tc_ct_match_add(struct mlx5e_priv *priv,

		     struct mlx5_flow_spec *spec,

		     struct flow_cls_offload *f,

		     struct mlx5_ct_attr *ct_attr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE