mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 13:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use queue's max_hw_sectors instead of host->max_sectors as reported by "Hauser, Stefan" <stefan.hauser@bdt.de>

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2836 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-11-26 14:03:39 +00:00
parent db35095aa1
commit 2935a05765
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_disk.c
+9 -3
View File
@@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
@@ -506,19 +507,24 @@ static int disk_exec(struct scst_cmd *cmd)
struct scatterlist *sg, *start_sg;
int cur_sg_cnt;
int sg_tablesize = cmd->dev->scsi_dev->host->sg_tablesize;
int max_sectors = cmd->dev->scsi_dev->host->max_sectors;
int max_sectors;
int num, j;
TRACE_ENTRY();
/*
* For PC requests we are going to submit max_hw_sectors used instead
* of max_sectors.
*/
max_sectors = queue_max_hw_sectors(cmd->dev->scsi_dev->request_queue);
if (unlikely(((max_sectors << params->block_shift) & ~PAGE_MASK) != 0)) {
int mlen = max_sectors << params->block_shift;
int pg = ((mlen >> PAGE_SHIFT) + ((mlen & ~PAGE_MASK) != 0)) - 1;
int adj_len = pg << PAGE_SHIFT;
max_sectors = adj_len >> params->block_shift;
if (max_sectors == 0) {
PRINT_ERROR("Too low max sectors %d",
cmd->dev->scsi_dev->host->max_sectors);
PRINT_ERROR("Too low max sectors %d", max_sectors);
goto out_error;
}
}
scst/src/scst_targ.c
+18 -7
View File
@@ -2441,6 +2441,13 @@ static struct scst_cmd *scst_post_exec_sn(struct scst_cmd *cmd,
return res;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
{
return q->max_hw_sectors;
}
#endif
/* cmd must be additionally referenced to not die inside */
static int scst_do_real_exec(struct scst_cmd *cmd)
{
@@ -2450,6 +2457,7 @@ static int scst_do_real_exec(struct scst_cmd *cmd)
struct scst_dev_type *handler = dev->handler;
struct io_context *old_ctx = NULL;
bool ctx_changed = false;
struct scsi_device *scsi_dev;
TRACE_ENTRY();
@@ -2477,7 +2485,9 @@ static int scst_do_real_exec(struct scst_cmd *cmd)
TRACE_DBG("Sending cmd %p to SCSI mid-level", cmd);
if (unlikely(dev->scsi_dev == NULL)) {
scsi_dev = dev->scsi_dev;
if (unlikely(scsi_dev == NULL)) {
PRINT_ERROR("Command for virtual device must be "
"processed by device handler (LUN %lld)!",
(long long unsigned int)cmd->lun);
@@ -2491,7 +2501,7 @@ static int scst_do_real_exec(struct scst_cmd *cmd)
scst_set_cur_start(cmd);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
rc = scst_exec_req(dev->scsi_dev, cmd->cdb, cmd->cdb_len,
rc = scst_exec_req(scsi_dev, cmd->cdb, cmd->cdb_len,
cmd->data_direction, cmd->sg, cmd->bufflen,
cmd->sg_cnt, cmd->timeout, cmd->retries, cmd,
scst_pass_through_cmd_done, GFP_KERNEL);
@@ -2502,11 +2512,12 @@ static int scst_do_real_exec(struct scst_cmd *cmd)
PRINT_ERROR("scst pass-through exec failed: %x", rc);
if ((int)rc == -EINVAL)
PRINT_ERROR("Do you have too low max_sectors on your "
"backend hardware? For success max_sectors must "
"be >= bufflen in sectors (max_sectors %d, "
"bufflen %db, CDB %x). See README for more "
"details.", dev->scsi_dev->host->max_sectors,
cmd->bufflen, cmd->cdb[0]);
"backend hardware? For success bufflen "
"must be <= max_sectors (bufflen %db, "
"max_sectors %d sectors, CDB %x). See README "
"for more details.", cmd->bufflen,
queue_max_hw_sectors(scsi_dev->request_queue),
cmd->cdb[0]);
goto out_error;
}