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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-02-03 16:02:11 -08:00
parent cb93e37399 aebee8cb77
commit dc03caa9cb
2 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/scst.h
+3
View File
@@ -2397,6 +2397,9 @@ struct scst_cmd {
/* Set if cmd was globally STPG blocked in __scst_check_blocked_dev() */
unsigned int cmd_global_stpg_blocked:1;
/* Set by WRITE VERIFY commands to trigger a verify after write */
unsigned int do_verify:1;
/**************************************************************/
/* cmd's async flags */
scst/src/dev_handlers/scst_vdisk.c
+52 -14
View File
@@ -352,6 +352,7 @@ static enum compl_status_e fileio_exec_var_len_cmd(struct vdisk_cmd_params *p);
static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua);
static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
bool report_error, struct scst_cmd *cmd, bool async);
static enum compl_status_e vdev_verify(struct scst_cmd *cmd, loff_t loff);
static enum compl_status_e vdev_exec_verify(struct vdisk_cmd_params *p);
static enum compl_status_e blockio_exec_write_verify(struct vdisk_cmd_params *p);
static enum compl_status_e fileio_exec_write_verify(struct vdisk_cmd_params *p);
@@ -6244,6 +6245,24 @@ out_nomem:
goto out;
}
struct scst_verify_work {
struct work_struct work;
struct scst_cmd *cmd;
};
static void scst_do_verify_work(struct work_struct *work)
{
struct scst_verify_work *w = container_of(work, typeof(*w), work);
struct scst_cmd *cmd = w->cmd;
struct scst_device *dev = cmd->dev;
loff_t loff = scst_cmd_get_lba(cmd) << dev->block_shift;
kfree(w);
WARN_ON_ONCE(vdev_verify(cmd, loff) != CMD_SUCCEEDED);
cmd->completed = 1;
cmd->scst_cmd_done(cmd, SCST_CMD_STATE_DEFAULT, SCST_CONTEXT_SAME);
}
struct scst_blockio_work {
atomic_t bios_inflight;
struct scst_cmd *cmd;
@@ -6255,10 +6274,29 @@ struct scst_blockio_work {
static inline void blockio_check_finish(struct scst_blockio_work *blockio_work)
{
/* Decrement the bios in processing, and if zero signal completion */
if (atomic_dec_and_test(&blockio_work->bios_inflight)) {
struct scst_cmd *cmd = blockio_work->cmd;
struct scst_cmd *cmd;
/* Decrement the bios in processing, and if zero signal completion */
if (!atomic_dec_and_test(&blockio_work->bios_inflight))
return;
cmd = blockio_work->cmd;
if (unlikely(cmd->do_verify)) {
struct scst_verify_work *w = kmalloc(sizeof(*w), GFP_ATOMIC);
cmd->do_verify = false;
if (w) {
INIT_WORK(&w->work, scst_do_verify_work);
w->cmd = cmd;
schedule_work(&w->work);
} else {
scst_set_busy(cmd);
cmd->completed = 1;
cmd->scst_cmd_done(cmd, SCST_CMD_STATE_DEFAULT,
scst_estimate_context());
}
} else {
if ((cmd->data_direction & SCST_DATA_READ) &&
likely(cmd->status == SAM_STAT_GOOD)) {
/*
@@ -6268,13 +6306,11 @@ static inline void blockio_check_finish(struct scst_blockio_work *blockio_work)
cmd->deferred_dif_read_check = 1;
}
blockio_work->cmd->completed = 1;
blockio_work->cmd->scst_cmd_done(cmd,
SCST_CMD_STATE_DEFAULT, scst_estimate_context());
kmem_cache_free(blockio_work_cachep, blockio_work);
cmd->completed = 1;
cmd->scst_cmd_done(cmd, SCST_CMD_STATE_DEFAULT,
scst_estimate_context());
}
return;
kmem_cache_free(blockio_work_cachep, blockio_work);
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && (LINUX_VERSION_CODE <= KERNEL_VERSION(3, 6, 0))
@@ -7086,10 +7122,8 @@ static ssize_t vdev_read_sync(struct scst_vdisk_dev *virt_dev, void *buf,
}
}
static enum compl_status_e vdev_exec_verify(struct vdisk_cmd_params *p)
static enum compl_status_e vdev_verify(struct scst_cmd *cmd, loff_t loff)
{
struct scst_cmd *cmd = p->cmd;
loff_t loff = p->loff;
loff_t err;
ssize_t length, len_mem = 0;
uint8_t *address_sav, *address = NULL;
@@ -7187,10 +7221,14 @@ out:
return CMD_SUCCEEDED;
}
static enum compl_status_e vdev_exec_verify(struct vdisk_cmd_params *p)
{
return vdev_verify(p->cmd, p->loff);
}
static enum compl_status_e blockio_exec_write_verify(struct vdisk_cmd_params *p)
{
/* Not yet implemented */
PRINT_WARNING("vdisk_blockio: WRITE VERIFY is not yet implemented");
p->cmd->do_verify = true;
return blockio_exec_write(p);
}