RDMA/efa: Update device interface (1e7b86f1) · Commits · git / linux-nf

drivers/infiniband/hw/efa/efa_admin_cmds_defs.h

+47 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ enum efa_admin_aq_opcode {
		EFA_ADMIN_DEALLOC_UAR = 17,
		EFA_ADMIN_CREATE_EQ = 18,
		EFA_ADMIN_DESTROY_EQ = 19,
		EFA_ADMIN_MAX_OPCODE = 19,
		EFA_ADMIN_ALLOC_MR = 20,
		EFA_ADMIN_MAX_OPCODE = 20,
		};

		enum efa_admin_aq_feature_id {
		@@ -150,8 +151,11 @@ struct efa_admin_create_qp_cmd {
		/* UAR number */
		u16 uar;

		/* Requested service level for the QP, 0 is the default SL */
		u8 sl;

		/* MBZ */
		u16 reserved;
		u8 reserved;

		/* MBZ */
		u32 reserved2;
		@@ -459,6 +463,41 @@ struct efa_admin_dereg_mr_resp {
		struct efa_admin_acq_common_desc acq_common_desc;
		};

		/*
		* Allocation of MemoryRegion, required for QP working with Virtual
		* Addresses in kernel verbs semantics, ready for fast registration use.
		*/
		struct efa_admin_alloc_mr_cmd {
		/* Common Admin Queue descriptor */
		struct efa_admin_aq_common_desc aq_common_desc;

		/* Protection Domain */
		u16 pd;

		/* MBZ */
		u16 reserved1;

		/* Maximum number of pages this MR supports. */
		u32 max_pages;
		};

		struct efa_admin_alloc_mr_resp {
		/* Common Admin Queue completion descriptor */
		struct efa_admin_acq_common_desc acq_common_desc;

		/*
		* L_Key, to be used in conjunction with local buffer references in
		* SQ and RQ WQE, or with virtual RQ/CQ rings
		*/
		u32 l_key;

		/*
		* R_Key, to be used in RDMA messages to refer to remotely accessed
		* memory region
		*/
		u32 r_key;
		};

		struct efa_admin_create_cq_cmd {
		struct efa_admin_aq_common_desc aq_common_desc;

		@@ -483,8 +522,8 @@ struct efa_admin_create_cq_cmd {
		*/
		u8 cq_caps_2;

		/* completion queue depth in # of entries. must be power of 2 */
		u16 cq_depth;
		/* Sub completion queue depth in # of entries. must be power of 2 */
		u16 sub_cq_depth;

		/* EQ number assigned to this cq */
		u16 eqn;
		@@ -519,8 +558,8 @@ struct efa_admin_create_cq_resp {

		u16 cq_idx;

		/* actual cq depth in number of entries */
		u16 cq_actual_depth;
		/* actual sub cq depth in number of entries */
		u16 sub_cq_actual_depth;

		/* CQ doorbell address, as offset to PCIe DB BAR */
		u32 db_offset;
		@@ -578,6 +617,8 @@ struct efa_admin_basic_stats {
		u64 rx_pkts;

		u64 rx_drops;

		u64 qkey_viol;
		};

		struct efa_admin_messages_stats {
		@@ -1057,7 +1098,6 @@ struct efa_admin_host_info {

		/* create_eq_cmd */
		#define EFA_ADMIN_CREATE_EQ_CMD_ENTRY_SIZE_WORDS_MASK GENMASK(4, 0)
		#define EFA_ADMIN_CREATE_EQ_CMD_VIRT_MASK BIT(6)
		#define EFA_ADMIN_CREATE_EQ_CMD_COMPLETION_EVENTS_MASK BIT(0)

		/* host_info */

drivers/infiniband/hw/efa/efa_admin_defs.h

+2 −2

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
		/*
		* Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All rights reserved.
		* Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
		*/

		#ifndef _EFA_ADMIN_H_
		@@ -96,7 +96,7 @@ struct efa_admin_acq_entry {
		struct efa_admin_aenq_common_desc {
		u16 group;

		u16 syndrom;
		u16 syndrome;

		/*
		* 0 : phase

drivers/infiniband/hw/efa/efa_com_cmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ int efa_com_create_cq(struct efa_com_dev *edev,
		EFA_SET(&create_cmd.cq_caps_2,
		EFA_ADMIN_CREATE_CQ_CMD_CQ_ENTRY_SIZE_WORDS,
		params->entry_size_in_bytes / 4);
		create_cmd.cq_depth = params->cq_depth;
		create_cmd.sub_cq_depth = params->sub_cq_depth;
		create_cmd.num_sub_cqs = params->num_sub_cqs;
		create_cmd.uar = params->uarn;
		if (params->interrupt_mode_enabled) {
		@@ -191,7 +191,7 @@ int efa_com_create_cq(struct efa_com_dev *edev,
		}

		result->cq_idx = cmd_completion.cq_idx;
		result->actual_depth = params->cq_depth;
		result->actual_depth = params->sub_cq_depth;
		result->db_off = cmd_completion.db_offset;
		result->db_valid = EFA_GET(&cmd_completion.flags,
		EFA_ADMIN_CREATE_CQ_RESP_DB_VALID);

drivers/infiniband/hw/efa/efa_com_cmd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ struct efa_com_create_cq_params {
		/* cq physical base address in OS memory */
		dma_addr_t dma_addr;
		/* completion queue depth in # of entries */
		u16 cq_depth;
		u16 sub_cq_depth;
		u16 num_sub_cqs;
		u16 uarn;
		u16 eqn;

drivers/infiniband/hw/efa/efa_io_defs.h

+96 −10

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
		/*
		* Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All rights reserved.
		* Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
		*/

		#ifndef _EFA_IO_H_
		@@ -10,6 +10,7 @@
		#define EFA_IO_TX_DESC_NUM_RDMA_BUFS 1
		#define EFA_IO_TX_DESC_INLINE_MAX_SIZE 32
		#define EFA_IO_TX_DESC_IMM_DATA_SIZE 4
		#define EFA_IO_TX_DESC_INLINE_PBL_SIZE 1

		enum efa_io_queue_type {
		/* send queue (of a QP) */
		@@ -25,6 +26,10 @@ enum efa_io_send_op_type {
		EFA_IO_RDMA_READ = 1,
		/* RDMA write */
		EFA_IO_RDMA_WRITE = 2,
		/* Fast MR registration */
		EFA_IO_FAST_REG = 3,
		/* Fast MR invalidation */
		EFA_IO_FAST_INV = 4,
		};

		enum efa_io_comp_status {
		@@ -34,15 +39,15 @@ enum efa_io_comp_status {
		EFA_IO_COMP_STATUS_FLUSHED = 1,
		/* Internal QP error */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_QP_INTERNAL_ERROR = 2,
		/* Bad operation type */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_INVALID_OP_TYPE = 3,
		/* Unsupported operation */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_UNSUPPORTED_OP = 3,
		/* Bad AH */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_INVALID_AH = 4,
		/* LKEY not registered or does not match IOVA */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_INVALID_LKEY = 5,
		/* Message too long */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_BAD_LENGTH = 6,
		/* Destination ENI is down or does not run EFA */
		/* RKEY not registered or does not match remote IOVA */
		EFA_IO_COMP_STATUS_REMOTE_ERROR_BAD_ADDRESS = 7,
		/* Connection was reset by remote side */
		EFA_IO_COMP_STATUS_REMOTE_ERROR_ABORT = 8,
		@@ -54,8 +59,17 @@ enum efa_io_comp_status {
		EFA_IO_COMP_STATUS_REMOTE_ERROR_BAD_LENGTH = 11,
		/* Unexpected status returned by responder */
		EFA_IO_COMP_STATUS_REMOTE_ERROR_BAD_STATUS = 12,
		/* Unresponsive remote - detected locally */
		/* Unresponsive remote - was previously responsive */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_UNRESP_REMOTE = 13,
		/* No valid AH at remote side (required for RDMA operations) */
		EFA_IO_COMP_STATUS_REMOTE_ERROR_UNKNOWN_PEER = 14,
		/* Unreachable remote - never received a response */
		EFA_IO_COMP_STATUS_LOCAL_ERROR_UNREACH_REMOTE = 15,
		};

		enum efa_io_frwr_pbl_mode {
		EFA_IO_FRWR_INLINE_PBL = 0,
		EFA_IO_FRWR_DIRECT_PBL = 1,
		};

		struct efa_io_tx_meta_desc {
		@@ -100,8 +114,8 @@ struct efa_io_tx_meta_desc {
		u16 length;

		/*
		* immediate data: if has_imm is set, then this field is included
		* within Tx message and reported in remote Rx completion.
		* immediate data: if has_imm is set, then this field is included within
		* Tx message and reported in remote Rx completion.
		*/
		u32 immediate_data;

		@@ -158,6 +172,63 @@ struct efa_io_rdma_req {
		struct efa_io_tx_buf_desc local_mem[1];
		};

		struct efa_io_fast_mr_reg_req {
		/* Updated local key of the MR after lkey/rkey increment */
		u32 lkey;

		/*
		* permissions
		* 0 : local_write_enable - Local write permissions:
		* must be set for RQ buffers and buffers posted for
		* RDMA Read requests
		* 1 : remote_write_enable - Remote write
		* permissions: must be set to enable RDMA write to
		* the region
		* 2 : remote_read_enable - Remote read permissions:
		* must be set to enable RDMA read from the region
		* 7:3 : reserved2 - MBZ
		*/
		u8 permissions;

		/*
		* control flags
		* 4:0 : phys_page_size_shift - page size is (1 <<
		* phys_page_size_shift)
		* 6:5 : pbl_mode - enum efa_io_frwr_pbl_mode
		* 7 : reserved - MBZ
		*/
		u8 flags;

		/* MBZ */
		u8 reserved[2];

		/* IO Virtual Address associated with this MR */
		u64 iova;

		/* Memory region length, in bytes */
		u64 mr_length;

		/* Physical Buffer List, each element is page-aligned. */
		union {
		/*
		* Inline array of physical page addresses (optimization
		* for short region activation).
		*/
		u64 inline_array[1];

		/* points to PBL (Currently only direct) */
		u64 dma_addr;
		} pbl;
		};

		struct efa_io_fast_mr_inv_req {
		/* Local key of the MR to invalidate */
		u32 lkey;

		/* MBZ */
		u8 reserved[28];
		};

		/*
		* Tx WQE, composed of tx meta descriptors followed by either tx buffer
		* descriptors or inline data
		@@ -174,6 +245,12 @@ struct efa_io_tx_wqe {

		/* RDMA local and remote memory addresses */
		struct efa_io_rdma_req rdma_req;

		/* Fast registration */
		struct efa_io_fast_mr_reg_req reg_mr_req;

		/* Fast invalidation */
		struct efa_io_fast_mr_inv_req inv_mr_req;
		} data;
		};

		@@ -221,7 +298,8 @@ struct efa_io_cdesc_common {
		* 3 : has_imm - indicates that immediate data is
		* present - for RX completions only
		* 6:4 : op_type - enum efa_io_send_op_type
		* 7 : reserved31 - MBZ
		* 7 : unsolicited - indicates that there is no
		* matching request - for RDMA with imm. RX only
		*/
		u8 flags;

		@@ -291,6 +369,13 @@ struct efa_io_rx_cdesc_ex {
		/* tx_buf_desc */
		#define EFA_IO_TX_BUF_DESC_LKEY_MASK GENMASK(23, 0)

		/* fast_mr_reg_req */
		#define EFA_IO_FAST_MR_REG_REQ_LOCAL_WRITE_ENABLE_MASK BIT(0)
		#define EFA_IO_FAST_MR_REG_REQ_REMOTE_WRITE_ENABLE_MASK BIT(1)
		#define EFA_IO_FAST_MR_REG_REQ_REMOTE_READ_ENABLE_MASK BIT(2)
		#define EFA_IO_FAST_MR_REG_REQ_PHYS_PAGE_SIZE_SHIFT_MASK GENMASK(4, 0)
		#define EFA_IO_FAST_MR_REG_REQ_PBL_MODE_MASK GENMASK(6, 5)

		/* rx_desc */
		#define EFA_IO_RX_DESC_LKEY_MASK GENMASK(23, 0)
		#define EFA_IO_RX_DESC_FIRST_MASK BIT(30)
		@@ -301,5 +386,6 @@ struct efa_io_rx_cdesc_ex {
		#define EFA_IO_CDESC_COMMON_Q_TYPE_MASK GENMASK(2, 1)
		#define EFA_IO_CDESC_COMMON_HAS_IMM_MASK BIT(3)
		#define EFA_IO_CDESC_COMMON_OP_TYPE_MASK GENMASK(6, 4)
		#define EFA_IO_CDESC_COMMON_UNSOLICITED_MASK BIT(7)

		#endif /* _EFA_IO_H_ */