Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3cf81f9 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

IB/iser,isert: Create and use new shared header 



The iser RDMA_CM negotiation protocol is shared by
the initiator and the target, so have a shared header
for the defines and structure. Move relevant items from
the initiator and target headers.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJenny Derzhavetz <jennyf@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1caa70d8

drivers/infiniband/ulp/iser/iscsi_iser.h

+4 −35
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <scsi/scsi_transport_iscsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_device.h>

#include <scsi/iser.h>



#include <linux/interrupt.h>

#include <linux/wait.h>
@@ -153,40 +154,8 @@ 


#define ISER_SIGNAL_CMD_COUNT 32



#define ISER_VER			0x10

#define ISER_WSV			0x08

#define ISER_RSV			0x04



/**

 * struct iser_hdr - iSER header

 *

 * @flags:        flags support (zbva, remote_inv)

 * @rsvd:         reserved

 * @write_stag:   write rkey

 * @write_va:     write virtual address

 * @reaf_stag:    read rkey

 * @read_va:      read virtual address

 */

struct iser_hdr {

	u8      flags;

	u8      rsvd[3];

	__be32  write_stag;

	__be64  write_va;

	__be32  read_stag;

	__be64  read_va;

} __attribute__((packed));





#define ISER_ZBVA_NOT_SUPPORTED		0x80

#define ISER_SEND_W_INV_NOT_SUPPORTED	0x40



struct iser_cm_hdr {

	u8      flags;

	u8      rsvd[3];

} __packed;



/* Constant PDU lengths calculations */

#define ISER_HEADERS_LEN  (sizeof(struct iser_hdr) + sizeof(struct iscsi_hdr))

#define ISER_HEADERS_LEN	(sizeof(struct iser_ctrl) + sizeof(struct iscsi_hdr))



#define ISER_RECV_DATA_SEG_LEN	128

