{"id":811630,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811630/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-11-git-send-email-mst@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504880304-12069-11-git-send-email-mst@redhat.com>","list_archive_url":null,"date":"2017-09-08T14:19:19","name":"[PULL,10/17] intel_iommu: fix missing BQL in pt fast path","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5e6115ddb802a2bf6304fa7cbcf27046a1427e44","submitter":{"id":2235,"url":"http://patchwork.ozlabs.org/api/1.2/people/2235/?format=json","name":"Michael S. Tsirkin","email":"mst@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-11-git-send-email-mst@redhat.com/mbox/","series":[{"id":2227,"url":"http://patchwork.ozlabs.org/api/1.2/series/2227/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2227","date":"2017-09-08T14:18:52","name":"[PULL,01/17] vhost: Release memory references on cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/2227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811630/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811630/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mst@redhat.com"],"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 3xpfjr5xZsz9sBd\n\tfor ;\n\tSat, 9 Sep 2017 00:25:20 +1000 (AEST)","from localhost ([::1]:45693 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqKDe-0003Gw-Qk\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:25:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49142)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqK81-0006lQ-9d\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqK7x-000550-DD\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:29 -0400","from mx1.redhat.com ([209.132.183.28]:59002)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqK7x-000549-6S\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:25 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 40BF7883D9;\n\tFri, 8 Sep 2017 14:19:24 +0000 (UTC)","from redhat.com (ovpn-120-144.rdu2.redhat.com [10.10.120.144])\n\tby smtp.corp.redhat.com (Postfix) with SMTP id 14DAA627DF;\n\tFri, 8 Sep 2017 14:19:19 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 40BF7883D9","Date":"Fri, 8 Sep 2017 17:19:19 +0300","From":"\"Michael S. Tsirkin\" ","To":"qemu-devel@nongnu.org","Message-ID":"<1504880304-12069-11-git-send-email-mst@redhat.com>","References":"<1504880304-12069-1-git-send-email-mst@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1504880304-12069-1-git-send-email-mst@redhat.com>","X-Mutt-Fcc":"=sent","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tFri, 08 Sep 2017 14:19:24 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 10/17] intel_iommu: fix missing BQL in pt fast\n\tpath","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell ,\n\tEduardo Habkost ,\n\tJason Wang , Peter Xu ,\n\tPaolo Bonzini , Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Peter Xu \n\nIn vtd_switch_address_space() we did the memory region switch, however\nit's possible that the caller of it has not taken the BQL at all. Make\nsure we have it.\n\nCC: Paolo Bonzini \nCC: Jason Wang \nCC: Michael S. Tsirkin \nSigned-off-by: Peter Xu \nReviewed-by: Michael S. Tsirkin \nSigned-off-by: Michael S. Tsirkin \n---\n hw/i386/intel_iommu.c | 15 +++++++++++++++\n 1 file changed, 15 insertions(+)","diff":"diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c\nindex a7bf87a..3a5bb0b 100644\n--- a/hw/i386/intel_iommu.c\n+++ b/hw/i386/intel_iommu.c\n@@ -957,6 +957,8 @@ static bool vtd_dev_pt_enabled(VTDAddressSpace *as)\n static bool vtd_switch_address_space(VTDAddressSpace *as)\n {\n bool use_iommu;\n+ /* Whether we need to take the BQL on our own */\n+ bool take_bql = !qemu_mutex_iothread_locked();\n \n assert(as);\n \n@@ -967,6 +969,15 @@ static bool vtd_switch_address_space(VTDAddressSpace *as)\n VTD_PCI_FUNC(as->devfn),\n use_iommu);\n \n+ /*\n+ * It's possible that we reach here without BQL, e.g., when called\n+ * from vtd_pt_enable_fast_path(). However the memory APIs need\n+ * it. We'd better make sure we have had it already, or, take it.\n+ */\n+ if (take_bql) {\n+ qemu_mutex_lock_iothread();\n+ }\n+\n /* Turn off first then on the other */\n if (use_iommu) {\n memory_region_set_enabled(&as->sys_alias, false);\n@@ -976,6 +987,10 @@ static bool vtd_switch_address_space(VTDAddressSpace *as)\n memory_region_set_enabled(&as->sys_alias, true);\n }\n \n+ if (take_bql) {\n+ qemu_mutex_unlock_iothread();\n+ }\n+\n return use_iommu;\n }\n \n","prefixes":["PULL","10/17"]}