mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 20:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

- QLA: minor cleanups

Browse Source 
- SCST_USER: microoptimization



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@469 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2008-07-18 17:02:13 +00:00
parent c4c6347217
commit 0abc311754
4 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t/qla2x00-target/qla2x00t.c
+2 -2
View File
@@ -287,8 +287,8 @@ static void q2t_free_session_done(struct scst_session *scst_sess)
if (tgt == NULL)
goto out;
TRACE_MGMT_DBG("tgt->handle %x empty(sess_list) %d sess_count %d",
tgt->handle, list_empty(&tgt->sess_list), tgt->sess_count);
TRACE_MGMT_DBG("tgt %p, empty(sess_list) %d, sess_count %d",
tgt, list_empty(&tgt->sess_list), tgt->sess_count);
ha = tgt->ha;
qla2x00t/qla2x00-target/qla2x00t.h
+3 -4
View File
@@ -118,7 +118,6 @@ struct q2t_cmd
struct q2t_tgt
{
struct scst_tgt *scst_tgt;
uint32_t handle;
scsi_qla_host_t *ha;
int datasegs_per_cmd, datasegs_per_cont;
/* Target's flags, serialized by ha->hardware_lock */
@@ -161,10 +160,10 @@ struct q2t_prm
static inline struct q2t_sess *q2t_find_sess_by_lid(struct q2t_tgt *tgt,
uint16_t lid)
{
struct q2t_sess *sess, *sess_tmp;
struct q2t_sess *sess;
sBUG_ON(tgt == NULL);
list_for_each_entry_safe(sess, sess_tmp, &tgt->sess_list, list) {
if (lid == (sess->loop_id))
list_for_each_entry(sess, &tgt->sess_list, list) {
if (lid == sess->loop_id)
return sess;
}
scst/include/scst_user.h
+4
View File
@@ -197,6 +197,7 @@ struct scst_user_get_cmd {
};
};
/* Be careful adding new members here, this structure is allocated on stack! */
struct scst_user_scsi_cmd_reply_parse {
uint8_t queue_type;
uint8_t data_direction;
@@ -204,10 +205,12 @@ struct scst_user_scsi_cmd_reply_parse {
int32_t bufflen;
};
/* Be careful adding new members here, this structure is allocated on stack! */
struct scst_user_scsi_cmd_reply_alloc_mem {
aligned_u64 pbuf;
};
/* Be careful adding new members here, this structure is allocated on stack! */
struct scst_user_scsi_cmd_reply_exec {
int32_t resp_data_len;
aligned_u64 pbuf;
@@ -221,6 +224,7 @@ struct scst_user_scsi_cmd_reply_exec {
aligned_u64 psense_buffer;
};
/* Be careful adding new members here, this structure is allocated on stack! */
struct scst_user_reply_cmd {
uint32_t cmd_h;
uint32_t subcode;
scst/src/dev_handlers/scst_user.c
+30 -29
View File
@@ -178,6 +178,7 @@ static int dev_user_release(struct inode *inode, struct file *file);
/** Data **/
static struct kmem_cache *user_cmd_cachep;
static struct kmem_cache *user_get_cmd_cachep;
static DEFINE_MUTEX(dev_priv_mutex);
@@ -1042,7 +1043,7 @@ static int dev_user_map_buf(struct scst_user_cmd *ucmd, unsigned long ubuff,
ucmd->num_data_pages = num_pg;
ucmd->data_pages = kzalloc(sizeof(*ucmd->data_pages)*ucmd->num_data_pages,
ucmd->data_pages = kmalloc(sizeof(*ucmd->data_pages)*ucmd->num_data_pages,
GFP_KERNEL);
if (ucmd->data_pages == NULL) {
TRACE(TRACE_OUT_OF_MEM, "Unable to allocate data_pages array "
@@ -1447,7 +1448,7 @@ static int dev_user_reply_cmd(struct file *file, void __user *arg)
{
int res = 0;
struct scst_user_dev *dev;
struct scst_user_reply_cmd *reply;
struct scst_user_reply_cmd reply;
TRACE_ENTRY();
@@ -1461,24 +1462,15 @@ static int dev_user_reply_cmd(struct file *file, void __user *arg)
down_read(&dev->dev_rwsem);
mutex_unlock(&dev_priv_mutex);
reply = kzalloc(sizeof(*reply), GFP_KERNEL);
if (reply == NULL) {
res = -ENOMEM;
res = copy_from_user(&reply, arg, sizeof(reply));
if (res < 0)
goto out_up;
}
res = copy_from_user(reply, arg, sizeof(*reply));
TRACE_BUFFER("Reply", &reply, sizeof(reply));
res = dev_user_process_reply(dev, &reply);
if (res < 0)
goto out_free;
TRACE_BUFFER("Reply", reply, sizeof(*reply));
res = dev_user_process_reply(dev, reply);
if (res < 0)
goto out_free;
out_free:
kfree(reply);
goto out_up;
out_up:
up_read(&dev->dev_rwsem);
@@ -1655,7 +1647,7 @@ static int dev_user_reply_get_cmd(struct file *file, void __user *arg)
TRACE_DBG("ureply %Ld", (long long unsigned int)ureply);
cmd = kzalloc(max(sizeof(*cmd), sizeof(*reply)), GFP_KERNEL);
cmd = kmem_cache_alloc(user_get_cmd_cachep, GFP_KERNEL);
if (cmd == NULL) {
res = -ENOMEM;
goto out_up;
@@ -1686,7 +1678,7 @@ static int dev_user_reply_get_cmd(struct file *file, void __user *arg)
spin_unlock_irq(&dev->cmd_lists.cmd_list_lock);
out_free:
kfree(cmd);
kmem_cache_free(user_get_cmd_cachep, cmd);
out_up:
up_read(&dev->dev_rwsem);
@@ -2206,6 +2198,7 @@ static int dev_user_attach_tgt(struct scst_tgt_dev *tgt_dev)
(struct scst_user_dev *)tgt_dev->dev->dh_priv;
int res = 0, rc;
struct scst_user_cmd *ucmd;
DECLARE_COMPLETION_ONSTACK(cmpl);
TRACE_ENTRY();
@@ -2213,11 +2206,7 @@ static int dev_user_attach_tgt(struct scst_tgt_dev *tgt_dev)
if (ucmd == NULL)
goto out_nomem;
ucmd->cmpl = kmalloc(sizeof(*ucmd->cmpl), GFP_KERNEL);
if (ucmd->cmpl == NULL)
goto out_put_nomem;
init_completion(ucmd->cmpl);
ucmd->cmpl = &cmpl;
ucmd->user_cmd.cmd_h = ucmd->h;
ucmd->user_cmd.subcode = SCST_USER_ATTACH_SESS;
@@ -2254,7 +2243,6 @@ static int dev_user_attach_tgt(struct scst_tgt_dev *tgt_dev)
sBUG_ON(irqs_disabled());
spin_lock_irq(&dev->cmd_lists.cmd_list_lock);
kfree(ucmd->cmpl);
ucmd->cmpl = NULL;
spin_unlock_irq(&dev->cmd_lists.cmd_list_lock);
@@ -2264,9 +2252,6 @@ out:
TRACE_EXIT_RES(res);
return res;
out_put_nomem:
ucmd_put(ucmd);
out_nomem:
res = -ENOMEM;
goto out;
@@ -2904,6 +2889,12 @@ static int __init init_scst_user(void)
{
int res = 0;
struct class_device *class_member;
struct max_get_reply {
union {
struct scst_user_get_cmd g;
struct scst_user_reply_cmd r;
};
};
TRACE_ENTRY();
@@ -2921,11 +2912,17 @@ static int __init init_scst_user(void)
goto out;
}
user_get_cmd_cachep = KMEM_CACHE(max_get_reply, SCST_SLAB_FLAGS);
if (user_get_cmd_cachep == NULL) {
res = -ENOMEM;
goto out_cache;
}
dev_user_devtype.module = THIS_MODULE;
res = scst_register_virtual_dev_driver(&dev_user_devtype);
if (res < 0)
goto out_cache;
goto out_cache1;
res = scst_dev_handler_build_std_proc(&dev_user_devtype);
if (res != 0)
@@ -2979,6 +2976,9 @@ out_proc:
out_unreg:
scst_unregister_dev_driver(&dev_user_devtype);
out_cache1:
kmem_cache_destroy(user_get_cmd_cachep);
out_cache:
kmem_cache_destroy(user_cmd_cachep);
goto out;
@@ -3001,6 +3001,7 @@ static void __exit exit_scst_user(void)
scst_dev_handler_destroy_std_proc(&dev_user_devtype);
scst_unregister_virtual_dev_driver(&dev_user_devtype);
kmem_cache_destroy(user_get_cmd_cachep);
kmem_cache_destroy(user_cmd_cachep);
TRACE_EXIT();