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

Commit 8a47aa9d authored by Bart Van Assche's avatar Bart Van Assche Committed by Kees Cook
Browse files

target/iscsi: Simplify timer manipulation code 



Move timer initialization from before add_timer() to the context
where the containing object is initialized. Use setup_timer() and
mod_timer() instead of open coding these. Use 'jiffies' instead
of get_jiffies_64() when calculating expiry times because expiry
times have type unsigned long, just like 'jiffies'.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Andy Grover <agrover@redhat.com>
Cc: David Disseldorp <ddiss@suse.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent d744644a

drivers/target/iscsi/iscsi_target.c

+3 −0
Original line number Diff line number Diff line
@@ -372,6 +372,9 @@ struct iscsi_np *iscsit_add_np( 
	init_completion(&np->np_restart_comp);

	INIT_LIST_HEAD(&np->np_list);



	setup_timer(&np->np_login_timer, iscsi_handle_login_thread_timeout,

		    (unsigned long)np);



	ret = iscsi_target_setup_login_socket(np, sockaddr);

	if (ret != 0) {

		kfree(np);

drivers/target/iscsi/iscsi_target_erl0.c

+3 −7
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ int iscsit_check_post_dataout( 
	}

}



static void iscsit_handle_time2retain_timeout(unsigned long data)

void iscsit_handle_time2retain_timeout(unsigned long data)

{

	struct iscsi_session *sess = (struct iscsi_session *) data;

	struct iscsi_portal_group *tpg = sess->tpg;
@@ -809,14 +809,10 @@ void iscsit_start_time2retain_handler(struct iscsi_session *sess) 
	pr_debug("Starting Time2Retain timer for %u seconds on"

		" SID: %u\n", sess->sess_ops->DefaultTime2Retain, sess->sid);



	init_timer(&sess->time2retain_timer);

	sess->time2retain_timer.expires =

		(get_jiffies_64() + sess->sess_ops->DefaultTime2Retain * HZ);

	sess->time2retain_timer.data = (unsigned long)sess;

	sess->time2retain_timer.function = iscsit_handle_time2retain_timeout;

	sess->time2retain_timer_flags &= ~ISCSI_TF_STOP;

	sess->time2retain_timer_flags |= ISCSI_TF_RUNNING;

	add_timer(&sess->time2retain_timer);

	mod_timer(&sess->time2retain_timer,

		  jiffies + sess->sess_ops->DefaultTime2Retain * HZ);

}



/*

drivers/target/iscsi/iscsi_target_erl0.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ extern void iscsit_set_dataout_sequence_values(struct iscsi_cmd *); 
extern int iscsit_check_pre_dataout(struct iscsi_cmd *, unsigned char *);

extern int iscsit_check_post_dataout(struct iscsi_cmd *, unsigned char *, u8);

extern void iscsit_start_time2retain_handler(struct iscsi_session *);

extern void iscsit_handle_time2retain_timeout(unsigned long data);

extern int iscsit_stop_time2retain_timer(struct iscsi_session *);

extern void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *);

extern void iscsit_cause_connection_reinstatement(struct iscsi_conn *, int);

drivers/target/iscsi/iscsi_target_erl1.c

+2 −6
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ static int iscsit_set_dataout_timeout_values( 
/*

 *	NOTE: Called from interrupt (timer) context.

 */

static void iscsit_handle_dataout_timeout(unsigned long data)

void iscsit_handle_dataout_timeout(unsigned long data)

{

	u32 pdu_length = 0, pdu_offset = 0;

	u32 r2t_length = 0, r2t_offset = 0;
@@ -1264,13 +1264,9 @@ void iscsit_start_dataout_timer( 
	pr_debug("Starting DataOUT timer for ITT: 0x%08x on"

		" CID: %hu.\n", cmd->init_task_tag, conn->cid);



	init_timer(&cmd->dataout_timer);

	cmd->dataout_timer.expires = (get_jiffies_64() + na->dataout_timeout * HZ);

	cmd->dataout_timer.data = (unsigned long)cmd;

	cmd->dataout_timer.function = iscsit_handle_dataout_timeout;

	cmd->dataout_timer_flags &= ~ISCSI_TF_STOP;

	cmd->dataout_timer_flags |= ISCSI_TF_RUNNING;

	add_timer(&cmd->dataout_timer);

	mod_timer(&cmd->dataout_timer, jiffies + na->dataout_timeout * HZ);

}



void iscsit_stop_dataout_timer(struct iscsi_cmd *cmd)

drivers/target/iscsi/iscsi_target_erl1.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ extern int iscsit_execute_ooo_cmdsns(struct iscsi_session *); 
extern int iscsit_execute_cmd(struct iscsi_cmd *, int);

extern int iscsit_handle_ooo_cmdsn(struct iscsi_session *, struct iscsi_cmd *, u32);

extern void iscsit_remove_ooo_cmdsn(struct iscsi_session *, struct iscsi_ooo_cmdsn *);

extern void iscsit_handle_dataout_timeout(unsigned long data);

extern void iscsit_mod_dataout_timer(struct iscsi_cmd *);

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

extern void iscsit_stop_dataout_timer(struct iscsi_cmd *);