From: lixiubo@cmss.chinamobile.com
To: agrover@redhat.com, nab@linux-iscsi.org, mchristi@redhat.com
Cc: shli@kernel.org, sheng@yasker.org, linux-scsi@vger.kernel.org,
target-devel@vger.kernel.org, namei.unix@gmail.com,
bryantly@linux.vnet.ibm.com,
Xiubo Li <lixiubo@cmss.chinamobile.com>
Subject: [PATCHv4 2/4] tcmu: Fix wrongly calculating of the base_command_size
Date: Tue, 21 Mar 2017 16:36:20 +0800 [thread overview]
Message-ID: <1490085382-28658-3-git-send-email-lixiubo@cmss.chinamobile.com> (raw)
In-Reply-To: <1490085382-28658-1-git-send-email-lixiubo@cmss.chinamobile.com>
From: Xiubo Li <lixiubo@cmss.chinamobile.com>
The t_data_nents and t_bidi_data_nents are the numbers of the
segments, but it couldn't be sure the block size equals to size
of the segment.
For the worst case, all the blocks are discontiguous and there
will need the same number of iovecs, that's to say: blocks == iovs.
So here just set the number of iovs to block count needed by tcmu
cmd.
Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
---
drivers/target/target_core_user.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 65d475f..ae5b74f 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -408,6 +408,13 @@ static inline size_t tcmu_cmd_get_data_length(struct tcmu_cmd *tcmu_cmd)
return data_length;
}
+static inline uint32_t tcmu_cmd_get_block_cnt(struct tcmu_cmd *tcmu_cmd)
+{
+ size_t data_length = tcmu_cmd_get_data_length(tcmu_cmd);
+
+ return (data_length + DATA_BLOCK_SIZE - 1) / DATA_BLOCK_SIZE;
+}
+
static sense_reason_t
tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
{
@@ -435,8 +442,7 @@ static inline size_t tcmu_cmd_get_data_length(struct tcmu_cmd *tcmu_cmd)
* expensive to tell how many regions are freed in the bitmap
*/
base_command_size = max(offsetof(struct tcmu_cmd_entry,
- req.iov[se_cmd->t_bidi_data_nents +
- se_cmd->t_data_nents]),
+ req.iov[tcmu_cmd_get_block_cnt(tcmu_cmd)]),
sizeof(struct tcmu_cmd_entry));
command_size = base_command_size
+ round_up(scsi_command_size(se_cmd->t_task_cdb), TCMU_OP_ALIGN_SIZE);
--
1.8.3.1
next prev parent reply other threads:[~2017-03-21 8:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 8:36 [PATCHv4 0/4] tcmu: bug fix and dynamic growing data area support lixiubo
2017-03-21 8:36 ` [PATCHv4 1/4] tcmu: Fix possible overwrite of t_data_sg's last iov[] lixiubo
2017-03-21 19:39 ` Mike Christie
2017-03-21 8:36 ` lixiubo [this message]
2017-03-21 19:53 ` [PATCHv4 2/4] tcmu: Fix wrongly calculating of the base_command_size Mike Christie
2017-03-21 8:36 ` [PATCHv4 3/4] tcmu: Add dynamic growing data area feature support lixiubo
2017-03-21 8:36 ` [PATCHv4 4/4] tcmu: Add global data block pool support lixiubo
2017-03-21 19:12 ` [PATCHv4 0/4] tcmu: bug fix and dynamic growing data area support Bryant G. Ly
2017-03-23 16:02 ` Ilias Tsitsimpis
[not found] ` <c28c75c3-0ab8-4320-9716-b36fc027ff50@email.android.com>
2017-03-25 8:57 ` Ilias Tsitsimpis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490085382-28658-3-git-send-email-lixiubo@cmss.chinamobile.com \
--to=lixiubo@cmss.chinamobile.com \
--cc=agrover@redhat.com \
--cc=bryantly@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=mchristi@redhat.com \
--cc=nab@linux-iscsi.org \
--cc=namei.unix@gmail.com \
--cc=sheng@yasker.org \
--cc=shli@kernel.org \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.