From patchwork Mon Feb 24 05:32:30 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: 3706431 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9DD4ABF13A for ; Mon, 24 Feb 2014 05:56:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B275A20160 for ; Mon, 24 Feb 2014 05:56:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6F3E2015A for ; Mon, 24 Feb 2014 05:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751175AbaBXF4S (ORCPT ); Mon, 24 Feb 2014 00:56:18 -0500 Received: from mail-ob0-f169.google.com ([209.85.214.169]:47883 "EHLO mail-ob0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbaBXFya (ORCPT ); Mon, 24 Feb 2014 00:54:30 -0500 Received: by mail-ob0-f169.google.com with SMTP id wn1so1546440obc.14 for ; Sun, 23 Feb 2014 21:54:29 -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=mF3cODkwwvDCGp01KZKeXIfbIMYf8j9qA4SaGjQh+Cs=; b=NJy3H8kl6CI1RwKFKGx11/0IzjT15AtgaF64Sn2V/Wx70f7LIHbYvnVO5TOFJPgwVG bbBMAqg+MYVQ2HGtnx8qDMY2SSBjGcdpiMaMIKv2ftz+6GH/LrMSYXEaHtVoSl5gQzK5 TCEurjRwHDI9Wwvj3GCkmqciAr5zab00kewsZpnBO4PtrflC/eWEjCN6agTXhGGzcn6I QwaY48tuMaYRXVCuA6K6P+x77zNLQfU4rid0P2MtouMQY3PupJyl3fs4wxDJAWn6vQov saFcwiSzmOekuTEL3DVWlN3kI+hVt7x86ocjIRPLFlyFBG2TUjW3Et7Cy1hzGnW1raaE q1Og== X-Gm-Message-State: ALoCoQn+MZm6b9vHJ7N1NN5UB7//c1rjZb/pOPQCGvkGGE0qa66cSNLxdyyN7IMuy0k7GOc/Jf3X X-Received: by 10.182.88.69 with SMTP id be5mr15639937obb.55.1393221269299; Sun, 23 Feb 2014 21:54:29 -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.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 23 Feb 2014 21:54:28 -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 6/6] virtio-scsi: Enable DIF/DIX modes in SCSI host LLD Date: Mon, 24 Feb 2014 05:32:30 +0000 Message-Id: <1393219950-18613-7-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 virtscsi_probe() to setup all necessary Scsi_Host level protection resources necessary to enable DIF on virtio-scsi <-> vhost-scsi LUNs. Currently hardcoded to 1. It changes virtscsi_add_cmd() so that outgoing / incoming protection SGLs are attached after each data payload, and is currently using the unused virtio_scsi_cmd_req->prio bits to signal the total number of prot_sgl_count for vhost/scsi to expect. Cc: Paolo Bonzini Cc: Michael S. Tsirkin Cc: Martin K. Petersen Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Sagi Grimberg Signed-off-by: Nicholas Bellinger --- drivers/scsi/virtio_scsi.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 16bfd50..294466d 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -440,7 +440,7 @@ static int virtscsi_add_cmd(struct virtqueue *vq, size_t req_size, size_t resp_size, gfp_t gfp) { struct scsi_cmnd *sc = cmd->sc; - struct scatterlist *sgs[4], req, resp; + struct scatterlist *sgs[6], req, resp; struct sg_table *out, *in; unsigned out_num = 0, in_num = 0; @@ -458,16 +458,22 @@ static int virtscsi_add_cmd(struct virtqueue *vq, sgs[out_num++] = &req; /* Data-out buffer. */ - if (out) + if (out) { sgs[out_num++] = out->sgl; + if (scsi_prot_sg_count(sc)) + sgs[out_num++] = scsi_prot_sglist(sc); + } /* Response header. */ sg_init_one(&resp, &cmd->resp, resp_size); sgs[out_num + in_num++] = &resp; /* Data-in buffer */ - if (in) + if (in) { sgs[out_num + in_num++] = in->sgl; + if (scsi_prot_sg_count(sc)) + sgs[out_num + in_num++] = scsi_prot_sglist(sc); + } return virtqueue_add_sgs(vq, sgs, out_num, in_num, cmd, gfp); } @@ -498,6 +504,7 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, { struct virtio_scsi_cmd *cmd; int ret; + u8 prio = 0; struct Scsi_Host *shost = virtio_scsi_host(vscsi->vdev); BUG_ON(scsi_sg_count(sc) > shost->sg_tablesize); @@ -515,6 +522,10 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, memset(cmd, 0, sizeof(*cmd)); cmd->sc = sc; + + if (scsi_prot_sg_count(sc)) + prio = (u8)scsi_prot_sg_count(sc); + cmd->req.cmd = (struct virtio_scsi_cmd_req){ .lun[0] = 1, .lun[1] = sc->device->id, @@ -522,7 +533,7 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi, .lun[3] = sc->device->lun & 0xff, .tag = (unsigned long)sc, .task_attr = VIRTIO_SCSI_S_SIMPLE, - .prio = 0, + .prio = prio, .crn = 0, }; @@ -871,7 +882,7 @@ static int virtscsi_probe(struct virtio_device *vdev) { struct Scsi_Host *shost; struct virtio_scsi *vscsi; - int err; + int err, host_prot; u32 sg_elems, num_targets; u32 cmd_per_lun; u32 num_queues; @@ -921,6 +932,17 @@ static int virtscsi_probe(struct virtio_device *vdev) shost->max_id = num_targets; shost->max_channel = 0; shost->max_cmd_len = VIRTIO_SCSI_CDB_SIZE; + + /* FIXME: Figure out why this is broken.. */ + if (1 || virtio_has_feature(vdev, VIRTIO_SCSI_F_T10_PI)) { + host_prot = SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION | + SHOST_DIF_TYPE3_PROTECTION | SHOST_DIX_TYPE1_PROTECTION | + SHOST_DIX_TYPE2_PROTECTION | SHOST_DIX_TYPE3_PROTECTION; + + scsi_host_set_prot(shost, host_prot); + scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC); + } + err = scsi_add_host(shost, &vdev->dev); if (err) goto scsi_add_host_failed; @@ -990,6 +1012,7 @@ static struct virtio_device_id id_table[] = { static unsigned int features[] = { VIRTIO_SCSI_F_HOTPLUG, VIRTIO_SCSI_F_CHANGE, + VIRTIO_SCSI_F_T10_PI, }; static struct virtio_driver virtio_scsi_driver = {