* [PATCH v2 01/10] be2iscsi: Check tag in beiscsi_mccq_compl_wait
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-23 17:00 ` Tomas Henzl
2017-03-16 3:24 ` [PATCH v2 02/10] be2iscsi: Fix closing of connection Jitendra Bhivare
` (9 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
scsi host12: BS_1377 : mgmt_invalidate_connection Failed for cid=256
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffff81332ebf>] __list_add+0xf/0xc0
PGD 0
Oops: 0000 [#1] SMP
Modules linked in:
...
CPU: 9 PID: 1542 Comm: iscsid Tainted: G ------------ T 3.10.0-514.el7.x86_64 #1
Hardware name: HP ProLiant DL360 Gen9/ProLiant DL360 Gen9, BIOS P89 09/12/2016
task: ffff88076f310fb0 ti: ffff88076bba8000 task.ti: ffff88076bba8000
RIP: 0010:[<ffffffff81332ebf>] [<ffffffff81332ebf>] __list_add+0xf/0xc0
RSP: 0018:ffff88076bbab8e8 EFLAGS: 00010046
RAX: 0000000000000246 RBX: ffff88076bbab990 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffff880468badf58 RDI: ffff88076bbab990
RBP: ffff88076bbab900 R08: 0000000000000246 R09: 00000000000020de
R10: 0000000000000000 R11: ffff88076bbab5be R12: 0000000000000000
R13: ffff880468badf58 R14: 000000000001adb0 R15: ffff88076f310fb0
FS: 00007f377124a880(0000) GS:ffff88046fa40000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000008 CR3: 0000000771318000 CR4: 00000000001407e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Stack:
ffff88076bbab990 ffff880468badf50 0000000000000001 ffff88076bbab938
ffffffff810b128b 0000000000000246 00000000cf9b7040 ffff880468bac7a0
0000000000000000 ffff880468bac7a0 ffff88076bbab9d0 ffffffffa05a6ea3
Call Trace:
[<ffffffff810b128b>] prepare_to_wait+0x7b/0x90
[<ffffffffa05a6ea3>] beiscsi_mccq_compl_wait+0x153/0x330 [be2iscsi]
[<ffffffff810b1600>] ? wake_up_atomic_t+0x30/0x30
[<ffffffffa05981b1>] beiscsi_ep_disconnect+0x91/0x2d0 [be2iscsi]
[<ffffffffa0202ffa>] iscsi_if_ep_disconnect.isra.14+0x5a/0x70 [scsi_transport_iscsi]
[<ffffffffa02042fb>] iscsi_if_recv_msg+0x113b/0x14a0 [scsi_transport_iscsi]
[<ffffffff811dffd8>] ? __kmalloc_node_track_caller+0x58/0x290
[<ffffffffa02046ee>] iscsi_if_rx+0x8e/0x1f0 [scsi_transport_iscsi]
[<ffffffff815a351d>] netlink_unicast+0xed/0x1b0
[<ffffffff815a38fe>] netlink_sendmsg+0x31e/0x690
[<ffffffff815a03e4>] ? netlink_rcv_wake+0x44/0x60
[<ffffffff815a19e3>] ? netlink_recvmsg+0x1e3/0x450
beiscsi_mccq_compl_wait gets called even when MCC tag allocation failed
for mgmt_invalidate_connection.
mcc_wait is not initialized for tag 0 so causes crash in prepare_to_wait.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_cmds.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index 5d59e263..d14ddb2 100644
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -246,6 +246,12 @@ int beiscsi_mccq_compl_wait(struct beiscsi_hba *phba,
{
int rc = 0;
+ if (!tag || tag > MAX_MCC_CMD) {
+ __beiscsi_log(phba, KERN_ERR,
+ "BC_%d : invalid tag %u\n", tag);
+ return -EINVAL;
+ }
+
if (beiscsi_hba_in_error(phba)) {
clear_bit(MCC_TAG_STATE_RUNNING,
&phba->ctrl.ptag_state[tag].tag_state);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v2 01/10] be2iscsi: Check tag in beiscsi_mccq_compl_wait
2017-03-16 3:24 ` [PATCH v2 01/10] be2iscsi: Check tag in beiscsi_mccq_compl_wait Jitendra Bhivare
@ 2017-03-23 17:00 ` Tomas Henzl
0 siblings, 0 replies; 16+ messages in thread
From: Tomas Henzl @ 2017-03-23 17:00 UTC (permalink / raw)
To: Jitendra Bhivare, cleech, lduncan; +Cc: linux-scsi
On 16.3.2017 04:24, Jitendra Bhivare wrote:
> scsi host12: BS_1377 : mgmt_invalidate_connection Failed for cid=256
> BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
> IP: [<ffffffff81332ebf>] __list_add+0xf/0xc0
> PGD 0
> Oops: 0000 [#1] SMP
> Modules linked in:
> ...
> CPU: 9 PID: 1542 Comm: iscsid Tainted: G ------------ T 3.10.0-514.el7.x86_64 #1
> Hardware name: HP ProLiant DL360 Gen9/ProLiant DL360 Gen9, BIOS P89 09/12/2016
> task: ffff88076f310fb0 ti: ffff88076bba8000 task.ti: ffff88076bba8000
> RIP: 0010:[<ffffffff81332ebf>] [<ffffffff81332ebf>] __list_add+0xf/0xc0
> RSP: 0018:ffff88076bbab8e8 EFLAGS: 00010046
> RAX: 0000000000000246 RBX: ffff88076bbab990 RCX: 0000000000000000
> RDX: 0000000000000000 RSI: ffff880468badf58 RDI: ffff88076bbab990
> RBP: ffff88076bbab900 R08: 0000000000000246 R09: 00000000000020de
> R10: 0000000000000000 R11: ffff88076bbab5be R12: 0000000000000000
> R13: ffff880468badf58 R14: 000000000001adb0 R15: ffff88076f310fb0
> FS: 00007f377124a880(0000) GS:ffff88046fa40000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000000000008 CR3: 0000000771318000 CR4: 00000000001407e0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> Stack:
> ffff88076bbab990 ffff880468badf50 0000000000000001 ffff88076bbab938
> ffffffff810b128b 0000000000000246 00000000cf9b7040 ffff880468bac7a0
> 0000000000000000 ffff880468bac7a0 ffff88076bbab9d0 ffffffffa05a6ea3
>
> Call Trace:
> [<ffffffff810b128b>] prepare_to_wait+0x7b/0x90
> [<ffffffffa05a6ea3>] beiscsi_mccq_compl_wait+0x153/0x330 [be2iscsi]
> [<ffffffff810b1600>] ? wake_up_atomic_t+0x30/0x30
> [<ffffffffa05981b1>] beiscsi_ep_disconnect+0x91/0x2d0 [be2iscsi]
> [<ffffffffa0202ffa>] iscsi_if_ep_disconnect.isra.14+0x5a/0x70 [scsi_transport_iscsi]
> [<ffffffffa02042fb>] iscsi_if_recv_msg+0x113b/0x14a0 [scsi_transport_iscsi]
> [<ffffffff811dffd8>] ? __kmalloc_node_track_caller+0x58/0x290
> [<ffffffffa02046ee>] iscsi_if_rx+0x8e/0x1f0 [scsi_transport_iscsi]
> [<ffffffff815a351d>] netlink_unicast+0xed/0x1b0
> [<ffffffff815a38fe>] netlink_sendmsg+0x31e/0x690
> [<ffffffff815a03e4>] ? netlink_rcv_wake+0x44/0x60
> [<ffffffff815a19e3>] ? netlink_recvmsg+0x1e3/0x450
>
> beiscsi_mccq_compl_wait gets called even when MCC tag allocation failed
> for mgmt_invalidate_connection.
> mcc_wait is not initialized for tag 0 so causes crash in prepare_to_wait.
>
> Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
tomash
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 02/10] be2iscsi: Fix closing of connection
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 01/10] be2iscsi: Check tag in beiscsi_mccq_compl_wait Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-23 16:45 ` Tomas Henzl
2017-03-16 3:24 ` [PATCH v2 03/10] be2iscsi: Replace spin_unlock_bh with spin_lock Jitendra Bhivare
` (8 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
CID needs to be freed even when invalidate or upload connection fails.
Attempt to close connection 3 times before freeing CID.
Set cleanup_type to INVALIDATE instead of force TCP_RST.
This unnecessarily is terminating connection with reset instead of
gracefully closing it.
Set save_cfg to 0 - session not to be saved on flash.
Add delay and process CQ before uploading connection.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be.h | 1 -
drivers/scsi/be2iscsi/be_cmds.h | 63 +++++++++----------
drivers/scsi/be2iscsi/be_iscsi.c | 98 +++++++++++++++++-------------
drivers/scsi/be2iscsi/be_mgmt.c | 127 ++++++++++++++++++++-------------------
drivers/scsi/be2iscsi/be_mgmt.h | 30 ++-------
5 files changed, 159 insertions(+), 160 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
index ca9440f..4dd8de4 100644
--- a/drivers/scsi/be2iscsi/be.h
+++ b/drivers/scsi/be2iscsi/be.h
@@ -154,7 +154,6 @@ struct be_ctrl_info {
#define PAGE_SHIFT_4K 12
#define PAGE_SIZE_4K (1 << PAGE_SHIFT_4K)
#define mcc_timeout 120000 /* 12s timeout */
-#define BEISCSI_LOGOUT_SYNC_DELAY 250
/* Returns number of pages spanned by the data starting at the given addr */
#define PAGES_4K_SPANNED(_address, size) \
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 1d40e83..88fe731 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -1145,24 +1145,49 @@ struct tcp_connect_and_offload_out {
#define DB_DEF_PDU_EVENT_SHIFT 15
#define DB_DEF_PDU_CQPROC_SHIFT 16
-struct dmsg_cqe {
- u32 dw[4];
+struct be_invalidate_connection_params_in {
+ struct be_cmd_req_hdr hdr;
+ u32 session_handle;
+ u16 cid;
+ u16 unused;
+#define BE_CLEANUP_TYPE_INVALIDATE 0x8001
+#define BE_CLEANUP_TYPE_ISSUE_TCP_RST 0x8002
+ u16 cleanup_type;
+ u16 save_cfg;
+} __packed;
+
+struct be_invalidate_connection_params_out {
+ u32 session_handle;
+ u16 cid;
+ u16 unused;
} __packed;
-struct tcp_upload_params_in {
+union be_invalidate_connection_params {
+ struct be_invalidate_connection_params_in req;
+ struct be_invalidate_connection_params_out resp;
+} __packed;
+
+struct be_tcp_upload_params_in {
struct be_cmd_req_hdr hdr;
u16 id;
+#define BE_UPLOAD_TYPE_GRACEFUL 1
+/* abortive upload with reset */
+#define BE_UPLOAD_TYPE_ABORT_RESET 2
+/* abortive upload without reset */
+#define BE_UPLOAD_TYPE_ABORT 3
+/* abortive upload with reset, sequence number by driver */
+#define BE_UPLOAD_TYPE_ABORT_WITH_SEQ 4
u16 upload_type;
u32 reset_seq;
} __packed;
-struct tcp_upload_params_out {
+struct be_tcp_upload_params_out {
u32 dw[32];
} __packed;
-union tcp_upload_params {
- struct tcp_upload_params_in request;
- struct tcp_upload_params_out response;
+union be_tcp_upload_params {
+ struct be_tcp_upload_params_in request;
+ struct be_tcp_upload_params_out response;
} __packed;
struct be_ulp_fw_cfg {
@@ -1243,10 +1268,7 @@ struct be_cmd_get_port_name {
#define OPCODE_COMMON_WRITE_FLASH 96
#define OPCODE_COMMON_READ_FLASH 97
-/* --- CMD_ISCSI_INVALIDATE_CONNECTION_TYPE --- */
#define CMD_ISCSI_COMMAND_INVALIDATE 1
-#define CMD_ISCSI_CONNECTION_INVALIDATE 0x8001
-#define CMD_ISCSI_CONNECTION_ISSUE_TCP_RST 0x8002
#define INI_WR_CMD 1 /* Initiator write command */
#define INI_TMF_CMD 2 /* Initiator TMF command */
@@ -1269,27 +1291,6 @@ struct be_cmd_get_port_name {
* preparedby
* driver should not be touched
*/
-/* --- CMD_CHUTE_TYPE --- */
-#define CMD_CONNECTION_CHUTE_0 1
-#define CMD_CONNECTION_CHUTE_1 2
-#define CMD_CONNECTION_CHUTE_2 3
-
-#define EQ_MAJOR_CODE_COMPLETION 0
-
-#define CMD_ISCSI_SESSION_DEL_CFG_FROM_FLASH 0
-#define CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH 1
-
-/* --- CONNECTION_UPLOAD_PARAMS --- */
-/* These parameters are used to define the type of upload desired. */
-#define CONNECTION_UPLOAD_GRACEFUL 1 /* Graceful upload */
-#define CONNECTION_UPLOAD_ABORT_RESET 2 /* Abortive upload with
- * reset
- */
-#define CONNECTION_UPLOAD_ABORT 3 /* Abortive upload without
- * reset
- */
-#define CONNECTION_UPLOAD_ABORT_WITH_SEQ 4 /* Abortive upload with reset,
- * sequence number by driver */
/* Returns the number of items in the field array. */
#define BE_NUMBER_OF_FIELD(_type_, _field_) \
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index a484457..2af714f 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -1263,31 +1263,58 @@ static void beiscsi_flush_cq(struct beiscsi_hba *phba)
}
/**
- * beiscsi_close_conn - Upload the connection
+ * beiscsi_conn_close - Invalidate and upload connection
* @ep: The iscsi endpoint
- * @flag: The type of connection closure
+ *
+ * Returns 0 on success, -1 on failure.
*/
-static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
+static int beiscsi_conn_close(struct beiscsi_endpoint *beiscsi_ep)
{
- int ret = 0;
- unsigned int tag;
struct beiscsi_hba *phba = beiscsi_ep->phba;
+ unsigned int tag, attempts;
+ int ret;
- tag = mgmt_upload_connection(phba, beiscsi_ep->ep_cid, flag);
- if (!tag) {
- beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
- "BS_%d : upload failed for cid 0x%x\n",
- beiscsi_ep->ep_cid);
-
- ret = -EAGAIN;
+ /**
+ * Without successfully invalidating and uploading connection
+ * driver can't reuse the CID so attempt more than once.
+ */
+ attempts = 0;
+ while (attempts++ < 3) {
+ tag = beiscsi_invalidate_cxn(phba, beiscsi_ep);
+ if (tag) {
+ ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
+ if (!ret)
+ break;
+ beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
+ "BS_%d : invalidate conn failed cid %d\n",
+ beiscsi_ep->ep_cid);
+ }
}
- ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
-
- /* Flush the CQ entries */
+ /* wait for all completions to arrive, then process them */
+ msleep(250);
+ /* flush CQ entries */
beiscsi_flush_cq(phba);
- return ret;
+ if (attempts == 3)
+ return -1;
+
+ attempts = 0;
+ while (attempts++ < 3) {
+ tag = beiscsi_upload_cxn(phba, beiscsi_ep);
+ if (tag) {
+ ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
+ if (!ret)
+ break;
+ beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
+ "BS_%d : upload conn failed cid %d\n",
+ beiscsi_ep->ep_cid);
+ }
+ }
+ if (attempts == 3)
+ return -1;
+
+ return 0;
}
/**
@@ -1298,12 +1325,9 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
*/
void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
{
- struct beiscsi_conn *beiscsi_conn;
struct beiscsi_endpoint *beiscsi_ep;
+ struct beiscsi_conn *beiscsi_conn;
struct beiscsi_hba *phba;
- unsigned int tag;
- uint8_t mgmt_invalidate_flag, tcp_upload_flag;
- unsigned short savecfg_flag = CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH;
uint16_t cri_index;
beiscsi_ep = ep->dd_data;
@@ -1324,39 +1348,27 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
if (beiscsi_ep->conn) {
beiscsi_conn = beiscsi_ep->conn;
iscsi_suspend_queue(beiscsi_conn->conn);
- mgmt_invalidate_flag = ~BEISCSI_NO_RST_ISSUE;
- tcp_upload_flag = CONNECTION_UPLOAD_GRACEFUL;
- } else {
- mgmt_invalidate_flag = BEISCSI_NO_RST_ISSUE;
- tcp_upload_flag = CONNECTION_UPLOAD_ABORT;
}
if (!beiscsi_hba_is_online(phba)) {
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
"BS_%d : HBA in error 0x%lx\n", phba->state);
- goto free_ep;
- }
-
- tag = mgmt_invalidate_connection(phba, beiscsi_ep,
- beiscsi_ep->ep_cid,
- mgmt_invalidate_flag,
- savecfg_flag);
- if (!tag) {
- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
- "BS_%d : mgmt_invalidate_connection Failed for cid=%d\n",
- beiscsi_ep->ep_cid);
+ } else {
+ /**
+ * Make CID available even if close fails.
+ * If not freed, FW might fail open using the CID.
+ */
+ if (beiscsi_conn_close(beiscsi_ep) < 0)
+ __beiscsi_log(phba, KERN_ERR,
+ "BS_%d : close conn failed cid %d\n",
+ beiscsi_ep->ep_cid);
}
- beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
- beiscsi_close_conn(beiscsi_ep, tcp_upload_flag);
-free_ep:
- msleep(BEISCSI_LOGOUT_SYNC_DELAY);
beiscsi_free_ep(beiscsi_ep);
if (!phba->conn_table[cri_index])
__beiscsi_log(phba, KERN_ERR,
- "BS_%d : conn_table empty at %u: cid %u\n",
- cri_index,
- beiscsi_ep->ep_cid);
+ "BS_%d : conn_table empty at %u: cid %u\n",
+ cri_index, beiscsi_ep->ep_cid);
phba->conn_table[cri_index] = NULL;
iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);
}
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 2f6d5c2..3198c84 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -126,67 +126,6 @@ unsigned int mgmt_vendor_specific_fw_cmd(struct be_ctrl_info *ctrl,
return tag;
}
-unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,
- struct beiscsi_endpoint *beiscsi_ep,
- unsigned short cid,
- unsigned short issue_reset,
- unsigned short savecfg_flag)
-{
- struct be_ctrl_info *ctrl = &phba->ctrl;
- struct be_mcc_wrb *wrb;
- struct iscsi_invalidate_connection_params_in *req;
- unsigned int tag = 0;
-
- mutex_lock(&ctrl->mbox_lock);
- wrb = alloc_mcc_wrb(phba, &tag);
- if (!wrb) {
- mutex_unlock(&ctrl->mbox_lock);
- return 0;
- }
-
- req = embedded_payload(wrb);
- be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
- be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI_INI,
- OPCODE_ISCSI_INI_DRIVER_INVALIDATE_CONNECTION,
- sizeof(*req));
- req->session_handle = beiscsi_ep->fw_handle;
- req->cid = cid;
- if (issue_reset)
- req->cleanup_type = CMD_ISCSI_CONNECTION_ISSUE_TCP_RST;
- else
- req->cleanup_type = CMD_ISCSI_CONNECTION_INVALIDATE;
- req->save_cfg = savecfg_flag;
- be_mcc_notify(phba, tag);
- mutex_unlock(&ctrl->mbox_lock);
- return tag;
-}
-
-unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,
- unsigned short cid, unsigned int upload_flag)
-{
- struct be_ctrl_info *ctrl = &phba->ctrl;
- struct be_mcc_wrb *wrb;
- struct tcp_upload_params_in *req;
- unsigned int tag;
-
- mutex_lock(&ctrl->mbox_lock);
- wrb = alloc_mcc_wrb(phba, &tag);
- if (!wrb) {
- mutex_unlock(&ctrl->mbox_lock);
- return 0;
- }
-
- req = embedded_payload(wrb);
- be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
- be_cmd_hdr_prepare(&req->hdr, CMD_COMMON_TCP_UPLOAD,
- OPCODE_COMMON_TCP_UPLOAD, sizeof(*req));
- req->id = (unsigned short)cid;
- req->upload_type = (unsigned char)upload_flag;
- be_mcc_notify(phba, tag);
- mutex_unlock(&ctrl->mbox_lock);
- return tag;
-}
-
/**
* mgmt_open_connection()- Establish a TCP CXN
* @dst_addr: Destination Address
@@ -1449,6 +1388,72 @@ void beiscsi_offload_cxn_v2(struct beiscsi_offload_params *params,
exp_statsn) / 32] + 1));
}
+unsigned int beiscsi_invalidate_cxn(struct beiscsi_hba *phba,
+ struct beiscsi_endpoint *beiscsi_ep)
+{
+ struct be_invalidate_connection_params_in *req;
+ struct be_ctrl_info *ctrl = &phba->ctrl;
+ struct be_mcc_wrb *wrb;
+ unsigned int tag = 0;
+
+ mutex_lock(&ctrl->mbox_lock);
+ wrb = alloc_mcc_wrb(phba, &tag);
+ if (!wrb) {
+ mutex_unlock(&ctrl->mbox_lock);
+ return 0;
+ }
+
+ req = embedded_payload(wrb);
+ be_wrb_hdr_prepare(wrb, sizeof(union be_invalidate_connection_params),
+ true, 0);
+ be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI_INI,
+ OPCODE_ISCSI_INI_DRIVER_INVALIDATE_CONNECTION,
+ sizeof(*req));
+ req->session_handle = beiscsi_ep->fw_handle;
+ req->cid = beiscsi_ep->ep_cid;
+ if (beiscsi_ep->conn)
+ req->cleanup_type = BE_CLEANUP_TYPE_INVALIDATE;
+ else
+ req->cleanup_type = BE_CLEANUP_TYPE_ISSUE_TCP_RST;
+ /**
+ * 0 - non-persistent targets
+ * 1 - save session info on flash
+ */
+ req->save_cfg = 0;
+ be_mcc_notify(phba, tag);
+ mutex_unlock(&ctrl->mbox_lock);
+ return tag;
+}
+
+unsigned int beiscsi_upload_cxn(struct beiscsi_hba *phba,
+ struct beiscsi_endpoint *beiscsi_ep)
+{
+ struct be_ctrl_info *ctrl = &phba->ctrl;
+ struct be_mcc_wrb *wrb;
+ struct be_tcp_upload_params_in *req;
+ unsigned int tag;
+
+ mutex_lock(&ctrl->mbox_lock);
+ wrb = alloc_mcc_wrb(phba, &tag);
+ if (!wrb) {
+ mutex_unlock(&ctrl->mbox_lock);
+ return 0;
+ }
+
+ req = embedded_payload(wrb);
+ be_wrb_hdr_prepare(wrb, sizeof(union be_tcp_upload_params), true, 0);
+ be_cmd_hdr_prepare(&req->hdr, CMD_COMMON_TCP_UPLOAD,
+ OPCODE_COMMON_TCP_UPLOAD, sizeof(*req));
+ req->id = beiscsi_ep->ep_cid;
+ if (beiscsi_ep->conn)
+ req->upload_type = BE_UPLOAD_TYPE_GRACEFUL;
+ else
+ req->upload_type = BE_UPLOAD_TYPE_ABORT;
+ be_mcc_notify(phba, tag);
+ mutex_unlock(&ctrl->mbox_lock);
+ return tag;
+}
+
int beiscsi_mgmt_invalidate_icds(struct beiscsi_hba *phba,
struct invldt_cmd_tbl *inv_tbl,
unsigned int nents)
diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
index 308f147..1ad6c40 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.h
+++ b/drivers/scsi/be2iscsi/be_mgmt.h
@@ -41,35 +41,11 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
struct beiscsi_endpoint *beiscsi_ep,
struct be_dma_mem *nonemb_cmd);
-unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,
- unsigned short cid,
- unsigned int upload_flag);
unsigned int mgmt_vendor_specific_fw_cmd(struct be_ctrl_info *ctrl,
struct beiscsi_hba *phba,
struct bsg_job *job,
struct be_dma_mem *nonemb_cmd);
-#define BEISCSI_NO_RST_ISSUE 0
-struct iscsi_invalidate_connection_params_in {
- struct be_cmd_req_hdr hdr;
- unsigned int session_handle;
- unsigned short cid;
- unsigned short unused;
- unsigned short cleanup_type;
- unsigned short save_cfg;
-} __packed;
-
-struct iscsi_invalidate_connection_params_out {
- unsigned int session_handle;
- unsigned short cid;
- unsigned short unused;
-} __packed;
-
-union iscsi_invalidate_connection_params {
- struct iscsi_invalidate_connection_params_in request;
- struct iscsi_invalidate_connection_params_out response;
-} __packed;
-
#define BE_INVLDT_CMD_TBL_SZ 128
struct invldt_cmd_tbl {
unsigned short icd;
@@ -265,6 +241,12 @@ void beiscsi_offload_cxn_v2(struct beiscsi_offload_params *params,
struct wrb_handle *pwrb_handle,
struct hwi_wrb_context *pwrb_context);
+unsigned int beiscsi_invalidate_cxn(struct beiscsi_hba *phba,
+ struct beiscsi_endpoint *beiscsi_ep);
+
+unsigned int beiscsi_upload_cxn(struct beiscsi_hba *phba,
+ struct beiscsi_endpoint *beiscsi_ep);
+
int be_cmd_modify_eq_delay(struct beiscsi_hba *phba,
struct be_set_eqd *, int num);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v2 02/10] be2iscsi: Fix closing of connection
2017-03-16 3:24 ` [PATCH v2 02/10] be2iscsi: Fix closing of connection Jitendra Bhivare
@ 2017-03-23 16:45 ` Tomas Henzl
2017-03-24 8:24 ` Jitendra Bhivare
0 siblings, 1 reply; 16+ messages in thread
From: Tomas Henzl @ 2017-03-23 16:45 UTC (permalink / raw)
To: Jitendra Bhivare, cleech, lduncan; +Cc: linux-scsi
On 16.3.2017 04:24, Jitendra Bhivare wrote:
> CID needs to be freed even when invalidate or upload connection fails.
> Attempt to close connection 3 times before freeing CID.
>
> Set cleanup_type to INVALIDATE instead of force TCP_RST.
> This unnecessarily is terminating connection with reset instead of
> gracefully closing it.
>
> Set save_cfg to 0 - session not to be saved on flash.
>
> Add delay and process CQ before uploading connection.
>
> Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
> ---
> drivers/scsi/be2iscsi/be.h | 1 -
> drivers/scsi/be2iscsi/be_cmds.h | 63 +++++++++----------
> drivers/scsi/be2iscsi/be_iscsi.c | 98 +++++++++++++++++-------------
> drivers/scsi/be2iscsi/be_mgmt.c | 127 ++++++++++++++++++++-------------------
> drivers/scsi/be2iscsi/be_mgmt.h | 30 ++-------
> 5 files changed, 159 insertions(+), 160 deletions(-)
>
> diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
> index ca9440f..4dd8de4 100644
> --- a/drivers/scsi/be2iscsi/be.h
> +++ b/drivers/scsi/be2iscsi/be.h
> @@ -154,7 +154,6 @@ struct be_ctrl_info {
> #define PAGE_SHIFT_4K 12
> #define PAGE_SIZE_4K (1 << PAGE_SHIFT_4K)
> #define mcc_timeout 120000 /* 12s timeout */
> -#define BEISCSI_LOGOUT_SYNC_DELAY 250
>
> /* Returns number of pages spanned by the data starting at the given addr */
> #define PAGES_4K_SPANNED(_address, size) \
> diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
> index 1d40e83..88fe731 100644
> --- a/drivers/scsi/be2iscsi/be_cmds.h
> +++ b/drivers/scsi/be2iscsi/be_cmds.h
> @@ -1145,24 +1145,49 @@ struct tcp_connect_and_offload_out {
> #define DB_DEF_PDU_EVENT_SHIFT 15
> #define DB_DEF_PDU_CQPROC_SHIFT 16
>
> -struct dmsg_cqe {
> - u32 dw[4];
> +struct be_invalidate_connection_params_in {
> + struct be_cmd_req_hdr hdr;
> + u32 session_handle;
> + u16 cid;
> + u16 unused;
> +#define BE_CLEANUP_TYPE_INVALIDATE 0x8001
> +#define BE_CLEANUP_TYPE_ISSUE_TCP_RST 0x8002
> + u16 cleanup_type;
> + u16 save_cfg;
> +} __packed;
> +
> +struct be_invalidate_connection_params_out {
> + u32 session_handle;
> + u16 cid;
> + u16 unused;
> } __packed;
>
> -struct tcp_upload_params_in {
> +union be_invalidate_connection_params {
> + struct be_invalidate_connection_params_in req;
> + struct be_invalidate_connection_params_out resp;
> +} __packed;
> +
> +struct be_tcp_upload_params_in {
> struct be_cmd_req_hdr hdr;
> u16 id;
> +#define BE_UPLOAD_TYPE_GRACEFUL 1
> +/* abortive upload with reset */
> +#define BE_UPLOAD_TYPE_ABORT_RESET 2
> +/* abortive upload without reset */
> +#define BE_UPLOAD_TYPE_ABORT 3
> +/* abortive upload with reset, sequence number by driver */
> +#define BE_UPLOAD_TYPE_ABORT_WITH_SEQ 4
> u16 upload_type;
> u32 reset_seq;
> } __packed;
>
> -struct tcp_upload_params_out {
> +struct be_tcp_upload_params_out {
> u32 dw[32];
> } __packed;
>
> -union tcp_upload_params {
> - struct tcp_upload_params_in request;
> - struct tcp_upload_params_out response;
> +union be_tcp_upload_params {
> + struct be_tcp_upload_params_in request;
> + struct be_tcp_upload_params_out response;
> } __packed;
>
> struct be_ulp_fw_cfg {
> @@ -1243,10 +1268,7 @@ struct be_cmd_get_port_name {
> #define OPCODE_COMMON_WRITE_FLASH 96
> #define OPCODE_COMMON_READ_FLASH 97
>
> -/* --- CMD_ISCSI_INVALIDATE_CONNECTION_TYPE --- */
> #define CMD_ISCSI_COMMAND_INVALIDATE 1
> -#define CMD_ISCSI_CONNECTION_INVALIDATE 0x8001
> -#define CMD_ISCSI_CONNECTION_ISSUE_TCP_RST 0x8002
>
> #define INI_WR_CMD 1 /* Initiator write command */
> #define INI_TMF_CMD 2 /* Initiator TMF command */
> @@ -1269,27 +1291,6 @@ struct be_cmd_get_port_name {
> * preparedby
> * driver should not be touched
> */
> -/* --- CMD_CHUTE_TYPE --- */
> -#define CMD_CONNECTION_CHUTE_0 1
> -#define CMD_CONNECTION_CHUTE_1 2
> -#define CMD_CONNECTION_CHUTE_2 3
> -
> -#define EQ_MAJOR_CODE_COMPLETION 0
> -
> -#define CMD_ISCSI_SESSION_DEL_CFG_FROM_FLASH 0
> -#define CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH 1
> -
> -/* --- CONNECTION_UPLOAD_PARAMS --- */
> -/* These parameters are used to define the type of upload desired. */
> -#define CONNECTION_UPLOAD_GRACEFUL 1 /* Graceful upload */
> -#define CONNECTION_UPLOAD_ABORT_RESET 2 /* Abortive upload with
> - * reset
> - */
> -#define CONNECTION_UPLOAD_ABORT 3 /* Abortive upload without
> - * reset
> - */
> -#define CONNECTION_UPLOAD_ABORT_WITH_SEQ 4 /* Abortive upload with reset,
> - * sequence number by driver */
>
> /* Returns the number of items in the field array. */
> #define BE_NUMBER_OF_FIELD(_type_, _field_) \
> diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
> index a484457..2af714f 100644
> --- a/drivers/scsi/be2iscsi/be_iscsi.c
> +++ b/drivers/scsi/be2iscsi/be_iscsi.c
> @@ -1263,31 +1263,58 @@ static void beiscsi_flush_cq(struct beiscsi_hba *phba)
> }
>
> /**
> - * beiscsi_close_conn - Upload the connection
> + * beiscsi_conn_close - Invalidate and upload connection
> * @ep: The iscsi endpoint
> - * @flag: The type of connection closure
> + *
> + * Returns 0 on success, -1 on failure.
> */
> -static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
> +static int beiscsi_conn_close(struct beiscsi_endpoint *beiscsi_ep)
> {
> - int ret = 0;
> - unsigned int tag;
> struct beiscsi_hba *phba = beiscsi_ep->phba;
> + unsigned int tag, attempts;
> + int ret;
>
> - tag = mgmt_upload_connection(phba, beiscsi_ep->ep_cid, flag);
> - if (!tag) {
> - beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
> - "BS_%d : upload failed for cid 0x%x\n",
> - beiscsi_ep->ep_cid);
> -
> - ret = -EAGAIN;
> + /**
> + * Without successfully invalidating and uploading connection
> + * driver can't reuse the CID so attempt more than once.
> + */
> + attempts = 0;
> + while (attempts++ < 3) {
> + tag = beiscsi_invalidate_cxn(phba, beiscsi_ep);
> + if (tag) {
> + ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
> + if (!ret)
> + break;
> + beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
> + "BS_%d : invalidate conn failed cid %d\n",
> + beiscsi_ep->ep_cid);
> + }
> }
>
> - ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
> -
> - /* Flush the CQ entries */
> + /* wait for all completions to arrive, then process them */
> + msleep(250);
> + /* flush CQ entries */
> beiscsi_flush_cq(phba);
>
> - return ret;
> + if (attempts == 3)
Hi Jitendra,
when attempts is updated after a '< 3' test, then I think that the test here should be
changed to 'if (attempts > 3)'
tomash
> + return -1;
> +
> + attempts = 0;
> + while (attempts++ < 3) {
> + tag = beiscsi_upload_cxn(phba, beiscsi_ep);
> + if (tag) {
> + ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
> + if (!ret)
> + break;
> + beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
> + "BS_%d : upload conn failed cid %d\n",
> + beiscsi_ep->ep_cid);
> + }
> + }
> + if (attempts == 3)
> + return -1;
> +
> + return 0;
> }
>
> /**
> @@ -1298,12 +1325,9 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
> */
> void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
> {
> - struct beiscsi_conn *beiscsi_conn;
> struct beiscsi_endpoint *beiscsi_ep;
> + struct beiscsi_conn *beiscsi_conn;
> struct beiscsi_hba *phba;
> - unsigned int tag;
> - uint8_t mgmt_invalidate_flag, tcp_upload_flag;
> - unsigned short savecfg_flag = CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH;
> uint16_t cri_index;
>
> beiscsi_ep = ep->dd_data;
> @@ -1324,39 +1348,27 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
> if (beiscsi_ep->conn) {
> beiscsi_conn = beiscsi_ep->conn;
> iscsi_suspend_queue(beiscsi_conn->conn);
> - mgmt_invalidate_flag = ~BEISCSI_NO_RST_ISSUE;
> - tcp_upload_flag = CONNECTION_UPLOAD_GRACEFUL;
> - } else {
> - mgmt_invalidate_flag = BEISCSI_NO_RST_ISSUE;
> - tcp_upload_flag = CONNECTION_UPLOAD_ABORT;
> }
>
> if (!beiscsi_hba_is_online(phba)) {
> beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
> "BS_%d : HBA in error 0x%lx\n", phba->state);
> - goto free_ep;
> - }
> -
> - tag = mgmt_invalidate_connection(phba, beiscsi_ep,
> - beiscsi_ep->ep_cid,
> - mgmt_invalidate_flag,
> - savecfg_flag);
> - if (!tag) {
> - beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
> - "BS_%d : mgmt_invalidate_connection Failed for cid=%d\n",
> - beiscsi_ep->ep_cid);
> + } else {
> + /**
> + * Make CID available even if close fails.
> + * If not freed, FW might fail open using the CID.
> + */
> + if (beiscsi_conn_close(beiscsi_ep) < 0)
> + __beiscsi_log(phba, KERN_ERR,
> + "BS_%d : close conn failed cid %d\n",
> + beiscsi_ep->ep_cid);
> }
>
> - beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
> - beiscsi_close_conn(beiscsi_ep, tcp_upload_flag);
> -free_ep:
> - msleep(BEISCSI_LOGOUT_SYNC_DELAY);
> beiscsi_free_ep(beiscsi_ep);
> if (!phba->conn_table[cri_index])
> __beiscsi_log(phba, KERN_ERR,
> - "BS_%d : conn_table empty at %u: cid %u\n",
> - cri_index,
> - beiscsi_ep->ep_cid);
> + "BS_%d : conn_table empty at %u: cid %u\n",
> + cri_index, beiscsi_ep->ep_cid);
> phba->conn_table[cri_index] = NULL;
> iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);
> }
> diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
> index 2f6d5c2..3198c84 100644
> --- a/drivers/scsi/be2iscsi/be_mgmt.c
> +++ b/drivers/scsi/be2iscsi/be_mgmt.c
> @@ -126,67 +126,6 @@ unsigned int mgmt_vendor_specific_fw_cmd(struct be_ctrl_info *ctrl,
> return tag;
> }
>
> -unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,
> - struct beiscsi_endpoint *beiscsi_ep,
> - unsigned short cid,
> - unsigned short issue_reset,
> - unsigned short savecfg_flag)
> -{
> - struct be_ctrl_info *ctrl = &phba->ctrl;
> - struct be_mcc_wrb *wrb;
> - struct iscsi_invalidate_connection_params_in *req;
> - unsigned int tag = 0;
> -
> - mutex_lock(&ctrl->mbox_lock);
> - wrb = alloc_mcc_wrb(phba, &tag);
> - if (!wrb) {
> - mutex_unlock(&ctrl->mbox_lock);
> - return 0;
> - }
> -
> - req = embedded_payload(wrb);
> - be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
> - be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI_INI,
> - OPCODE_ISCSI_INI_DRIVER_INVALIDATE_CONNECTION,
> - sizeof(*req));
> - req->session_handle = beiscsi_ep->fw_handle;
> - req->cid = cid;
> - if (issue_reset)
> - req->cleanup_type = CMD_ISCSI_CONNECTION_ISSUE_TCP_RST;
> - else
> - req->cleanup_type = CMD_ISCSI_CONNECTION_INVALIDATE;
> - req->save_cfg = savecfg_flag;
> - be_mcc_notify(phba, tag);
> - mutex_unlock(&ctrl->mbox_lock);
> - return tag;
> -}
> -
> -unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,
> - unsigned short cid, unsigned int upload_flag)
> -{
> - struct be_ctrl_info *ctrl = &phba->ctrl;
> - struct be_mcc_wrb *wrb;
> - struct tcp_upload_params_in *req;
> - unsigned int tag;
> -
> - mutex_lock(&ctrl->mbox_lock);
> - wrb = alloc_mcc_wrb(phba, &tag);
> - if (!wrb) {
> - mutex_unlock(&ctrl->mbox_lock);
> - return 0;
> - }
> -
> - req = embedded_payload(wrb);
> - be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
> - be_cmd_hdr_prepare(&req->hdr, CMD_COMMON_TCP_UPLOAD,
> - OPCODE_COMMON_TCP_UPLOAD, sizeof(*req));
> - req->id = (unsigned short)cid;
> - req->upload_type = (unsigned char)upload_flag;
> - be_mcc_notify(phba, tag);
> - mutex_unlock(&ctrl->mbox_lock);
> - return tag;
> -}
> -
> /**
> * mgmt_open_connection()- Establish a TCP CXN
> * @dst_addr: Destination Address
> @@ -1449,6 +1388,72 @@ void beiscsi_offload_cxn_v2(struct beiscsi_offload_params *params,
> exp_statsn) / 32] + 1));
> }
>
> +unsigned int beiscsi_invalidate_cxn(struct beiscsi_hba *phba,
> + struct beiscsi_endpoint *beiscsi_ep)
> +{
> + struct be_invalidate_connection_params_in *req;
> + struct be_ctrl_info *ctrl = &phba->ctrl;
> + struct be_mcc_wrb *wrb;
> + unsigned int tag = 0;
> +
> + mutex_lock(&ctrl->mbox_lock);
> + wrb = alloc_mcc_wrb(phba, &tag);
> + if (!wrb) {
> + mutex_unlock(&ctrl->mbox_lock);
> + return 0;
> + }
> +
> + req = embedded_payload(wrb);
> + be_wrb_hdr_prepare(wrb, sizeof(union be_invalidate_connection_params),
> + true, 0);
> + be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI_INI,
> + OPCODE_ISCSI_INI_DRIVER_INVALIDATE_CONNECTION,
> + sizeof(*req));
> + req->session_handle = beiscsi_ep->fw_handle;
> + req->cid = beiscsi_ep->ep_cid;
> + if (beiscsi_ep->conn)
> + req->cleanup_type = BE_CLEANUP_TYPE_INVALIDATE;
> + else
> + req->cleanup_type = BE_CLEANUP_TYPE_ISSUE_TCP_RST;
> + /**
> + * 0 - non-persistent targets
> + * 1 - save session info on flash
> + */
> + req->save_cfg = 0;
> + be_mcc_notify(phba, tag);
> + mutex_unlock(&ctrl->mbox_lock);
> + return tag;
> +}
> +
> +unsigned int beiscsi_upload_cxn(struct beiscsi_hba *phba,
> + struct beiscsi_endpoint *beiscsi_ep)
> +{
> + struct be_ctrl_info *ctrl = &phba->ctrl;
> + struct be_mcc_wrb *wrb;
> + struct be_tcp_upload_params_in *req;
> + unsigned int tag;
> +
> + mutex_lock(&ctrl->mbox_lock);
> + wrb = alloc_mcc_wrb(phba, &tag);
> + if (!wrb) {
> + mutex_unlock(&ctrl->mbox_lock);
> + return 0;
> + }
> +
> + req = embedded_payload(wrb);
> + be_wrb_hdr_prepare(wrb, sizeof(union be_tcp_upload_params), true, 0);
> + be_cmd_hdr_prepare(&req->hdr, CMD_COMMON_TCP_UPLOAD,
> + OPCODE_COMMON_TCP_UPLOAD, sizeof(*req));
> + req->id = beiscsi_ep->ep_cid;
> + if (beiscsi_ep->conn)
> + req->upload_type = BE_UPLOAD_TYPE_GRACEFUL;
> + else
> + req->upload_type = BE_UPLOAD_TYPE_ABORT;
> + be_mcc_notify(phba, tag);
> + mutex_unlock(&ctrl->mbox_lock);
> + return tag;
> +}
> +
> int beiscsi_mgmt_invalidate_icds(struct beiscsi_hba *phba,
> struct invldt_cmd_tbl *inv_tbl,
> unsigned int nents)
> diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
> index 308f147..1ad6c40 100644
> --- a/drivers/scsi/be2iscsi/be_mgmt.h
> +++ b/drivers/scsi/be2iscsi/be_mgmt.h
> @@ -41,35 +41,11 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
> struct beiscsi_endpoint *beiscsi_ep,
> struct be_dma_mem *nonemb_cmd);
>
> -unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,
> - unsigned short cid,
> - unsigned int upload_flag);
> unsigned int mgmt_vendor_specific_fw_cmd(struct be_ctrl_info *ctrl,
> struct beiscsi_hba *phba,
> struct bsg_job *job,
> struct be_dma_mem *nonemb_cmd);
>
> -#define BEISCSI_NO_RST_ISSUE 0
> -struct iscsi_invalidate_connection_params_in {
> - struct be_cmd_req_hdr hdr;
> - unsigned int session_handle;
> - unsigned short cid;
> - unsigned short unused;
> - unsigned short cleanup_type;
> - unsigned short save_cfg;
> -} __packed;
> -
> -struct iscsi_invalidate_connection_params_out {
> - unsigned int session_handle;
> - unsigned short cid;
> - unsigned short unused;
> -} __packed;
> -
> -union iscsi_invalidate_connection_params {
> - struct iscsi_invalidate_connection_params_in request;
> - struct iscsi_invalidate_connection_params_out response;
> -} __packed;
> -
> #define BE_INVLDT_CMD_TBL_SZ 128
> struct invldt_cmd_tbl {
> unsigned short icd;
> @@ -265,6 +241,12 @@ void beiscsi_offload_cxn_v2(struct beiscsi_offload_params *params,
> struct wrb_handle *pwrb_handle,
> struct hwi_wrb_context *pwrb_context);
>
> +unsigned int beiscsi_invalidate_cxn(struct beiscsi_hba *phba,
> + struct beiscsi_endpoint *beiscsi_ep);
> +
> +unsigned int beiscsi_upload_cxn(struct beiscsi_hba *phba,
> + struct beiscsi_endpoint *beiscsi_ep);
> +
> int be_cmd_modify_eq_delay(struct beiscsi_hba *phba,
> struct be_set_eqd *, int num);
>
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v2 02/10] be2iscsi: Fix closing of connection
2017-03-23 16:45 ` Tomas Henzl
@ 2017-03-24 8:24 ` Jitendra Bhivare
0 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-24 8:24 UTC (permalink / raw)
To: Tomas Henzl, cleech, lduncan; +Cc: linux-scsi
> > + attempts = 0;
> > + while (attempts++ < 3) {
> > + tag = beiscsi_invalidate_cxn(phba, beiscsi_ep);
> > + if (tag) {
> > + ret = beiscsi_mccq_compl_wait(phba, tag, NULL,
> NULL);
> > + if (!ret)
> > + break;
> > + beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
> > + "BS_%d : invalidate conn failed cid
%d\n",
> > + beiscsi_ep->ep_cid);
> > + }
> > }
> >
> > - ret = beiscsi_mccq_compl_wait(phba, tag, NULL, NULL);
> > -
> > - /* Flush the CQ entries */
> > + /* wait for all completions to arrive, then process them */
> > + msleep(250);
> > + /* flush CQ entries */
> > beiscsi_flush_cq(phba);
> >
> > - return ret;
> > + if (attempts == 3)
>
> Hi Jitendra,
> when attempts is updated after a '< 3' test, then I think that the test
here
> should be changed to 'if (attempts > 3)'
> tomash
>
[JB] Thanks for reviewing Tomas.
My bad, made some last minute changes to it. Will re-send the series.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 03/10] be2iscsi: Replace spin_unlock_bh with spin_lock
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 01/10] be2iscsi: Check tag in beiscsi_mccq_compl_wait Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 02/10] be2iscsi: Fix closing of connection Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-23 17:03 ` Tomas Henzl
2017-03-16 3:24 ` [PATCH v2 04/10] scsi_transport_iscsi: Use flush_work in iscsi_remove_session Jitendra Bhivare
` (7 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
spin_unlock_bh back_lock is used in beiscsi_eh_device_reset instead of
spin_lock.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 32b2713..ff48573 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -337,7 +337,7 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
inv_tbl->task[nents] = task;
nents++;
}
- spin_unlock_bh(&session->back_lock);
+ spin_unlock(&session->back_lock);
spin_unlock_bh(&session->frwd_lock);
rc = SUCCESS;
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 04/10] scsi_transport_iscsi: Use flush_work in iscsi_remove_session
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (2 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 03/10] be2iscsi: Replace spin_unlock_bh with spin_lock Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 05/10] be2iscsi: Increase HDQ default queue size Jitendra Bhivare
` (6 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
scsi_flush_work flushes workqueue for the Scsi_Host.
In iSCSI offload enabled host, this would wait for all other
sessions under the host.
Use flush_work for the session being removed instead.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/scsi_transport_iscsi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 568c9f2..a424eae 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2158,7 +2158,6 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data)
void iscsi_remove_session(struct iscsi_cls_session *session)
{
- struct Scsi_Host *shost = iscsi_session_to_shost(session);
unsigned long flags;
int err;
@@ -2185,7 +2184,7 @@ void iscsi_remove_session(struct iscsi_cls_session *session)
scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE);
/* flush running scans then delete devices */
- scsi_flush_work(shost);
+ flush_work(&session->scan_work);
__iscsi_unbind_session(&session->unbind_work);
/* hw iscsi may not have removed all connections from session */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 05/10] be2iscsi: Increase HDQ default queue size
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (3 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 04/10] scsi_transport_iscsi: Use flush_work in iscsi_remove_session Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 06/10] be2iscsi: Use num_cons field in Rx CQE Jitendra Bhivare
` (5 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
Currently, ASYNC PDU default queue size is set to max connections.
This leaves only one buffer per connection for any ASYNC PDUs from
targets.
Double the size of the default queue.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.c | 29 ++++++++++++++---------------
drivers/scsi/be2iscsi/be_main.h | 4 +++-
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index ff48573..b76fd26 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -636,7 +636,6 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
(total_cid_count +
BE2_TMFS + BE2_NOPOUT_REQ));
phba->params.cxns_per_ctrl = total_cid_count;
- phba->params.asyncpdus_per_ctrl = total_cid_count;
phba->params.icds_per_ctrl = total_icd_count;
phba->params.num_sge_per_io = BE2_SGE;
phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ;
@@ -2407,22 +2406,22 @@ static void beiscsi_find_mem_req(struct beiscsi_hba *phba)
if (test_bit(ulp_num, &phba->fw_config.ulp_supported)) {
num_async_pdu_buf_sgl_pages =
- PAGES_REQUIRED(BEISCSI_GET_CID_COUNT(
+ PAGES_REQUIRED(BEISCSI_ASYNC_HDQ_SIZE(
phba, ulp_num) *
sizeof(struct phys_addr));
num_async_pdu_buf_pages =
- PAGES_REQUIRED(BEISCSI_GET_CID_COUNT(
+ PAGES_REQUIRED(BEISCSI_ASYNC_HDQ_SIZE(
phba, ulp_num) *
phba->params.defpdu_hdr_sz);
num_async_pdu_data_pages =
- PAGES_REQUIRED(BEISCSI_GET_CID_COUNT(
+ PAGES_REQUIRED(BEISCSI_ASYNC_HDQ_SIZE(
phba, ulp_num) *
phba->params.defpdu_data_sz);
num_async_pdu_data_sgl_pages =
- PAGES_REQUIRED(BEISCSI_GET_CID_COUNT(
+ PAGES_REQUIRED(BEISCSI_ASYNC_HDQ_SIZE(
phba, ulp_num) *
sizeof(struct phys_addr));
@@ -2459,21 +2458,21 @@ static void beiscsi_find_mem_req(struct beiscsi_hba *phba)
mem_descr_index = (HWI_MEM_ASYNC_HEADER_HANDLE_ULP0 +
(ulp_num * MEM_DESCR_OFFSET));
phba->mem_req[mem_descr_index] =
- BEISCSI_GET_CID_COUNT(phba, ulp_num) *
- sizeof(struct hd_async_handle);
+ BEISCSI_ASYNC_HDQ_SIZE(phba, ulp_num) *
+ sizeof(struct hd_async_handle);
mem_descr_index = (HWI_MEM_ASYNC_DATA_HANDLE_ULP0 +
(ulp_num * MEM_DESCR_OFFSET));
phba->mem_req[mem_descr_index] =
- BEISCSI_GET_CID_COUNT(phba, ulp_num) *
- sizeof(struct hd_async_handle);
+ BEISCSI_ASYNC_HDQ_SIZE(phba, ulp_num) *
+ sizeof(struct hd_async_handle);
mem_descr_index = (HWI_MEM_ASYNC_PDU_CONTEXT_ULP0 +
(ulp_num * MEM_DESCR_OFFSET));
phba->mem_req[mem_descr_index] =
- sizeof(struct hd_async_context) +
- (BEISCSI_GET_CID_COUNT(phba, ulp_num) *
- sizeof(struct hd_async_entry));
+ sizeof(struct hd_async_context) +
+ (BEISCSI_ASYNC_HDQ_SIZE(phba, ulp_num) *
+ sizeof(struct hd_async_entry));
}
}
}
@@ -2757,7 +2756,7 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
((long unsigned int)pasync_ctx +
sizeof(struct hd_async_context));
- pasync_ctx->num_entries = BEISCSI_GET_CID_COUNT(phba,
+ pasync_ctx->num_entries = BEISCSI_ASYNC_HDQ_SIZE(phba,
ulp_num);
/* setup header buffers */
mem_descr = (struct be_mem_descriptor *)phba->init_mem;
@@ -2895,7 +2894,7 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
phba->params.defpdu_data_sz);
num_per_mem = 0;
- for (index = 0; index < BEISCSI_GET_CID_COUNT
+ for (index = 0; index < BEISCSI_ASYNC_HDQ_SIZE
(phba, ulp_num); index++) {
pasync_header_h->cri = -1;
pasync_header_h->is_header = 1;
@@ -3772,7 +3771,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++) {
if (test_bit(ulp_num, &phba->fw_config.ulp_supported)) {
def_pdu_ring_sz =
- BEISCSI_GET_CID_COUNT(phba, ulp_num) *
+ BEISCSI_ASYNC_HDQ_SIZE(phba, ulp_num) *
sizeof(struct phys_addr);
status = beiscsi_create_def_hdr(phba, phwi_context,
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 2188579..216f9b4 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -235,7 +235,6 @@ struct sgl_handle {
struct hba_parameters {
unsigned int ios_per_ctrl;
unsigned int cxns_per_ctrl;
- unsigned int asyncpdus_per_ctrl;
unsigned int icds_per_ctrl;
unsigned int num_sge_per_io;
unsigned int defpdu_hdr_sz;
@@ -599,6 +598,9 @@ struct hd_async_handle {
u8 is_final;
};
+#define BEISCSI_ASYNC_HDQ_SIZE(phba, ulp) \
+ (BEISCSI_GET_CID_COUNT((phba), (ulp)) * 2)
+
/**
* This has list of async PDUs that are waiting to be processed.
* Buffers live in this list for a brief duration before they get
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 06/10] be2iscsi: Use num_cons field in Rx CQE
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (4 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 05/10] be2iscsi: Increase HDQ default queue size Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 07/10] be2iscsi: Remove free_list for ASYNC handles Jitendra Bhivare
` (4 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
FW runs out of buffer if buffers are not posted back soon.
ASYNC Rx CQE indicates that FW has consumed 8 RQEs.
Use it to post back buffers instead of waiting for buffers
to be processed and freed by driver.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.c | 124 ++++++++++++++++------------------------
drivers/scsi/be2iscsi/be_main.h | 1 +
2 files changed, 51 insertions(+), 74 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index b76fd26..1cd9c2d 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1467,7 +1467,8 @@ beiscsi_hdl_put_handle(struct hd_async_context *pasync_ctx,
static struct hd_async_handle *
beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
struct hd_async_context *pasync_ctx,
- struct i_t_dpdu_cqe *pdpdu_cqe)
+ struct i_t_dpdu_cqe *pdpdu_cqe,
+ u8 *header)
{
struct beiscsi_hba *phba = beiscsi_conn->phba;
struct hd_async_handle *pasync_handle;
@@ -1515,6 +1516,7 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
switch (code) {
case UNSOL_HDR_NOTIFY:
pasync_handle = pasync_ctx->async_entry[ci].header;
+ *header = 1;
break;
case UNSOL_DATA_DIGEST_ERROR_NOTIFY:
error = 1;
@@ -1547,6 +1549,7 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
/* FW has stale address - attempt continuing by dropping */
}
+ list_del_init(&pasync_handle->link);
/**
* Each CID is associated with unique CRI.
* ASYNC_CRI_FROM_CID mapping and CRI_FROM_CID are totaly different.
@@ -1554,11 +1557,6 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
pasync_handle->cri = BE_GET_ASYNC_CRI_FROM_CID(cid);
pasync_handle->is_final = final;
pasync_handle->buffer_len = dpl;
- /* empty the slot */
- if (pasync_handle->is_header)
- pasync_ctx->async_entry[ci].header = NULL;
- else
- pasync_ctx->async_entry[ci].data = NULL;
/**
* DEF PDU header and data buffers with errors should be simply
@@ -1708,85 +1706,53 @@ beiscsi_hdl_gather_pdu(struct beiscsi_conn *beiscsi_conn,
static void
beiscsi_hdq_post_handles(struct beiscsi_hba *phba,
- u8 header, u8 ulp_num)
+ u8 header, u8 ulp_num, u16 nbuf)
{
- struct hd_async_handle *pasync_handle, *tmp, **slot;
+ struct hd_async_handle *pasync_handle;
struct hd_async_context *pasync_ctx;
struct hwi_controller *phwi_ctrlr;
- struct list_head *hfree_list;
struct phys_addr *pasync_sge;
u32 ring_id, doorbell = 0;
u32 doorbell_offset;
- u16 prod = 0, cons;
- u16 index;
+ u16 prod, pi;
phwi_ctrlr = phba->phwi_ctrlr;
pasync_ctx = HWI_GET_ASYNC_PDU_CTX(phwi_ctrlr, ulp_num);
if (header) {
- cons = pasync_ctx->async_header.free_entries;
- hfree_list = &pasync_ctx->async_header.free_list;
+ pasync_sge = pasync_ctx->async_header.ring_base;
+ pi = pasync_ctx->async_header.pi;
ring_id = phwi_ctrlr->default_pdu_hdr[ulp_num].id;
doorbell_offset = phwi_ctrlr->default_pdu_hdr[ulp_num].
doorbell_offset;
} else {
- cons = pasync_ctx->async_data.free_entries;
- hfree_list = &pasync_ctx->async_data.free_list;
+ pasync_sge = pasync_ctx->async_data.ring_base;
+ pi = pasync_ctx->async_data.pi;
ring_id = phwi_ctrlr->default_pdu_data[ulp_num].id;
doorbell_offset = phwi_ctrlr->default_pdu_data[ulp_num].
doorbell_offset;
}
- /* number of entries posted must be in multiples of 8 */
- if (cons % 8)
- return;
- list_for_each_entry_safe(pasync_handle, tmp, hfree_list, link) {
- list_del_init(&pasync_handle->link);
- pasync_handle->is_final = 0;
- pasync_handle->buffer_len = 0;
-
- /* handles can be consumed out of order, use index in handle */
- index = pasync_handle->index;
- WARN_ON(pasync_handle->is_header != header);
+ for (prod = 0; prod < nbuf; prod++) {
if (header)
- slot = &pasync_ctx->async_entry[index].header;
+ pasync_handle = pasync_ctx->async_entry[pi].header;
else
- slot = &pasync_ctx->async_entry[index].data;
- /**
- * The slot just tracks handle's hold and release, so
- * overwriting at the same index won't do any harm but
- * needs to be caught.
- */
- if (*slot != NULL) {
- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_ISCSI,
- "BM_%d : async PDU %s slot at %u not empty\n",
- header ? "header" : "data", index);
+ pasync_handle = pasync_ctx->async_entry[pi].data;
+ WARN_ON(pasync_handle->is_header != header);
+ WARN_ON(pasync_handle->index != pi);
+ /* setup the ring only once */
+ if (nbuf == pasync_ctx->num_entries) {
+ /* note hi is lo */
+ pasync_sge[pi].hi = pasync_handle->pa.u.a32.address_lo;
+ pasync_sge[pi].lo = pasync_handle->pa.u.a32.address_hi;
}
- /**
- * We use same freed index as in completion to post so this
- * operation is not required for refills. Its required only
- * for ring creation.
- */
- if (header)
- pasync_sge = pasync_ctx->async_header.ring_base;
- else
- pasync_sge = pasync_ctx->async_data.ring_base;
- pasync_sge += index;
- /* if its a refill then address is same; hi is lo */
- WARN_ON(pasync_sge->hi &&
- pasync_sge->hi != pasync_handle->pa.u.a32.address_lo);
- WARN_ON(pasync_sge->lo &&
- pasync_sge->lo != pasync_handle->pa.u.a32.address_hi);
- pasync_sge->hi = pasync_handle->pa.u.a32.address_lo;
- pasync_sge->lo = pasync_handle->pa.u.a32.address_hi;
-
- *slot = pasync_handle;
- if (++prod == cons)
- break;
+ if (++pi == pasync_ctx->num_entries)
+ pi = 0;
}
+
if (header)
- pasync_ctx->async_header.free_entries -= prod;
+ pasync_ctx->async_header.pi = pi;
else
- pasync_ctx->async_data.free_entries -= prod;
+ pasync_ctx->async_data.pi = pi;
doorbell |= ring_id & DB_DEF_PDU_RING_ID_MASK;
doorbell |= 1 << DB_DEF_PDU_REARM_SHIFT;
@@ -1803,20 +1769,26 @@ beiscsi_hdq_process_compl(struct beiscsi_conn *beiscsi_conn,
struct hd_async_handle *pasync_handle = NULL;
struct hd_async_context *pasync_ctx;
struct hwi_controller *phwi_ctrlr;
+ u8 ulp_num, consumed, header = 0;
u16 cid_cri;
- u8 ulp_num;
phwi_ctrlr = phba->phwi_ctrlr;
cid_cri = BE_GET_CRI_FROM_CID(beiscsi_conn->beiscsi_conn_cid);
ulp_num = BEISCSI_GET_ULP_FROM_CRI(phwi_ctrlr, cid_cri);
pasync_ctx = HWI_GET_ASYNC_PDU_CTX(phwi_ctrlr, ulp_num);
pasync_handle = beiscsi_hdl_get_handle(beiscsi_conn, pasync_ctx,
- pdpdu_cqe);
- if (!pasync_handle)
- return;
-
- beiscsi_hdl_gather_pdu(beiscsi_conn, pasync_ctx, pasync_handle);
- beiscsi_hdq_post_handles(phba, pasync_handle->is_header, ulp_num);
+ pdpdu_cqe, &header);
+ if (is_chip_be2_be3r(phba))
+ consumed = AMAP_GET_BITS(struct amap_i_t_dpdu_cqe,
+ num_cons, pdpdu_cqe);
+ else
+ consumed = AMAP_GET_BITS(struct amap_i_t_dpdu_cqe_v2,
+ num_cons, pdpdu_cqe);
+ if (pasync_handle)
+ beiscsi_hdl_gather_pdu(beiscsi_conn, pasync_ctx, pasync_handle);
+ /* num_cons indicates number of 8 RQEs consumed */
+ if (consumed)
+ beiscsi_hdq_post_handles(phba, header, ulp_num, 8 * consumed);
}
void beiscsi_process_mcc_cq(struct beiscsi_hba *phba)
@@ -2775,6 +2747,7 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
"BM_%d : No Virtual address for ULP : %d\n",
ulp_num);
+ pasync_ctx->async_header.pi = 0;
pasync_ctx->async_header.buffer_size = p->defpdu_hdr_sz;
pasync_ctx->async_header.va_base =
mem_descr->mem_array[0].virtual_address;
@@ -2883,6 +2856,7 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
ulp_num);
idx = 0;
+ pasync_ctx->async_data.pi = 0;
pasync_ctx->async_data.buffer_size = p->defpdu_data_sz;
pasync_ctx->async_data.va_base =
mem_descr->mem_array[idx].virtual_address;
@@ -2913,11 +2887,12 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
list_add_tail(&pasync_header_h->link,
&pasync_ctx->async_header.
free_list);
+ pasync_ctx->async_entry[index].header =
+ pasync_header_h;
pasync_header_h++;
pasync_ctx->async_header.free_entries++;
INIT_LIST_HEAD(&pasync_ctx->async_entry[index].
wq.list);
- pasync_ctx->async_entry[index].header = NULL;
pasync_data_h->cri = -1;
pasync_data_h->is_header = 0;
@@ -2954,9 +2929,10 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
list_add_tail(&pasync_data_h->link,
&pasync_ctx->async_data.
free_list);
+ pasync_ctx->async_entry[index].data =
+ pasync_data_h;
pasync_data_h++;
pasync_ctx->async_data.free_entries++;
- pasync_ctx->async_entry[index].data = NULL;
}
}
}
@@ -3734,6 +3710,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
unsigned int def_pdu_ring_sz;
struct be_ctrl_info *ctrl = &phba->ctrl;
int status, ulp_num;
+ u16 nbufs;
phwi_ctrlr = phba->phwi_ctrlr;
phwi_context = phwi_ctrlr->phwi_ctxt;
@@ -3770,9 +3747,8 @@ static int hwi_init_port(struct beiscsi_hba *phba)
for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++) {
if (test_bit(ulp_num, &phba->fw_config.ulp_supported)) {
- def_pdu_ring_sz =
- BEISCSI_ASYNC_HDQ_SIZE(phba, ulp_num) *
- sizeof(struct phys_addr);
+ nbufs = phwi_context->pasync_ctx[ulp_num]->num_entries;
+ def_pdu_ring_sz = nbufs * sizeof(struct phys_addr);
status = beiscsi_create_def_hdr(phba, phwi_context,
phwi_ctrlr,
@@ -3800,9 +3776,9 @@ static int hwi_init_port(struct beiscsi_hba *phba)
* let EP know about it.
*/
beiscsi_hdq_post_handles(phba, BEISCSI_DEFQ_HDR,
- ulp_num);
+ ulp_num, nbufs);
beiscsi_hdq_post_handles(phba, BEISCSI_DEFQ_DATA,
- ulp_num);
+ ulp_num, nbufs);
}
}
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 216f9b4..cebacac 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -634,6 +634,7 @@ struct hd_async_buf_context {
* They are posted back to FW in groups of 8.
*/
struct list_head free_list;
+ u16 pi;
};
/**
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 07/10] be2iscsi: Remove free_list for ASYNC handles
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (5 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 06/10] be2iscsi: Use num_cons field in Rx CQE Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 08/10] be2iscsi: Check size before copying ASYNC handle Jitendra Bhivare
` (3 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
With previous patch adding ASYNC Rx buffers to free_list is not required.
Remove all free_list related operations.
Add in_use to track if buffer posted is being processed by driver and
purge all buffers received for connection if found so.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.c | 99 +++++++++++++++++------------------------
drivers/scsi/be2iscsi/be_main.h | 8 +---
2 files changed, 43 insertions(+), 64 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 1cd9c2d..ee1f1c4 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1453,15 +1453,28 @@ static inline void
beiscsi_hdl_put_handle(struct hd_async_context *pasync_ctx,
struct hd_async_handle *pasync_handle)
{
- if (pasync_handle->is_header) {
- list_add_tail(&pasync_handle->link,
- &pasync_ctx->async_header.free_list);
- pasync_ctx->async_header.free_entries++;
- } else {
- list_add_tail(&pasync_handle->link,
- &pasync_ctx->async_data.free_list);
- pasync_ctx->async_data.free_entries++;
- }
+ pasync_handle->is_final = 0;
+ pasync_handle->buffer_len = 0;
+ pasync_handle->in_use = 0;
+ list_del_init(&pasync_handle->link);
+}
+
+static void
+beiscsi_hdl_purge_handles(struct beiscsi_hba *phba,
+ struct hd_async_context *pasync_ctx,
+ u16 cri)
+{
+ struct hd_async_handle *pasync_handle, *tmp_handle;
+ struct list_head *plist;
+
+ plist = &pasync_ctx->async_entry[cri].wq.list;
+ list_for_each_entry_safe(pasync_handle, tmp_handle, plist, link)
+ beiscsi_hdl_put_handle(pasync_ctx, pasync_handle);
+
+ INIT_LIST_HEAD(&pasync_ctx->async_entry[cri].wq.list);
+ pasync_ctx->async_entry[cri].wq.hdr_len = 0;
+ pasync_ctx->async_entry[cri].wq.bytes_received = 0;
+ pasync_ctx->async_entry[cri].wq.bytes_needed = 0;
}
static struct hd_async_handle *
@@ -1473,11 +1486,12 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
struct beiscsi_hba *phba = beiscsi_conn->phba;
struct hd_async_handle *pasync_handle;
struct be_bus_address phys_addr;
+ u16 cid, code, ci, cri;
u8 final, error = 0;
- u16 cid, code, ci;
u32 dpl;
cid = beiscsi_conn->beiscsi_conn_cid;
+ cri = BE_GET_ASYNC_CRI_FROM_CID(cid);
/**
* This function is invoked to get the right async_handle structure
* from a given DEF PDU CQ entry.
@@ -1525,15 +1539,7 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
break;
/* called only for above codes */
default:
- pasync_handle = NULL;
- break;
- }
-
- if (!pasync_handle) {
- beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_ISCSI,
- "BM_%d : cid %d async PDU handle not found - code %d ci %d addr %llx\n",
- cid, code, ci, phys_addr.u.a64.address);
- return pasync_handle;
+ return NULL;
}
if (pasync_handle->pa.u.a64.address != phys_addr.u.a64.address ||
@@ -1549,44 +1555,33 @@ beiscsi_hdl_get_handle(struct beiscsi_conn *beiscsi_conn,
/* FW has stale address - attempt continuing by dropping */
}
- list_del_init(&pasync_handle->link);
- /**
- * Each CID is associated with unique CRI.
- * ASYNC_CRI_FROM_CID mapping and CRI_FROM_CID are totaly different.
- **/
- pasync_handle->cri = BE_GET_ASYNC_CRI_FROM_CID(cid);
- pasync_handle->is_final = final;
- pasync_handle->buffer_len = dpl;
-
/**
* DEF PDU header and data buffers with errors should be simply
* dropped as there are no consumers for it.
*/
if (error) {
beiscsi_hdl_put_handle(pasync_ctx, pasync_handle);
- pasync_handle = NULL;
+ return NULL;
}
- return pasync_handle;
-}
-
-static void
-beiscsi_hdl_purge_handles(struct beiscsi_hba *phba,
- struct hd_async_context *pasync_ctx,
- u16 cri)
-{
- struct hd_async_handle *pasync_handle, *tmp_handle;
- struct list_head *plist;
- plist = &pasync_ctx->async_entry[cri].wq.list;
- list_for_each_entry_safe(pasync_handle, tmp_handle, plist, link) {
- list_del(&pasync_handle->link);
- beiscsi_hdl_put_handle(pasync_ctx, pasync_handle);
+ if (pasync_handle->in_use || !list_empty(&pasync_handle->link)) {
+ beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_ISCSI,
+ "BM_%d : cid %d async PDU handle in use - code %d ci %d addr %llx\n",
+ cid, code, ci, phys_addr.u.a64.address);
+ beiscsi_hdl_purge_handles(phba, pasync_ctx, cri);
}
- INIT_LIST_HEAD(&pasync_ctx->async_entry[cri].wq.list);
- pasync_ctx->async_entry[cri].wq.hdr_len = 0;
- pasync_ctx->async_entry[cri].wq.bytes_received = 0;
- pasync_ctx->async_entry[cri].wq.bytes_needed = 0;
+ list_del_init(&pasync_handle->link);
+ /**
+ * Each CID is associated with unique CRI.
+ * ASYNC_CRI_FROM_CID mapping and CRI_FROM_CID are totaly different.
+ **/
+ pasync_handle->cri = cri;
+ pasync_handle->is_final = final;
+ pasync_handle->buffer_len = dpl;
+ pasync_handle->in_use = 1;
+
+ return pasync_handle;
}
static unsigned int
@@ -2795,7 +2790,6 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
pasync_ctx->async_header.handle_base =
mem_descr->mem_array[0].virtual_address;
- INIT_LIST_HEAD(&pasync_ctx->async_header.free_list);
/* setup data buffer sgls */
mem_descr = (struct be_mem_descriptor *)phba->init_mem;
@@ -2829,7 +2823,6 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
pasync_ctx->async_data.handle_base =
mem_descr->mem_array[0].virtual_address;
- INIT_LIST_HEAD(&pasync_ctx->async_data.free_list);
pasync_header_h =
(struct hd_async_handle *)
@@ -2884,13 +2877,9 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
pasync_ctx->async_header.pa_base.u.a64.
address + (p->defpdu_hdr_sz * index);
- list_add_tail(&pasync_header_h->link,
- &pasync_ctx->async_header.
- free_list);
pasync_ctx->async_entry[index].header =
pasync_header_h;
pasync_header_h++;
- pasync_ctx->async_header.free_entries++;
INIT_LIST_HEAD(&pasync_ctx->async_entry[index].
wq.list);
@@ -2926,13 +2915,9 @@ static int hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
num_per_mem++;
num_async_data--;
- list_add_tail(&pasync_data_h->link,
- &pasync_ctx->async_data.
- free_list);
pasync_ctx->async_entry[index].data =
pasync_data_h;
pasync_data_h++;
- pasync_ctx->async_data.free_entries++;
}
}
}
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index cebacac..9883a85 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -596,6 +596,7 @@ struct hd_async_handle {
u16 cri;
u8 is_header;
u8 is_final;
+ u8 in_use;
};
#define BEISCSI_ASYNC_HDQ_SIZE(phba, ulp) \
@@ -626,14 +627,7 @@ struct hd_async_buf_context {
void *va_base;
void *ring_base;
struct hd_async_handle *handle_base;
- u16 free_entries;
u32 buffer_size;
- /**
- * Once iSCSI layer finishes processing an async PDU, the
- * handles used for the PDU are added to this list.
- * They are posted back to FW in groups of 8.
- */
- struct list_head free_list;
u16 pi;
};
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 08/10] be2iscsi: Check size before copying ASYNC handle
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (6 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 07/10] be2iscsi: Remove free_list for ASYNC handles Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 09/10] be2iscsi: Update Copyright Jitendra Bhivare
` (2 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
Data in buffers are gathered into a single buffer before giving to
iSCSI layer. Though less likely to have payload more than 8K in
ASYNC PDU, the data length is provide by FW and check is missing
for overrun.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index ee1f1c4..4b668c4 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1611,6 +1611,10 @@ beiscsi_hdl_fwd_pdu(struct beiscsi_conn *beiscsi_conn,
dlen = pasync_handle->buffer_len;
continue;
}
+ if (!pasync_handle->buffer_len ||
+ (dlen + pasync_handle->buffer_len) >
+ pasync_ctx->async_data.buffer_size)
+ break;
memcpy(pdata + dlen, pasync_handle->pbuffer,
pasync_handle->buffer_len);
dlen += pasync_handle->buffer_len;
@@ -1619,8 +1623,9 @@ beiscsi_hdl_fwd_pdu(struct beiscsi_conn *beiscsi_conn,
if (!plast_handle->is_final) {
/* last handle should have final PDU notification from FW */
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_ISCSI,
- "BM_%d : cid %u %p fwd async PDU with last handle missing - HL%u:DN%u:DR%u\n",
+ "BM_%d : cid %u %p fwd async PDU opcode %x with last handle missing - HL%u:DN%u:DR%u\n",
beiscsi_conn->beiscsi_conn_cid, plast_handle,
+ AMAP_GET_BITS(struct amap_pdu_base, opcode, phdr),
pasync_ctx->async_entry[cri].wq.hdr_len,
pasync_ctx->async_entry[cri].wq.bytes_needed,
pasync_ctx->async_entry[cri].wq.bytes_received);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 09/10] be2iscsi: Update Copyright
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (7 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 08/10] be2iscsi: Check size before copying ASYNC handle Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-16 3:24 ` [PATCH v2 10/10] be2iscsi: Update driver version Jitendra Bhivare
2017-03-23 14:06 ` [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Martin K. Petersen
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 9418 bytes --]
Update Broadcom Copyright markings in all files.
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be.h | 11 ++++-------
drivers/scsi/be2iscsi/be_cmds.c | 11 ++++-------
drivers/scsi/be2iscsi/be_cmds.h | 11 ++++-------
drivers/scsi/be2iscsi/be_iscsi.c | 13 ++++---------
drivers/scsi/be2iscsi/be_iscsi.h | 13 ++++---------
drivers/scsi/be2iscsi/be_main.c | 13 ++++---------
drivers/scsi/be2iscsi/be_main.h | 13 ++++---------
drivers/scsi/be2iscsi/be_mgmt.c | 13 ++++---------
drivers/scsi/be2iscsi/be_mgmt.h | 13 ++++---------
9 files changed, 36 insertions(+), 75 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
index 4dd8de4..55e3f8b 100644
--- a/drivers/scsi/be2iscsi/be.h
+++ b/drivers/scsi/be2iscsi/be.h
@@ -1,18 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#ifndef BEISCSI_H
diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index d14ddb2..a79a5e7 100644
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -1,18 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#include <scsi/iscsi_proto.h>
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 88fe731..d9b6773 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -1,18 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#ifndef BEISCSI_CMDS_H
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 2af714f..2e47b49 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#include <scsi/libiscsi.h>
diff --git a/drivers/scsi/be2iscsi/be_iscsi.h b/drivers/scsi/be2iscsi/be_iscsi.h
index e4d67df..b9d459a 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.h
+++ b/drivers/scsi/be2iscsi/be_iscsi.h
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Avago Technologies
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#ifndef _BE_ISCSI_
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 4b668c4..61b7f5b 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#include <linux/reboot.h>
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 9883a85..c6b95dc 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#ifndef _BEISCSI_MAIN_
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 3198c84..c737753 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#include <linux/bsg-lib.h>
diff --git a/drivers/scsi/be2iscsi/be_mgmt.h b/drivers/scsi/be2iscsi/be_mgmt.h
index 1ad6c40..06ddc5a 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.h
+++ b/drivers/scsi/be2iscsi/be_mgmt.h
@@ -1,20 +1,15 @@
-/**
- * Copyright (C) 2005 - 2016 Broadcom
- * All rights reserved.
+/*
+ * Copyright 2017 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation. The full GNU General
+ * as published by the Free Software Foundation. The full GNU General
* Public License is included in this distribution in the file called COPYING.
*
- * Written by: Jayamohan Kallickal (jayamohan.kallickal@broadcom.com)
- *
* Contact Information:
* linux-drivers@broadcom.com
*
- * Emulex
- * 3333 Susan Street
- * Costa Mesa, CA 92626
*/
#ifndef _BEISCSI_MGMT_
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v2 10/10] be2iscsi: Update driver version
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (8 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 09/10] be2iscsi: Update Copyright Jitendra Bhivare
@ 2017-03-16 3:24 ` Jitendra Bhivare
2017-03-23 14:06 ` [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Martin K. Petersen
10 siblings, 0 replies; 16+ messages in thread
From: Jitendra Bhivare @ 2017-03-16 3:24 UTC (permalink / raw)
To: cleech, lduncan; +Cc: linux-scsi, Jitendra Bhivare
Version 11.4.0.0
Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
---
drivers/scsi/be2iscsi/be_main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index c6b95dc..ee18a95 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -31,7 +31,7 @@
#include <scsi/scsi_transport_iscsi.h>
#define DRV_NAME "be2iscsi"
-#define BUILD_STR "11.2.1.0"
+#define BUILD_STR "11.4.0.0"
#define BE_NAME "Emulex OneConnect" \
"Open-iSCSI Driver version" BUILD_STR
#define DRV_DESC BE_NAME " " "Driver"
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0
2017-03-16 3:24 [PATCH v2 00/10] be2iscsi: driver update 11.4.0.0 Jitendra Bhivare
` (9 preceding siblings ...)
2017-03-16 3:24 ` [PATCH v2 10/10] be2iscsi: Update driver version Jitendra Bhivare
@ 2017-03-23 14:06 ` Martin K. Petersen
10 siblings, 0 replies; 16+ messages in thread
From: Martin K. Petersen @ 2017-03-23 14:06 UTC (permalink / raw)
To: Jitendra Bhivare; +Cc: cleech, lduncan, linux-scsi
Jitendra Bhivare <jitendra.bhivare@broadcom.com> writes:
Somebody please review!
Thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 16+ messages in thread