mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-01-20 08:58:04 -08:00
parent 58b30a0dbf f2a00f8e73
commit fce9dbfdbd
2 changed files with 107 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scst/include/scst.h
View File

@@ -2017,6 +2017,7 @@ struct scst_session {
/* sysfs release completion */
struct completion *sess_kobj_release_cmpl;
unsigned int sess_mq:1; /* Multi-queue session, i.e. >1 sessions per same initiator */
#ifndef CONFIG_SCST_PROC
unsigned int sess_kobj_ready:1;
@@ -3611,10 +3612,14 @@ void scst_unregister_target(struct scst_tgt *tgt);
struct scst_session *scst_register_session(struct scst_tgt *tgt, int atomic,
const char *initiator_name, void *tgt_priv, void *result_fn_data,
void (*result_fn)(struct scst_session *sess, void *data, int result));
struct scst_session *scst_register_session_mq(struct scst_tgt *tgt, int atomic,
const char *initiator_name, void *tgt_priv, void *result_fn_data,
void (*result_fn)(struct scst_session *sess, void *data, int result));
struct scst_session *scst_register_session_non_gpl(struct scst_tgt *tgt,
const char *initiator_name, void *tgt_priv);
void scst_unregister_session(struct scst_session *sess, int wait,
void (*unreg_done_fn)(struct scst_session *sess));
void scst_unregister_session_non_gpl(struct scst_session *sess);
int __scst_register_dev_driver(struct scst_dev_type *dev_type,

141
scst/src/scst_targ.c
View File

@@ -2800,6 +2800,14 @@ static int scst_reserve_local(struct scst_cmd *cmd)
TRACE_ENTRY();
if (cmd->sess->sess_mq) {
PRINT_WARNING_ONCE("MQ session (%p) from initiator %s (tgt %s), "
"reservations not supported", cmd->sess,
cmd->sess->initiator_name, cmd->sess->tgt->tgt_name);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_invalid_opcode));
goto out_done;
}
if ((cmd->cdb[0] == RESERVE_10) && (cmd->cdb[2] & SCST_RES_3RDPTY)) {
PRINT_ERROR("RESERVE_10: 3rdPty RESERVE not implemented "
"(lun=%lld)", (unsigned long long int)cmd->lun);
@@ -2868,6 +2876,14 @@ static int scst_release_local(struct scst_cmd *cmd)
TRACE_ENTRY();
if (cmd->sess->sess_mq) {
PRINT_WARNING_ONCE("MQ session (%p) from initiator %s (tgt %s), "
"reservations not supported", cmd->sess,
cmd->sess->initiator_name, cmd->sess->tgt->tgt_name);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_invalid_opcode));
goto out_done;
}
dev = cmd->dev;
/*
@@ -2945,6 +2961,14 @@ static int scst_persistent_reserve_in_local(struct scst_cmd *cmd)
tgt_dev = cmd->tgt_dev;
session = cmd->sess;
if (session->sess_mq) {
PRINT_WARNING_ONCE("MQ session %p from initiator %s (tgt %s), "
"persistent reservations not supported", session,
session->initiator_name, session->tgt->tgt_name);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_invalid_opcode));
goto out_done;
}
if (unlikely(dev->not_pr_supporting_tgt_devs_num != 0)) {
PRINT_WARNING("Persistent Reservation command %s refused for "
"device %s, because the device has not supporting PR "
@@ -3048,6 +3072,14 @@ static int scst_persistent_reserve_out_local(struct scst_cmd *cmd)
tgt_dev = cmd->tgt_dev;
session = cmd->sess;
if (session->sess_mq) {
PRINT_WARNING_ONCE("MQ session (%p) from initiator %s (tgt %s), "
"persistent reservations not supported", session,
session->initiator_name, session->tgt->tgt_name);
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_invalid_opcode));
goto out_done;
}
if (unlikely(dev->not_pr_supporting_tgt_devs_num != 0)) {
PRINT_WARNING("Persistent Reservation command %s refused for "
"device %s, because the device has not supporting PR "
@@ -8241,6 +8273,54 @@ failed:
return res;
}
static struct scst_session *__scst_register_session(struct scst_tgt *tgt, int atomic,
const char *initiator_name, void *tgt_priv, void *result_fn_data,
void (*result_fn)(struct scst_session *sess, void *data, int result), bool mq)
{
struct scst_session *sess;
int res;
unsigned long flags;
TRACE_ENTRY();
sess = scst_alloc_session(tgt, atomic ? GFP_ATOMIC : GFP_KERNEL,
initiator_name);
if (sess == NULL)
goto out;
TRACE_DBG("New sess %p, mq %d", sess, mq);
scst_sess_set_tgt_priv(sess, tgt_priv);
sess->sess_mq = mq;
scst_sess_get(sess); /* one for registered session */
scst_sess_get(sess); /* one held until sess is inited */
if (atomic) {
sess->reg_sess_data = result_fn_data;
sess->init_result_fn = result_fn;
spin_lock_irqsave(&scst_mgmt_lock, flags);
TRACE_DBG("Adding sess %p to scst_sess_init_list", sess);
list_add_tail(&sess->sess_init_list_entry,
&scst_sess_init_list);
spin_unlock_irqrestore(&scst_mgmt_lock, flags);
wake_up(&scst_mgmt_waitQ);
} else {
res = scst_init_session(sess);
if (res != 0)
goto out_free;
}
out:
TRACE_EXIT();
return sess;
out_free:
scst_free_session(sess);
sess = NULL;
goto out;
}
/**
* scst_register_session() - register session
* @tgt: target
@@ -8288,48 +8368,31 @@ struct scst_session *scst_register_session(struct scst_tgt *tgt, int atomic,
const char *initiator_name, void *tgt_priv, void *result_fn_data,
void (*result_fn)(struct scst_session *sess, void *data, int result))
{
struct scst_session *sess;
int res;
unsigned long flags;
TRACE_ENTRY();
sess = scst_alloc_session(tgt, atomic ? GFP_ATOMIC : GFP_KERNEL,
initiator_name);
if (sess == NULL)
goto out;
scst_sess_set_tgt_priv(sess, tgt_priv);
scst_sess_get(sess); /* one for registered session */
scst_sess_get(sess); /* one held until sess is inited */
if (atomic) {
sess->reg_sess_data = result_fn_data;
sess->init_result_fn = result_fn;
spin_lock_irqsave(&scst_mgmt_lock, flags);
TRACE_DBG("Adding sess %p to scst_sess_init_list", sess);
list_add_tail(&sess->sess_init_list_entry,
&scst_sess_init_list);
spin_unlock_irqrestore(&scst_mgmt_lock, flags);
wake_up(&scst_mgmt_waitQ);
} else {
res = scst_init_session(sess);
if (res != 0)
goto out_free;
}
out:
TRACE_EXIT();
return sess;
out_free:
scst_free_session(sess);
sess = NULL;
goto out;
return __scst_register_session(tgt, atomic, initiator_name, tgt_priv, result_fn_data,
result_fn, false);
}
EXPORT_SYMBOL_GPL(scst_register_session);
/**
* scst_register_session_mq() - register multi-queue session
*
* Description:
* Registers new MQ session. Returns new session on success or NULL otherwise.
*
* MQ session is a session, which is part of a set of sessions from the same
* initiator, for instance, one session per CPU. The only difference with
* non-MQ sessions is that reservations are not supported on MQ-sessions
* (because there is no way to group sessions together from reservations POV)
*/
struct scst_session *scst_register_session_mq(struct scst_tgt *tgt, int atomic,
const char *initiator_name, void *tgt_priv, void *result_fn_data,
void (*result_fn)(struct scst_session *sess, void *data, int result))
{
return __scst_register_session(tgt, atomic, initiator_name, tgt_priv, result_fn_data,
result_fn, true);
}
EXPORT_SYMBOL_GPL(scst_register_session_mq);
/**
* scst_register_session_non_gpl() - register session (non-GPL version)
* @tgt: target