From patchwork Mon Feb 24 05:32:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 3706441 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B0A7A9F35F for ; Mon, 24 Feb 2014 05:57:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC34020160 for ; Mon, 24 Feb 2014 05:57:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3DEF20172 for ; Mon, 24 Feb 2014 05:57:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbaBXFy3 (ORCPT ); Mon, 24 Feb 2014 00:54:29 -0500 Received: from mail-ob0-f181.google.com ([209.85.214.181]:50237 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867AbaBXFy0 (ORCPT ); Mon, 24 Feb 2014 00:54:26 -0500 Received: by mail-ob0-f181.google.com with SMTP id wp4so4761514obc.12 for ; Sun, 23 Feb 2014 21:54:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HVyMQkqHlf5hQUVEV3lQPA234unTSq4pbNFart6qAxo=; b=Ok3Z/pZmnZ2WF6qkDgDP8rZpT/AiupOvV7W/R6kd7FWMo/Z6owcY95wrBILoLAwzRY 4MNzgK0MWhFocWAdZidBrjQO5kAPXhKXENuNVNVNtuXyaupnHHszzWeldm8txzpj/5v2 dU967PAgOQWXbAmy1hk9rGqgd2ix2yHo4HPFp5GnRMbEejCAvqUTBwWokymfwShNht7e AVYXCjv5RkFOoKOfLBPx7k8hAL+ZS1d/8+X6x4EdHyAge4uEj3x714rblUmp4P0i/gAH v+iK8w7wP+C8ax0z5UxO9jd235pn7KzcU1mG1WiAZMkx1t8rfx11Xnw0WLTrDdFpDxLN AMiQ== X-Gm-Message-State: ALoCoQkooN3l8r1GTTr5B0Hld3npr55xPXvtBf5UKlBhTJNNDuvyKtN78nl4hszVgaEmLRRTK4Bw X-Received: by 10.60.174.77 with SMTP id bq13mr20083416oec.0.1393221265678; Sun, 23 Feb 2014 21:54:25 -0800 (PST) Received: from localhost.localdomain (mail.linux-iscsi.org. [67.23.28.174]) by mx.google.com with ESMTPSA id tr10sm31941566obb.6.2014.02.23.21.54.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 23 Feb 2014 21:54:24 -0800 (PST) From: "Nicholas A. Bellinger" To: target-devel Cc: linux-scsi , linux-kernel , kvm-devel , "Michael S. Tsirkin" , Paolo Bonzini , "Martin K. Petersen" , Christoph Hellwig , Hannes Reinecke , Sagi Grimberg , Nicholas Bellinger , Sagi Grimberg Subject: [RFC 4/6] vhost/scsi: Enable T10 PI IOV -> SGL memory mapping Date: Mon, 24 Feb 2014 05:32:28 +0000 Message-Id: <1393219950-18613-5-git-send-email-nab@daterainc.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1393219950-18613-1-git-send-email-nab@daterainc.com> References: <1393219950-18613-1-git-send-email-nab@daterainc.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nicholas Bellinger This patch updates vhost_scsi_handle_vq() to calculate a data_niov + prot_niov currently based upon virtio_scsi_cmd_req->prio for figuring out many of seperate data + protection SGLs to expect from data_num. Also update tcm_vhost_submission_work() to pass the pre-allocated cmd->tvc_prot_sgl[] memory into target_submit_cmd_map_sgls(). Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Martin K. Petersen Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Sagi Grimberg Signed-off-by: Nicholas Bellinger --- drivers/vhost/scsi.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 0cf5948..3bdb625 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -908,18 +908,15 @@ static void tcm_vhost_submission_work(struct work_struct *work) container_of(work, struct tcm_vhost_cmd, work); struct tcm_vhost_nexus *tv_nexus; struct se_cmd *se_cmd = &cmd->tvc_se_cmd; - struct scatterlist *sg_ptr, *sg_bidi_ptr = NULL; - int rc, sg_no_bidi = 0; + struct scatterlist *sg_ptr, *sg_prot_ptr = NULL; + int rc; + /* FIXME: BIDI operation */ if (cmd->tvc_sgl_count) { sg_ptr = cmd->tvc_sgl; -/* FIXME: Fix BIDI operation in tcm_vhost_submission_work() */ -#if 0 - if (se_cmd->se_cmd_flags & SCF_BIDI) { - sg_bidi_ptr = NULL; - sg_no_bidi = 0; - } -#endif + + if (cmd->tvc_prot_sgl_count) + sg_prot_ptr = cmd->tvc_prot_sgl; } else { sg_ptr = NULL; } @@ -930,7 +927,7 @@ static void tcm_vhost_submission_work(struct work_struct *work) cmd->tvc_lun, cmd->tvc_exp_data_len, cmd->tvc_task_attr, cmd->tvc_data_direction, TARGET_SCF_ACK_KREF, sg_ptr, cmd->tvc_sgl_count, - sg_bidi_ptr, sg_no_bidi, NULL, 0); + NULL, 0, sg_prot_ptr, cmd->tvc_prot_sgl_count); if (rc < 0) { transport_send_check_condition_and_sense(se_cmd, TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0); @@ -966,7 +963,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) struct tcm_vhost_cmd *cmd; u32 exp_data_len, data_first, data_num, data_direction; unsigned out, in, i; - int head, ret; + int head, ret, data_niov, prot_niov; u8 target; mutex_lock(&vq->mutex); @@ -998,7 +995,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) break; } -/* FIXME: BIDI operation */ + /* FIXME: BIDI operation */ if (out == 1 && in == 1) { data_direction = DMA_NONE; data_first = 0; @@ -1052,8 +1049,17 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) continue; } + data_niov = data_num; + prot_niov = 0; + + if (data_num && v_req.prio != 0) { + /* FIXME: Figure out a better way.. */ + data_niov = data_num - v_req.prio; + prot_niov = v_req.prio; + } + exp_data_len = 0; - for (i = 0; i < data_num; i++) + for (i = 0; i < data_niov; i++) exp_data_len += vq->iov[data_first + i].iov_len; cmd = vhost_scsi_get_tag(vq, tpg, &v_req, @@ -1096,14 +1102,23 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) if (data_direction != DMA_NONE) { ret = vhost_scsi_map_iov_to_sgl(cmd, - &vq->iov[data_first], data_num, + &vq->iov[data_first], data_niov, data_direction == DMA_FROM_DEVICE); if (unlikely(ret)) { vq_err(vq, "Failed to map iov to sgl\n"); goto err_free; } } - + if (prot_niov) { + ret = vhost_scsi_map_iov_to_prot(cmd, + &vq->iov[data_first + data_niov], prot_niov, + data_direction == DMA_FROM_DEVICE); + if (unlikely(ret)) { + vq_err(vq, "Failed to map iov to" + " prot_sgl\n"); + goto err_free; + } + } /* * Save the descriptor from vhost_get_vq_desc() to be used to * complete the virtio-scsi request in TCM callback context via