{"id":806877,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806877/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-69-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:43","name":"[68/79] virtio-scsi: finalize IOMMU support","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b533fe757f656e5dd3aeef43202733b52842ad86","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-69-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806877/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh9TN4Dwrz9sP5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 11:07:03 +1000 (AEST)","from localhost ([::1]:42172 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmUzc-00049p-SX\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 21:07:00 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48941)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCs-0001nT-Qa\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCp-0006FF-NW\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:38 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52864)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUCp-0006D8-Fo\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:35 -0400","from pps.filterd (m0098393.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0GFQg082669\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:34 -0400","from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmnx0yvhs-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:34 -0400","from localhost\n\tby e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 18:16:33 -0600","from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19)\n\tby e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:30 -0600","from b03ledav005.gho.boulder.ibm.com\n\t(b03ledav005.gho.boulder.ibm.com [9.17.130.236])\n\tby b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0GUoB64618746; Mon, 28 Aug 2017 17:16:30 -0700","from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 0993EBE038;\n\tMon, 28 Aug 2017 18:16:30 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id C7AD9BE03E;\n\tMon, 28 Aug 2017 18:16:29 -0600 (MDT)"],"From":"Michael Roth <mdroth@linux.vnet.ibm.com>","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:43 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0024-0000-0000-0000171CE4DD","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:32","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0025-0000-0000-00004C7F0576","Message-Id":"<1503965694-10794-69-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"[Qemu-devel] [PATCH 68/79] virtio-scsi: finalize IOMMU support","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Paolo Bonzini <pbonzini@redhat.com>, Jason Wang <jasowang@redhat.com>,\n\tqemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Jason Wang <jasowang@redhat.com>\n\nAfter converting to use DMA api for virtio devices, we should use\ndma_as instead of address_space_memory. Otherwise it won't work if\nIOMMU is enabled.\n\nFixes: commit 8607f5c3072c (\"virtio: convert to use DMA api\")\nCc: qemu-stable@nongnu.org\nSigned-off-by: Jason Wang <jasowang@redhat.com>\nMessage-Id: <1499170866-9068-1-git-send-email-jasowang@redhat.com>\nSigned-off-by: Paolo Bonzini <pbonzini@redhat.com>\n(cherry picked from commit 025bdeab3c163aee9604a60b2332a5fcbcc00f8d)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n hw/scsi/virtio-scsi.c | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c\nindex cb1c123..3915c2e 100644\n--- a/hw/scsi/virtio-scsi.c\n+++ b/hw/scsi/virtio-scsi.c\n@@ -43,12 +43,13 @@ static inline SCSIDevice *virtio_scsi_device_find(VirtIOSCSI *s, uint8_t *lun)\n \n void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req)\n {\n+    VirtIODevice *vdev = VIRTIO_DEVICE(s);\n     const size_t zero_skip =\n         offsetof(VirtIOSCSIReq, resp_iov) + sizeof(req->resp_iov);\n \n     req->vq = vq;\n     req->dev = s;\n-    qemu_sglist_init(&req->qsgl, DEVICE(s), 8, &address_space_memory);\n+    qemu_sglist_init(&req->qsgl, DEVICE(s), 8, vdev->dma_as);\n     qemu_iovec_init(&req->resp_iov, 1);\n     memset((uint8_t *)req + zero_skip, 0, sizeof(*req) - zero_skip);\n }\n","prefixes":["68/79"]}