From: "Nicholas A. Bellinger" <nab@daterainc.com>
To: target-devel <target-devel@vger.kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>,
Martin Petersen <martin.petersen@oracle.com>,
Chris Mason <chris.mason@fusionio.com>,
Roland Dreier <roland@purestorage.com>,
James Bottomley <JBottomley@Parallels.com>,
Nicholas Bellinger <nab@linux-iscsi.org>,
Nicholas Bellinger <nab@daterainc.com>
Subject: [PATCH-v2 06/12] target: Add memory allocation for bidirectional commands
Date: Thu, 22 Aug 2013 04:54:04 +0000 [thread overview]
Message-ID: <1377147250-10125-7-git-send-email-nab@daterainc.com> (raw)
In-Reply-To: <1377147250-10125-1-git-send-email-nab@daterainc.com>
From: Nicholas Bellinger <nab@daterainc.com>
This adds transport_generic_get_mem_bidi() to perform scatterlist
allocation for bidirectional commands.
Also, update transport_generic_new_cmd() to call this new function
when SCF_BIDI has been set.
v2 Changes:
- Use SCF_COMPARE_AND_WRITE instead of CDB based check for
calculating length in transport_generic_get_mem_bidi().
- Use SCF_COMPARE_AND_WRITE in transport_generic_new_cmd()
for determing when to call transport_generic_get_mem_bidi()
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Martin Petersen <martin.petersen@oracle.com>
Cc: Chris Mason <chris.mason@fusionio.com>
Cc: James Bottomley <JBottomley@Parallels.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Nicholas Bellinger <nab@daterainc.com>
---
drivers/target/target_core_transport.c | 54 ++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 781859e..967dac7 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2092,6 +2092,53 @@ void transport_kunmap_data_sg(struct se_cmd *cmd)
EXPORT_SYMBOL(transport_kunmap_data_sg);
static int
+transport_generic_get_mem_bidi(struct se_cmd *cmd)
+{
+ struct se_device *dev = cmd->se_dev;
+ struct page *page;
+ gfp_t zero_flag;
+ u32 length;
+ unsigned int nents;
+ int i = 0;
+
+ if (cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE)
+ length = cmd->t_task_nolb * dev->dev_attrib.block_size;
+ else
+ length = cmd->data_length;
+
+ nents = DIV_ROUND_UP(length, PAGE_SIZE);
+ cmd->t_bidi_data_sg = kmalloc(sizeof(struct scatterlist) * nents, GFP_KERNEL);
+ if (!cmd->t_bidi_data_sg)
+ return -ENOMEM;
+
+ cmd->t_bidi_data_nents = nents;
+ sg_init_table(cmd->t_bidi_data_sg, nents);
+
+ zero_flag = cmd->se_cmd_flags & SCF_SCSI_DATA_CDB ? 0 : __GFP_ZERO;
+
+ while (length) {
+ u32 page_len = min_t(u32, length, PAGE_SIZE);
+ page = alloc_page(GFP_KERNEL | zero_flag);
+ if (!page)
+ goto out;
+
+ sg_set_page(&cmd->t_bidi_data_sg[i], page, page_len, 0);
+ length -= page_len;
+ i++;
+ }
+ return 0;
+
+out:
+ while (i > 0) {
+ i--;
+ __free_page(sg_page(&cmd->t_bidi_data_sg[i]));
+ }
+ kfree(cmd->t_bidi_data_sg);
+ cmd->t_bidi_data_sg = NULL;
+ return -ENOMEM;
+}
+
+static int
transport_generic_get_mem(struct se_cmd *cmd)
{
u32 length = cmd->data_length;
@@ -2149,6 +2196,13 @@ transport_generic_new_cmd(struct se_cmd *cmd)
*/
if (!(cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC) &&
cmd->data_length) {
+ if ((cmd->se_cmd_flags & SCF_BIDI) ||
+ (cmd->se_cmd_flags & SCF_COMPARE_AND_WRITE)) {
+ ret = transport_generic_get_mem_bidi(cmd);
+ if (ret < 0)
+ return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+ }
+
ret = transport_generic_get_mem(cmd);
if (ret < 0)
return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
--
1.7.2.5
next prev parent reply other threads:[~2013-08-22 5:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 4:53 [PATCH-v2 00/12] target: Add support for COMPARE_AND_WRITE (VAAI) emulation Nicholas A. Bellinger
2013-08-22 4:53 ` [PATCH-v2 01/12] scsi: Add CDB definition for COMPARE_AND_WRITE Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 02/12] target: Add return for se_cmd->transport_complete_callback Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 03/12] target: Add TCM_MISCOMPARE_VERIFY sense handling Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 04/12] target: Allow sbc_ops->execute_rw() to accept SGLs + data_direction Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 05/12] target: Convert se_cmd->t_bidi_data_sg checks to use SCF_BIDI Nicholas A. Bellinger
2013-08-22 4:54 ` Nicholas A. Bellinger [this message]
2013-08-24 15:18 ` [PATCH-v2 06/12] target: Add memory allocation for bidirectional commands Christoph Hellwig
2013-08-24 23:44 ` Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 07/12] target: Add transport_reset_sgl_orig() for COMPARE_AND_WRITE Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 08/12] target: Make __target_execute_cmd() available as extern Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 09/12] target: Add MAXIMUM COMPARE AND WRITE LENGTH in Block Limits VPD Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 10/12] target: Add support for COMPARE_AND_WRITE emulation Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 11/12] target: Add compare_and_write_post() completion callback fall through Nicholas A. Bellinger
2013-08-22 4:54 ` [PATCH-v2 12/12] target: Release COMPARE_AND_WRITE mutex in generic failure path Nicholas A. Bellinger
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=1377147250-10125-7-git-send-email-nab@daterainc.com \
--to=nab@daterainc.com \
--cc=JBottomley@Parallels.com \
--cc=chris.mason@fusionio.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nab@linux-iscsi.org \
--cc=roland@purestorage.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®