From patchwork Mon Feb 4 14:43:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 1036000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tWMw3yPPz9s4Z for ; Tue, 5 Feb 2019 02:09:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:44178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqfsY-0003U1-FK for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2019 10:09:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqfaf-0006Fc-Ng for qemu-devel@nongnu.org; Mon, 04 Feb 2019 09:51:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqfTO-0005T4-94 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 09:43:47 -0500 Received: from mail-qk1-f169.google.com ([209.85.222.169]:40565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqfTO-0005RP-2X for qemu-devel@nongnu.org; Mon, 04 Feb 2019 09:43:46 -0500 Received: by mail-qk1-f169.google.com with SMTP id y16so41807qki.7 for ; Mon, 04 Feb 2019 06:43:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8aDyLFLJEz4VJsfhrM3xwSHxnaY52HUISXdrwGNWfBA=; b=fwfrL7PGrkxJOOOt1enbPEaz5EYvilzDsGD2fM8vMuj6Ad5tjj4A/rHi+qyCe9ZQ2R M+B5oGqb2PCxQCYniZIMSmoqOqi76vIkQnoEjTEe/dLLVLy7H1WelPzwF/gN9KwRGSa9 oFs2PWq45c9yBtmGS6R7ImVzHVv2E0Jp0aiBCnUXBnyLvWNjpvF1HnaLx5XBPDchy8OM 38Y8UMlu0EUv+/CT79JjuJAKsbw8Zi9Gpj+ehGxAasvor6B+s15QMVDoqdX07jl6DUER qmtlJyuOiuCBG1ra/+zERseXs/I/CgI2sxxWJHyG4E5vrQbzQNEzoBjRpeQoSc+n3EyW PQww== X-Gm-Message-State: AJcUukf+9kusDu98menEdwBXjdFcdcgzUz2X1+WGUraPZTgAVM/oSSbk 1dbzm9EkiriBWBOWd6qWk7EvUGnw26hMiA== X-Google-Smtp-Source: ALg8bN7YzcsqeauJbm3VzlezBPggy1QIaBH58m308BuDm0Gy0SMA0O3jgSLfYEnuMn3asqZUOemQ7w== X-Received: by 2002:a37:9141:: with SMTP id t62mr45451529qkd.171.1549291422235; Mon, 04 Feb 2019 06:43:42 -0800 (PST) Received: from redhat.com (pool-173-76-246-42.bstnma.fios.verizon.net. [173.76.246.42]) by smtp.gmail.com with ESMTPSA id z207sm14086700qka.57.2019.02.04.06.43.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Feb 2019 06:43:41 -0800 (PST) Date: Mon, 4 Feb 2019 09:43:40 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20190204142638.27021-12-mst@redhat.com> References: <20190204142638.27021-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190204142638.27021-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.222.169 Subject: [Qemu-devel] [PULL 11/25] intel_iommu: fix operator in vtd_switch_address_space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Jason Wang , Peter Xu , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu When calculating use_iommu, we wanted to first detect whether DMAR is enabled, then check whether PT is enabled if DMAR is enabled. However in the current code we used "&" rather than "&&" so the ordering requirement is lost (instead it'll be an "AND" operation). This could introduce errors dumped in QEMU console when rebooting a guest with both assigned device and vIOMMU, like: qemu-system-x86_64: vtd_dev_to_context_entry: invalid root entry: rsvd=0xf000ff53f000e2c3, val=0xf000ff53f000ff53 (reserved nonzero) Acked-by: Jason Wang Signed-off-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 8b72735650..6d5cc1d039 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1153,7 +1153,7 @@ static bool vtd_switch_address_space(VTDAddressSpace *as) assert(as); - use_iommu = as->iommu_state->dmar_enabled & !vtd_dev_pt_enabled(as); + use_iommu = as->iommu_state->dmar_enabled && !vtd_dev_pt_enabled(as); trace_vtd_switch_address_space(pci_bus_num(as->bus), VTD_PCI_SLOT(as->devfn),