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

WRITE SAME related cleanups and fixes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4296 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-05-11 23:20:19 +00:00
parent d3b4b46223
commit 0fe0a3b839
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -2036,13 +2036,20 @@ static enum compl_status_e vdisk_exec_unmap(struct vdisk_cmd_params *p)
goto out;
for (i = 0; i < cmd->cmd_data_descriptors_cnt; i++) {
struct scst_data_descriptor *d = &pd[i];
int rc = vdisk_unmap_range(cmd, virt_dev, d->sdd_lba, d->sdd_len);
struct scst_data_descriptor *d;
int rc;
if (unlikely(test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags))) {
TRACE_MGMT_DBG("ABORTED set, aborting cmd %p", cmd);
goto out;
}
d = &pd[i];
rc = vdisk_unmap_range(cmd, virt_dev, d->sdd_lba, d->sdd_len);
if (rc != 0)
goto out;
}
out:
TRACE_EXIT();
return CMD_SUCCEEDED;

21
scst/src/scst_lib.c
View File

@@ -4430,9 +4430,6 @@ struct scst_i_finish_t {
void (*scst_i_finish_fn) (struct scst_cmd *cmd);
};
#define SCST_WRITE_SAME_MAX_EACH_SIZE (128*1024)
#define SCST_WRITE_SAME_MAX_IN_FLIGHT_COMMANDS 32
struct scst_write_same_priv {
/* Must be the first for scst_finish_internal_cmd()! */
struct scst_i_finish_t ws_finish_fn;
@@ -4462,6 +4459,7 @@ static int scst_ws_push_single_write(struct scst_write_same_priv *wsp,
static uint8_t write16_cdb[16];
struct scatterlist *sg;
int sg_cnt, len = blocks << ws_cmd->dev->block_shift;
struct sgv_pool_obj *sgv;
struct scst_cmd *cmd;
int64_t cur_lba;
@@ -4501,7 +4499,9 @@ static int scst_ws_push_single_write(struct scst_write_same_priv *wsp,
goto set_add;
}
sg = scst_alloc_sg(len, GFP_KERNEL, &sg_cnt);
sgv = NULL; /* we don't supply sgv */
sg = sgv_pool_alloc(ws_cmd->tgt_dev->pool, len, GFP_KERNEL, 0,
&sg_cnt, &sgv, &cmd->dev->dev_mem_lim, NULL);
if (sg == NULL) {
PRINT_ERROR("Unable to alloc sg for %d blocks", blocks);
res = -ENOMEM;
@@ -4514,7 +4514,9 @@ static int scst_ws_push_single_write(struct scst_write_same_priv *wsp,
for (i = 0; i < sg_cnt; i++) {
int cur_offs = 0;
while (cur_offs < sg[i].length) {
((int32_t *)(page_address(sg_page(&sg[i]))))[cur_offs] = cur_lba;
uint8_t *q;
q = &((int8_t *)(page_address(sg_page(&sg[i]))))[cur_offs];
*((uint64_t *)q) = cur_lba;
cur_offs += ws_cmd->dev->block_size;
cur_lba++;
}
@@ -4523,13 +4525,14 @@ static int scst_ws_push_single_write(struct scst_write_same_priv *wsp,
set_add:
cmd->tgt_i_sg = sg;
cmd->tgt_i_sg_cnt = sg_cnt;
cmd->out_sgv = sgv; /* hacky, but it isn't used for WRITE(16) */
cmd->tgt_i_data_buf_alloced = 1;
wsp->ws_cur_lba += blocks;
wsp->ws_left_to_send -= blocks;
wsp->ws_cur_in_flight++;
TRACE_DBG("Adding WRITE(16) cmd %p to head of active cmd list", cmd);
TRACE_DBG("Adding WRITE(16) cmd %p to active cmd list", cmd);
spin_lock_irq(&cmd->cmd_threads->cmd_list_lock);
list_add_tail(&cmd->cmd_list_entry, &cmd->cmd_threads->active_cmd_list);
spin_unlock_irq(&cmd->cmd_threads->cmd_list_lock);
@@ -4581,7 +4584,7 @@ static void scst_ws_write_cmd_finished(struct scst_cmd *cmd)
cmd, ws_cmd, wsp->ws_cur_in_flight);
if ((ws_cmd->cdb[1] & 0x6) != 0)
scst_free_sg(cmd->sg, cmd->sg_cnt);
sgv_pool_free(cmd->out_sgv, &cmd->dev->dev_mem_lim);
cmd->sg = NULL;
cmd->sg_cnt = 0;
@@ -4649,7 +4652,7 @@ static void scst_ws_gen_writes(struct scst_write_same_priv *wsp)
mutex_lock(&wsp->ws_mutex);
while ((wsp->ws_left_to_send > 0) &&
(wsp->ws_cur_in_flight < SCST_WRITE_SAME_MAX_IN_FLIGHT_COMMANDS)) {
(wsp->ws_cur_in_flight < SCST_MAX_IN_FLIGHT_INTERNAL_COMMANDS)) {
int rc, blocks;
blocks = min_t(int, wsp->ws_left_to_send, wsp->ws_max_each);
@@ -4717,7 +4720,7 @@ void scst_write_same(struct scst_cmd *cmd)
wsp->ws_cur_lba = cmd->lba;
wsp->ws_left_to_send = cmd->data_len >> cmd->dev->block_shift;
wsp->ws_max_each = SCST_WRITE_SAME_MAX_EACH_SIZE >> cmd->dev->block_shift;
wsp->ws_max_each = SCST_MAX_EACH_INTERNAL_IO_SIZE >> cmd->dev->block_shift;
wsp->ws_sg_cnt = min_t(int, wsp->ws_left_to_send, wsp->ws_max_each);
wsp->ws_sg = kmalloc(wsp->ws_sg_cnt * sizeof(*wsp->ws_sg), GFP_KERNEL);

4
scst/src/scst_mem.c
View File

@@ -1244,6 +1244,10 @@ EXPORT_SYMBOL_GPL(sgv_pool_free);
* Allocates and returns pointer to SG vector with data size "size".
* In *count returned the count of entries in the vector.
* Returns NULL for failure.
*
* Please don't use it for massive commands data buffers, because it
* isn't fair and don't accout per device memory limits. Use sgv_pool_alloc()
* instead.
*/
struct scatterlist *scst_alloc_sg(int size, gfp_t gfp_mask, int *count)
{

3
scst/src/scst_priv.h
View File

@@ -111,6 +111,9 @@ extern unsigned long scst_trace_flag;
#define SCST_DEF_LBA_DATA_LEN -1
#define SCST_MAX_EACH_INTERNAL_IO_SIZE (128*1024)
#define SCST_MAX_IN_FLIGHT_INTERNAL_COMMANDS 32
extern struct mutex scst_mutex2;
extern int scst_threads;