#define ISER_RX_PAYLOAD_SIZE	(ISER_HEADERS_LEN + ISER_RECV_DATA_SEG_LEN)
@@ -283,7 +252,7 @@ enum iser_desc_type { 
 * @sig_attrs:     Signature attributes

 */

struct iser_tx_desc {

	struct iser_hdr              iser_header;

	struct iser_ctrl             iser_header;

	struct iscsi_hdr             iscsi_header;

	enum   iser_desc_type        type;

	u64		             dma_addr;
@@ -316,7 +285,7 @@ struct iser_tx_desc { 
 * @pad:           for sense data TODO: Modify to maximum sense length supported

 */

struct iser_rx_desc {

	struct iser_hdr              iser_header;

	struct iser_ctrl             iser_header;

	struct iscsi_hdr             iscsi_header;

	char		             data[ISER_RECV_DATA_SEG_LEN];

	u64		             dma_addr;

drivers/infiniband/ulp/iser/iser_initiator.c

+4 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int iser_prepare_read_cmd(struct iscsi_task *task) 
	struct iscsi_iser_task *iser_task = task->dd_data;

	struct iser_mem_reg *mem_reg;

	int err;

	struct iser_hdr *hdr = &iser_task->desc.iser_header;

	struct iser_ctrl *hdr = &iser_task->desc.iser_header;

	struct iser_data_buf *buf_in = &iser_task->data[ISER_DIR_IN];



	err = iser_dma_map_task_data(iser_task,
@@ -104,7 +104,7 @@ iser_prepare_write_cmd(struct iscsi_task *task, 
	struct iscsi_iser_task *iser_task = task->dd_data;

	struct iser_mem_reg *mem_reg;

	int err;

	struct iser_hdr *hdr = &iser_task->desc.iser_header;

	struct iser_ctrl *hdr = &iser_task->desc.iser_header;

	struct iser_data_buf *buf_out = &iser_task->data[ISER_DIR_OUT];

	struct ib_sge *tx_dsg = &iser_task->desc.tx_sg[1];
@@ -167,7 +167,7 @@ static void iser_create_send_desc(struct iser_conn *iser_conn, 
	ib_dma_sync_single_for_cpu(device->ib_device,

		tx_desc->dma_addr, ISER_HEADERS_LEN, DMA_TO_DEVICE);



	memset(&tx_desc->iser_header, 0, sizeof(struct iser_hdr));

	memset(&tx_desc->iser_header, 0, sizeof(struct iser_ctrl));

	tx_desc->iser_header.flags = ISER_VER;

	tx_desc->num_sge = 1;

}
@@ -574,7 +574,7 @@ void iser_login_rsp(struct ib_cq *cq, struct ib_wc *wc) 
				   desc->rsp_dma, ISER_RX_LOGIN_SIZE,

				   DMA_FROM_DEVICE);



	hdr = desc->rsp + sizeof(struct iser_hdr);

	hdr = desc->rsp + sizeof(struct iser_ctrl);

	data = desc->rsp + ISER_HEADERS_LEN;

	length = wc->byte_len - ISER_HEADERS_LEN;

drivers/infiniband/ulp/iser/iser_verbs.c

+3 −4
Original line number Diff line number Diff line
@@ -812,8 +812,7 @@ static void iser_route_handler(struct rdma_cm_id *cma_id) 
	conn_param.rnr_retry_count     = 6;



	memset(&req_hdr, 0, sizeof(req_hdr));

	req_hdr.flags = (ISER_ZBVA_NOT_SUPPORTED |

			ISER_SEND_W_INV_NOT_SUPPORTED);

	req_hdr.flags = (ISER_ZBVA_NOT_SUP | ISER_SEND_W_INV_NOT_SUP);

	conn_param.private_data	= (void *)&req_hdr;

	conn_param.private_data_len = sizeof(struct iser_cm_hdr);

drivers/infiniband/ulp/isert/ib_isert.c

+11 −11
Original line number Diff line number Diff line
@@ -1028,8 +1028,8 @@ isert_create_send_desc(struct isert_conn *isert_conn, 
	ib_dma_sync_single_for_cpu(ib_dev, tx_desc->dma_addr,

				   ISER_HEADERS_LEN, DMA_TO_DEVICE);



	memset(&tx_desc->iser_header, 0, sizeof(struct iser_hdr));

	tx_desc->iser_header.flags = ISER_VER;

	memset(&tx_desc->iser_header, 0, sizeof(struct iser_ctrl));

	tx_desc->iser_header.flags = ISCSI_CTRL;



	tx_desc->num_sge = 1;

	tx_desc->isert_cmd = isert_cmd;
@@ -1521,21 +1521,21 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc, 
static void

isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn)

{

	struct iser_hdr *iser_hdr = &rx_desc->iser_header;

	struct iser_ctrl *iser_ctrl = &rx_desc->iser_header;

	uint64_t read_va = 0, write_va = 0;

	uint32_t read_stag = 0, write_stag = 0;



	switch (iser_hdr->flags & 0xF0) {

	switch (iser_ctrl->flags & 0xF0) {

	case ISCSI_CTRL:

		if (iser_hdr->flags & ISER_RSV) {

			read_stag = be32_to_cpu(iser_hdr->read_stag);

			read_va = be64_to_cpu(iser_hdr->read_va);

		if (iser_ctrl->flags & ISER_RSV) {

			read_stag = be32_to_cpu(iser_ctrl->read_stag);

			read_va = be64_to_cpu(iser_ctrl->read_va);

			isert_dbg("ISER_RSV: read_stag: 0x%x read_va: 0x%llx\n",

				  read_stag, (unsigned long long)read_va);

		}

		if (iser_hdr->flags & ISER_WSV) {

			write_stag = be32_to_cpu(iser_hdr->write_stag);

			write_va = be64_to_cpu(iser_hdr->write_va);

		if (iser_ctrl->flags & ISER_WSV) {

			write_stag = be32_to_cpu(iser_ctrl->write_stag);

			write_va = be64_to_cpu(iser_ctrl->write_va);

			isert_dbg("ISER_WSV: write_stag: 0x%x write_va: 0x%llx\n",

				  write_stag, (unsigned long long)write_va);

		}
@@ -1546,7 +1546,7 @@ isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn) 
		isert_err("iSER Hello message\n");

		break;

	default:

		isert_warn("Unknown iSER hdr flags: 0x%02x\n", iser_hdr->flags);

		isert_warn("Unknown iSER hdr flags: 0x%02x\n", iser_ctrl->flags);

		break;

	}

drivers/infiniband/ulp/isert/ib_isert.h

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#include <linux/in6.h>

#include <rdma/ib_verbs.h>

#include <rdma/rdma_cm.h>

#include <scsi/iser.h>





#define DRV_NAME	"isert"

#define PFX		DRV_NAME ": "
@@ -56,7 +58,7 @@ enum iser_conn_state { 
};



struct iser_rx_desc {

	struct iser_hdr iser_header;

	struct iser_ctrl iser_header;

	struct iscsi_hdr iscsi_header;

	char		data[ISER_RECV_DATA_SEG_LEN];

	u64		dma_addr;
@@ -65,7 +67,7 @@ struct iser_rx_desc { 
} __packed;



struct iser_tx_desc {

	struct iser_hdr iser_header;

	struct iser_ctrl iser_header;

	struct iscsi_hdr iscsi_header;

	enum isert_desc_type type;

	u64		dma_addr;