Commit e396eccf authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 

* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

:
  net/mlx5: kTLS, Improve TLS params layout structures
  net/mlx5: Avoid eswitch header inclusion in fs core layer
  net/mlx5: Avoid RDMA file inclusion in core driver
  net/mlx5: Add support in query QP, CQ and MKEY segments
  net/mlx5: Export resource dump interface

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents b08866f4 2d1b69ed

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ static const char *const mlx5_rsc_sgmt_name[] = { 
	MLX5_SGMT_STR_ASSING(SX_SLICE_ALL),

	MLX5_SGMT_STR_ASSING(RDB),

	MLX5_SGMT_STR_ASSING(RX_SLICE_ALL),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_QP),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_CQ),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_MKEY),

};



struct mlx5_rsc_dump {
@@ -130,11 +133,13 @@ struct mlx5_rsc_dump_cmd *mlx5_rsc_dump_cmd_create(struct mlx5_core_dev *dev, 
	cmd->mem_size = key->size;

	return cmd;

}

EXPORT_SYMBOL(mlx5_rsc_dump_cmd_create);



void mlx5_rsc_dump_cmd_destroy(struct mlx5_rsc_dump_cmd *cmd)

{

	kfree(cmd);

}

EXPORT_SYMBOL(mlx5_rsc_dump_cmd_destroy);



int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd,

		       struct page *page, int *size)
@@ -155,6 +160,7 @@ int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd, 


	return more_dump;

}

EXPORT_SYMBOL(mlx5_rsc_dump_next);



#define MLX5_RSC_DUMP_MENU_SEGMENT 0xffff

static int mlx5_rsc_dump_menu(struct mlx5_core_dev *dev)

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h

+1 −32
Original line number Diff line number Diff line
@@ -4,41 +4,10 @@ 
#ifndef __MLX5_RSC_DUMP_H

#define __MLX5_RSC_DUMP_H



#include <linux/mlx5/rsc_dump.h>

#include <linux/mlx5/driver.h>

#include "mlx5_core.h"



enum mlx5_sgmt_type {

	MLX5_SGMT_TYPE_HW_CQPC,

	MLX5_SGMT_TYPE_HW_SQPC,

	MLX5_SGMT_TYPE_HW_RQPC,

	MLX5_SGMT_TYPE_FULL_SRQC,

	MLX5_SGMT_TYPE_FULL_CQC,

	MLX5_SGMT_TYPE_FULL_EQC,

	MLX5_SGMT_TYPE_FULL_QPC,

	MLX5_SGMT_TYPE_SND_BUFF,

	MLX5_SGMT_TYPE_RCV_BUFF,

	MLX5_SGMT_TYPE_SRQ_BUFF,

	MLX5_SGMT_TYPE_CQ_BUFF,

	MLX5_SGMT_TYPE_EQ_BUFF,

	MLX5_SGMT_TYPE_SX_SLICE,

	MLX5_SGMT_TYPE_SX_SLICE_ALL,

	MLX5_SGMT_TYPE_RDB,

	MLX5_SGMT_TYPE_RX_SLICE_ALL,

	MLX5_SGMT_TYPE_MENU,

	MLX5_SGMT_TYPE_TERMINATE,



	MLX5_SGMT_TYPE_NUM, /* Keep last */

};



struct mlx5_rsc_key {

	enum mlx5_sgmt_type rsc;

	int index1;

	int index2;

	int num_of_obj1;

	int num_of_obj2;

	int size;

};



#define MLX5_RSC_DUMP_ALL 0xFFFF

struct mlx5_rsc_dump_cmd;

struct mlx5_rsc_dump;

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

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ mlx5e_notify_hw(struct mlx5_wq_cyc *wq, u16 pc, void __iomem *uar_map, 


static inline bool mlx5e_transport_inline_tx_wqe(struct mlx5_wqe_ctrl_seg *cseg)

{

	return cseg && !!cseg->tisn;

	return cseg && !!cseg->tis_tir_num;

}



static inline u8

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#define MLX5E_KTLS_PROGRESS_WQE_SZ \

	(offsetof(struct mlx5e_tx_wqe, tls_progress_params_ctx) + \

	 MLX5_ST_SZ_BYTES(tls_progress_params))

	 sizeof(struct mlx5_wqe_tls_progress_params_seg))

#define MLX5E_KTLS_PROGRESS_WQEBBS \

	(DIV_ROUND_UP(MLX5E_KTLS_PROGRESS_WQE_SZ, MLX5_SEND_WQE_BB))

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

+9 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ build_static_params(struct mlx5e_umr_wqe *wqe, u16 pc, u32 sqn, 
	cseg->qpn_ds           = cpu_to_be32((sqn << MLX5_WQE_CTRL_QPN_SHIFT) |

					     STATIC_PARAMS_DS_CNT);

	cseg->fm_ce_se         = fence ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;

	cseg->tisn             = cpu_to_be32(priv_tx->tisn << 8);

	cseg->tis_tir_num      = cpu_to_be32(priv_tx->tisn << 8);



	ucseg->flags = MLX5_UMR_INLINE;

	ucseg->bsf_octowords = cpu_to_be16(MLX5_ST_SZ_BYTES(tls_static_params) / 16);
@@ -75,10 +75,14 @@ build_static_params(struct mlx5e_umr_wqe *wqe, u16 pc, u32 sqn, 
static void

fill_progress_params_ctx(void *ctx, struct mlx5e_ktls_offload_context_tx *priv_tx)

{

	MLX5_SET(tls_progress_params, ctx, tisn, priv_tx->tisn);

	MLX5_SET(tls_progress_params, ctx, record_tracker_state,

	struct mlx5_wqe_tls_progress_params_seg *params;



	params = ctx;



	params->tis_tir_num = cpu_to_be32(priv_tx->tisn);

	MLX5_SET(tls_progress_params, params->ctx, record_tracker_state,

		 MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_START);

	MLX5_SET(tls_progress_params, ctx, auth_state,

	MLX5_SET(tls_progress_params, params->ctx, auth_state,

		 MLX5E_TLS_PROGRESS_PARAMS_AUTH_STATE_NO_OFFLOAD);

}
@@ -284,7 +288,7 @@ tx_post_resync_dump(struct mlx5e_txqsq *sq, skb_frag_t *frag, u32 tisn, bool fir 


	cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8)  | MLX5_OPCODE_DUMP);

	cseg->qpn_ds           = cpu_to_be32((sq->sqn << 8) | ds_cnt);

	cseg->tisn             = cpu_to_be32(tisn << 8);

	cseg->tis_tir_num      = cpu_to_be32(tisn << 8);

	cseg->fm_ce_se         = first ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;



	fsz = skb_frag_size(frag);

CRA Git | Maintained and supported by SUSTech CRA and CCSE