Commit f93e8497 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5 fixes 2020-11-17

This series introduces some fixes to mlx5 driver.

* tag 'mlx5-fixes-2020-11-17' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: fix error return code in mlx5e_tc_nic_init()
  net/mlx5: E-Switch, Fail mlx5_esw_modify_vport_rate if qos disabled
  net/mlx5: Disable QoS when min_rates on all VFs are zero
  net/mlx5: Clear bw_share upon VF disable
  net/mlx5: Add handling of port type in rule deletion
  net/mlx5e: Fix check if netdev is bond slave
  net/mlx5e: Fix IPsec packet drop by mlx5e_tc_update_skb
  net/mlx5e: Set IPsec WAs only in IP's non checksum partial case.
  net/mlx5e: Fix refcount leak on kTLS RX resync
====================

Link: https://lore.kernel.org/r/20201117195702.386113-1-saeedm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6dceaa9f 68ec32da

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static bool mlx5e_rep_is_lag_netdev(struct net_device *netdev) 
	struct mlx5e_priv *priv;



	/* A given netdev is not a representor or not a slave of LAG configuration */

	if (!mlx5e_eswitch_rep(netdev) || !bond_slave_get_rtnl(netdev))

	if (!mlx5e_eswitch_rep(netdev) || !netif_is_lag_port(netdev))

		return false;



	priv = netdev_priv(netdev);

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

+7 −7
Original line number Diff line number Diff line
@@ -64,13 +64,13 @@ static int rx_err_add_rule(struct mlx5e_priv *priv, 
	if (!spec)

		return -ENOMEM;



	/* Action to copy 7 bit ipsec_syndrome to regB[0:6] */

	/* Action to copy 7 bit ipsec_syndrome to regB[24:30] */

	MLX5_SET(copy_action_in, action, action_type, MLX5_ACTION_TYPE_COPY);

	MLX5_SET(copy_action_in, action, src_field, MLX5_ACTION_IN_FIELD_IPSEC_SYNDROME);

	MLX5_SET(copy_action_in, action, src_offset, 0);

	MLX5_SET(copy_action_in, action, length, 7);

	MLX5_SET(copy_action_in, action, dst_field, MLX5_ACTION_IN_FIELD_METADATA_REG_B);

	MLX5_SET(copy_action_in, action, dst_offset, 0);

	MLX5_SET(copy_action_in, action, dst_offset, 24);



	modify_hdr = mlx5_modify_header_alloc(mdev, MLX5_FLOW_NAMESPACE_KERNEL,

					      1, action);
@@ -488,13 +488,13 @@ static int rx_add_rule(struct mlx5e_priv *priv, 


	setup_fte_common(attrs, ipsec_obj_id, spec, &flow_act);



	/* Set 1  bit ipsec marker */

	/* Set 24 bit ipsec_obj_id */

	/* Set bit[31] ipsec marker */

	/* Set bit[23-0] ipsec_obj_id */

	MLX5_SET(set_action_in, action, action_type, MLX5_ACTION_TYPE_SET);

	MLX5_SET(set_action_in, action, field, MLX5_ACTION_IN_FIELD_METADATA_REG_B);

	MLX5_SET(set_action_in, action, data, (ipsec_obj_id << 1) | 0x1);

	MLX5_SET(set_action_in, action, offset, 7);

	MLX5_SET(set_action_in, action, length, 25);

	MLX5_SET(set_action_in, action, data, (ipsec_obj_id | BIT(31)));

	MLX5_SET(set_action_in, action, offset, 0);

	MLX5_SET(set_action_in, action, length, 32);



	modify_hdr = mlx5_modify_header_alloc(priv->mdev, MLX5_FLOW_NAMESPACE_KERNEL,

					      1, action);

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

+1 −2
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev, 
				       struct mlx5_cqe64 *cqe)

{

	u32 ipsec_meta_data = be32_to_cpu(cqe->ft_metadata);

	u8 ipsec_syndrome = ipsec_meta_data & 0xFF;

	struct mlx5e_priv *priv;

	struct xfrm_offload *xo;

	struct xfrm_state *xs;
@@ -481,7 +480,7 @@ void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev, 
	xo = xfrm_offload(skb);

	xo->flags = CRYPTO_DONE;



	switch (ipsec_syndrome & MLX5_IPSEC_METADATA_SYNDROM_MASK) {

	switch (MLX5_IPSEC_METADATA_SYNDROM(ipsec_meta_data)) {

	case MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_DECRYPTED:

		xo->status = CRYPTO_SUCCESS;

		if (WARN_ON_ONCE(priv->ipsec->no_trailer))

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

+5 −4
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ 
#include "en.h"

#include "en/txrx.h"



#define MLX5_IPSEC_METADATA_MARKER_MASK      (0x80)

#define MLX5_IPSEC_METADATA_SYNDROM_MASK     (0x7F)

#define MLX5_IPSEC_METADATA_HANDLE(metadata) (((metadata) >> 8) & 0xFF)

/* Bit31: IPsec marker, Bit30-24: IPsec syndrome, Bit23-0: IPsec obj id */

#define MLX5_IPSEC_METADATA_MARKER(metadata)  (((metadata) >> 31) & 0x1)

#define MLX5_IPSEC_METADATA_SYNDROM(metadata) (((metadata) >> 24) & GENMASK(6, 0))

#define MLX5_IPSEC_METADATA_HANDLE(metadata)  ((metadata) & GENMASK(23, 0))



struct mlx5e_accel_tx_ipsec_state {

	struct xfrm_offload *xo;
@@ -78,7 +79,7 @@ static inline unsigned int mlx5e_ipsec_tx_ids_len(struct mlx5e_accel_tx_ipsec_st 


static inline bool mlx5_ipsec_is_rx_flow(struct mlx5_cqe64 *cqe)

{

	return !!(MLX5_IPSEC_METADATA_MARKER_MASK & be32_to_cpu(cqe->ft_metadata));

	return MLX5_IPSEC_METADATA_MARKER(be32_to_cpu(cqe->ft_metadata));

}



static inline bool mlx5e_ipsec_is_tx_flow(struct mlx5e_accel_tx_ipsec_state *ipsec_st)

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

+8 −5
Original line number Diff line number Diff line
@@ -476,19 +476,22 @@ static void resync_update_sn(struct mlx5e_rq *rq, struct sk_buff *skb) 


	depth += sizeof(struct tcphdr);



	if (unlikely(!sk || sk->sk_state == TCP_TIME_WAIT))

	if (unlikely(!sk))

		return;



	if (unlikely(!resync_queue_get_psv(sk)))

		return;

	if (unlikely(sk->sk_state == TCP_TIME_WAIT))

		goto unref;



	skb->sk = sk;

	skb->destructor = sock_edemux;

	if (unlikely(!resync_queue_get_psv(sk)))

		goto unref;



	seq = th->seq;

	datalen = skb->len - depth;

	tls_offload_rx_resync_async_request_start(sk, seq, datalen);

	rq->stats->tls_resync_req_start++;



unref:

	sock_gen_put(sk);

}



void mlx5e_ktls_rx_resync(struct net_device *netdev, struct sock *sk,

CRA Git | Maintained and supported by SUSTech CRA and CCSE