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

Commit 23e44302 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull more scsi target fixes from Nicholas Bellinger:
 "This series is a second round of target fixes for v3.7-rc4 that have
  come into target-devel over the last days, and are important enough to
  be applied ASAP.

  All are being CC'ed to stable.  The most important two are:

   - target: Re-add explict zeroing of INQUIRY bounce buffer memory to
     fix a regression for handling zero-length payloads, a bug that went
     during v3.7-rc1, and hit >= v3.6.3 stable.  (nab + paolo)

   - iscsi-target: Fix a long-standing missed R2T wakeup race in TX
     thread processing when using a single queue slot.  (Roland)

  Thanks to Roland & PureStorage team for helping to track down this
  long standing race with iscsi-target single queue slot operation.

  Also, the tcm_fc(FCoE) regression bug that was observed recently with
  -rc2 code has also been resolved with the cancel_delayed_work() return
  bugfix (commit c0158ca6: "workqueue: cancel_delayed_work() should
  return %false if work item is idle") now in -rc3.  Thanks again to Yi
  Zou, MDR, Robert Love @ Intel for helping to track this down."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Fix incorrect usage of nested IRQ spinlocks in ABORT_TASK path
  iscsi-target: Fix missed wakeup race in TX thread
  target: Avoid integer overflow in se_dev_align_max_sectors()
  target: Don't return success from module_init() if setup fails
  target: Re-add explict zeroing of INQUIRY bounce buffer memory
parents ae41fce3 ab74b3d6

drivers/target/iscsi/iscsi_target.c

+3 −1
Original line number Diff line number Diff line
@@ -3719,7 +3719,9 @@ int iscsi_target_tx_thread(void *arg) 
		 */

		iscsit_thread_check_cpumask(conn, current, 1);



		schedule_timeout_interruptible(MAX_SCHEDULE_TIMEOUT);

		wait_event_interruptible(conn->queues_wq,

					 !iscsit_conn_all_queues_empty(conn) ||

					 ts->status == ISCSI_THREAD_SET_RESET);



		if ((ts->status == ISCSI_THREAD_SET_RESET) ||

		     signal_pending(current))

drivers/target/iscsi/iscsi_target_core.h

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ struct iscsi_tmr_req { 
};



struct iscsi_conn {

	wait_queue_head_t	queues_wq;

	/* Authentication Successful for this connection */

	u8			auth_complete;

	/* State connection is currently in */

drivers/target/iscsi/iscsi_target_login.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


static int iscsi_login_init_conn(struct iscsi_conn *conn)

{

	init_waitqueue_head(&conn->queues_wq);

	INIT_LIST_HEAD(&conn->conn_list);

	INIT_LIST_HEAD(&conn->conn_cmd_list);

	INIT_LIST_HEAD(&conn->immed_queue_list);

drivers/target/iscsi/iscsi_target_util.c

+20 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ void iscsit_add_cmd_to_immediate_queue( 
	atomic_set(&conn->check_immediate_queue, 1);

	spin_unlock_bh(&conn->immed_queue_lock);



	wake_up_process(conn->thread_set->tx_thread);

	wake_up(&conn->queues_wq);

}



struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *conn)
@@ -562,7 +562,7 @@ void iscsit_add_cmd_to_response_queue( 
	atomic_inc(&cmd->response_queue_count);

	spin_unlock_bh(&conn->response_queue_lock);



	wake_up_process(conn->thread_set->tx_thread);

	wake_up(&conn->queues_wq);

}



struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *conn)
@@ -616,6 +616,24 @@ static void iscsit_remove_cmd_from_response_queue( 
	}

}



bool iscsit_conn_all_queues_empty(struct iscsi_conn *conn)

{

	bool empty;



	spin_lock_bh(&conn->immed_queue_lock);

	empty = list_empty(&conn->immed_queue_list);

	spin_unlock_bh(&conn->immed_queue_lock);



	if (!empty)

		return empty;



	spin_lock_bh(&conn->response_queue_lock);

	empty = list_empty(&conn->response_queue_list);

	spin_unlock_bh(&conn->response_queue_lock);



	return empty;

}



void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *conn)

{

	struct iscsi_queue_req *qr, *qr_tmp;

drivers/target/iscsi/iscsi_target_util.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_ 
extern void iscsit_add_cmd_to_response_queue(struct iscsi_cmd *, struct iscsi_conn *, u8);

extern struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *);

extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_conn *);

extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *);

extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *);

extern void iscsit_release_cmd(struct iscsi_cmd *);

extern void iscsit_free_cmd(struct iscsi_cmd *);