From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E6F7C49ED7 for ; Mon, 16 Sep 2019 08:01:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E649A206C2 for ; Mon, 16 Sep 2019 08:01:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E649A206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9lwt-0007Vz-HT for qemu-devel@archiver.kernel.org; Mon, 16 Sep 2019 04:01:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54429) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9luW-0005t5-Kx for qemu-devel@nongnu.org; Mon, 16 Sep 2019 03:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9luV-00067h-6b for qemu-devel@nongnu.org; Mon, 16 Sep 2019 03:59:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9luU-00067J-Th for qemu-devel@nongnu.org; Mon, 16 Sep 2019 03:58:59 -0400 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 234A15859E for ; Mon, 16 Sep 2019 07:58:58 +0000 (UTC) Received: by mail-pl1-f200.google.com with SMTP id w5so12393806pll.0 for ; Mon, 16 Sep 2019 00:58:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EXTPHZvxdYPl0NvqchbK5dciGXGNCV49fqEARsUfqC4=; b=KJ6bYIo9K7Jyw2r5AgWmxP8UDxHrPOOaLf2zbkMzpfPUuVmhq4Kqe0K9b1RXdZExwJ LcRhvzZjv0KUMk4G7Q3XWqXqjxWIY5YFa/HdUDxleVYzKLL22Cwq725A+7Q1y3Z52dDR SuuIeAADW9aCB1GyvZIeHOXQkRjJ3bfAMhXGsW1H8SrOW/38wYVWdy/PcP6iEJTj4ZXn uWfcry9Wk38sw240BDvJsp/rbECvlq4Jv4YpQcHhJppmOu8lbIFUXcFY1jHb6Bnu21gp mYJZbsCvAXV7BvizRA5bVYMlVbagfGkUET0OZ0fFjT2/iN9bk43piZrbL4r122xfUYqM K5Mg== X-Gm-Message-State: APjAAAUSGX5u/9aq1t7dh/XJLgf2kActiNU0A1sfgRN9ey6F9DK84GdC 9bNfkqvntZ9rAMVM97hD/Cy66VAslu6NqvJtHCdn+BmXPAWc7Sy80Y4FDgSqJOJeKgZVq9DUfkB Iw7ecw7Z1YQwONp4= X-Received: by 2002:a17:90a:cd01:: with SMTP id d1mr9538492pju.99.1568620737057; Mon, 16 Sep 2019 00:58:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJBjDbjGMgEAffq5IacvFLJeamX9sicfwtcV2al0NAyeiwKznCCb1Zq7CEJkTJnl6h5xkN/A== X-Received: by 2002:a17:90a:cd01:: with SMTP id d1mr9538472pju.99.1568620736844; Mon, 16 Sep 2019 00:58:56 -0700 (PDT) Received: from xz-x1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p20sm50321443pgi.81.2019.09.16.00.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 00:58:56 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 15:58:36 +0800 Message-Id: <20190916075839.390-2-peterx@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190916075839.390-1-peterx@redhat.com> References: <20190916075839.390-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/4] intel_iommu: Sanity check vfio-pci config on machine init done X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Alex Williamson , peterx@redhat.com, Bandan Das , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This check was previously only happened when the IOMMU is enabled in the guest. It was always too late because the enabling of IOMMU normally only happens during the boot of guest OS. It means that we can bail out and exit directly during the guest OS boots if the configuration of devices are not supported. Or, if the guest didn't enable vIOMMU at all, then the user can use the guest normally but as long as it reconfigure the guest OS to enable the vIOMMU then reboot, the user will see the panic right after the reset when the next boot starts. Let's make this failure even earlier so that we force the user to use caching-mode for vfio-pci devices when with the vIOMMU. So the user won't get surprise at least during execution of the guest, which seems a bit nicer. This will affect some user who didn't enable vIOMMU in the guest OS but was using vfio-pci and the vtd device in the past. However I hope it's not a majority because not enabling vIOMMU with the device attached is actually meaningless. We still keep the old assertion for safety so far because the hotplug path could still reach it, so far. Signed-off-by: Peter Xu --- hw/i386/intel_iommu.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 75ca6f9c70..17fc309b3d 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -64,6 +64,13 @@ static void vtd_address_space_refresh_all(IntelIOMMUState *s); static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *= n); =20 +static void vtd_panic_require_caching_mode(void) +{ + error_report("We need to set caching-mode=3Don for intel-iommu to en= able " + "device assignment with IOMMU protection."); + exit(1); +} + static void vtd_define_quad(IntelIOMMUState *s, hwaddr addr, uint64_t va= l, uint64_t wmask, uint64_t w1cmask) { @@ -2929,9 +2936,7 @@ static void vtd_iommu_notify_flag_changed(IOMMUMemo= ryRegion *iommu, IntelIOMMUState *s =3D vtd_as->iommu_state; =20 if (!s->caching_mode && new & IOMMU_NOTIFIER_MAP) { - error_report("We need to set caching-mode=3Don for intel-iommu t= o enable " - "device assignment with IOMMU protection."); - exit(1); + vtd_panic_require_caching_mode(); } =20 /* Update per-address-space notifier flags */ @@ -3699,6 +3704,32 @@ static bool vtd_decide_config(IntelIOMMUState *s, = Error **errp) return true; } =20 +static int vtd_machine_done_notify_one(Object *child, void *unused) +{ + IntelIOMMUState *iommu =3D INTEL_IOMMU_DEVICE(x86_iommu_get_default(= )); + + /* + * We hard-coded here because vfio-pci is the only special case + * here. Let's be more elegant in the future when we can, but so + * far there seems to be no better way. + */ + if (object_dynamic_cast(child, "vfio-pci") && !iommu->caching_mode) = { + vtd_panic_require_caching_mode(); + } + + return 0; +} + +static void vtd_machine_done_hook(Notifier *notifier, void *unused) +{ + object_child_foreach_recursive(object_get_root(), + vtd_machine_done_notify_one, NULL); +} + +static Notifier vtd_machine_done_notify =3D { + .notify =3D vtd_machine_done_hook, +}; + static void vtd_realize(DeviceState *dev, Error **errp) { MachineState *ms =3D MACHINE(qdev_get_machine()); @@ -3744,6 +3775,7 @@ static void vtd_realize(DeviceState *dev, Error **e= rrp) pci_setup_iommu(bus, vtd_host_dma_iommu, dev); /* Pseudo address space under root PCI bus. */ pcms->ioapic_as =3D vtd_host_dma_iommu(bus, s, Q35_PSEUDO_DEVFN_IOAP= IC); + qemu_add_machine_init_done_notifier(&vtd_machine_done_notify); } =20 static void vtd_class_init(ObjectClass *klass, void *data) --=20 2.21.0