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=DKIM_INVALID,DKIM_SIGNED, 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 757A8C4332B for ; Wed, 18 Mar 2020 20:55:08 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4C09921473 for ; Wed, 18 Mar 2020 20:55:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="q7u/Qirp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C09921473 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2BF3786D03; Wed, 18 Mar 2020 20:55:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nGMe3li5S+Nr; Wed, 18 Mar 2020 20:55:07 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 5572586B9E; Wed, 18 Mar 2020 20:55:07 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 50AEAC1D7E; Wed, 18 Mar 2020 20:55:07 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 322FDC1D8F for ; Wed, 18 Mar 2020 20:55:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 15CF786C5C for ; Wed, 18 Mar 2020 20:55:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id scLEE6z3cEgS for ; Wed, 18 Mar 2020 20:55:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by whitealder.osuosl.org (Postfix) with ESMTPS id 772C086ACB for ; Wed, 18 Mar 2020 20:55:05 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 47BFB2098B; Wed, 18 Mar 2020 20:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564905; bh=XBgTFlX9YXtui+urJgbxobj6L9lBEdzNQiE1J9yXk+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7u/QirphnINASAo0xmnOL3SrLXd0rrOrbkHtahdFJp+b8ItBchgga8IW6CnP2dEe dhXKG+YRyXbkvMc0tblbWN6DzvrR31/PsoCtQFhcR23aXQZsL85BBMHJy9t1Qmg2Ii d6sW1hevZch0rTcQv9PFmu30WKEDTIFRydxoWkH0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 71/73] iommu/vt-d: Ignore devices with out-of-spec domain number Date: Wed, 18 Mar 2020 16:53:35 -0400 Message-Id: <20200318205337.16279-71-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Cc: Sasha Levin , iommu@lists.linux-foundation.org, Joerg Roedel , Daniel Drake X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" RnJvbTogRGFuaWVsIERyYWtlIDxkcmFrZUBlbmRsZXNzbS5jb20+CgpbIFVwc3RyZWFtIGNvbW1p dCBkYTcyYTM3OWIyZWMwYmFkM2ViMjY1Nzg3ZjcwMDhiZWFkMGIwNDBjIF0KClZNRCBzdWJkZXZp Y2VzIGFyZSBjcmVhdGVkIHdpdGggYSBQQ0kgZG9tYWluIElEIG9mIDB4MTAwMDAgb3IKaGlnaGVy LgoKVGhlc2Ugc3ViZGV2aWNlcyBhcmUgYWxzbyBoYW5kbGVkIGxpa2UgYWxsIG90aGVyIFBDSSBk ZXZpY2VzIGJ5CmRtYXJfcGNpX2J1c19ub3RpZmllcigpLgoKSG93ZXZlciwgd2hlbiBkbWFyX2Fs bG9jX3BjaV9ub3RpZnlfaW5mbygpIHRha2UgcmVjb3JkcyBvZiBzdWNoIGRldmljZXMsCml0IHdp bGwgdHJ1bmNhdGUgdGhlIGRvbWFpbiBJRCB0byBhIHUxNiB2YWx1ZSAoaW4gaW5mby0+c2VnKS4K VGhlIGRldmljZSBhdCAoZS5nLikgMTAwMDA6MDA6MDIuMCBpcyB0aGVuIHRyZWF0ZWQgYnkgdGhl IERNQVIgY29kZSBhcyBpZgppdCBpcyAwMDAwOjAwOjAyLjAuCgpJbiB0aGUgdW5sdWNreSBldmVu dCB0aGF0IGEgcmVhbCBkZXZpY2UgYWxzbyBleGlzdHMgYXQgMDAwMDowMDowMi4wIGFuZAphbHNv IGhhcyBhIGRldmljZS1zcGVjaWZpYyBlbnRyeSBpbiB0aGUgRE1BUiB0YWJsZSwKZG1hcl9pbnNl cnRfZGV2X3Njb3BlKCkgd2lsbCBjcmFzaCBvbjoKIMKgIEJVR19PTihpID49IGRldmljZXNfY250 KTsKClRoYXQncyBiYXNpY2FsbHkgYSBzYW5pdHkgY2hlY2sgdGhhdCBvbmx5IG9uZSBQQ0kgZGV2 aWNlIG1hdGNoZXMgYQpzaW5nbGUgRE1BUiBlbnRyeTsgaW4gdGhpcyBjYXNlIHdlIHNlZW0gdG8g aGF2ZSB0d28gbWF0Y2hpbmcgZGV2aWNlcy4KCkZpeCB0aGlzIGJ5IGlnbm9yaW5nIGRldmljZXMg dGhhdCBoYXZlIGEgZG9tYWluIG51bWJlciBoaWdoZXIgdGhhbgp3aGF0IGNhbiBiZSBsb29rZWQg dXAgaW4gdGhlIERNQVIgdGFibGUuCgpUaGlzIHByb2JsZW0gd2FzIGNhcmVmdWxseSBkaWFnbm9z ZWQgYnkgSmlhbi1Ib25nIFBhbi4KClNpZ25lZC1vZmYtYnk6IEx1IEJhb2x1IDxiYW9sdS5sdUBs aW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBEcmFrZSA8ZHJha2VAZW5kbGVz c20uY29tPgpGaXhlczogNTljZTA1MTVjZGFmMyAoImlvbW11L3Z0LWQ6IFVwZGF0ZSBEUkhEL1JN UlIvQVRTUiBkZXZpY2Ugc2NvcGUgY2FjaGVzIHdoZW4gUENJIGhvdHBsdWcgaGFwcGVucyIpClNp Z25lZC1vZmYtYnk6IEpvZXJnIFJvZWRlbCA8anJvZWRlbEBzdXNlLmRlPgpTaWduZWQtb2ZmLWJ5 OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9pb21tdS9kbWFy LmMgfCA4ICsrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9pb21tdS9kbWFyLmMgYi9kcml2ZXJzL2lvbW11L2RtYXIuYwppbmRleCBh YTE1MTU1Yjk0MDFmLi4zNGU3MDVkM2I2YmI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2Rt YXIuYworKysgYi9kcml2ZXJzL2lvbW11L2RtYXIuYwpAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1 ZGUgPGxpbnV4L3NsYWIuaD4KICNpbmNsdWRlIDxsaW51eC9pb21tdS5oPgogI2luY2x1ZGUgPGxp bnV4L251bWEuaD4KKyNpbmNsdWRlIDxsaW51eC9saW1pdHMuaD4KICNpbmNsdWRlIDxhc20vaXJx X3JlbWFwcGluZy5oPgogI2luY2x1ZGUgPGFzbS9pb21tdV90YWJsZS5oPgogCkBAIC0xMjgsNiAr MTI5LDEzIEBAIGRtYXJfYWxsb2NfcGNpX25vdGlmeV9pbmZvKHN0cnVjdCBwY2lfZGV2ICpkZXYs IHVuc2lnbmVkIGxvbmcgZXZlbnQpCiAKIAlCVUdfT04oZGV2LT5pc192aXJ0Zm4pOwogCisJLyoK KwkgKiBJZ25vcmUgZGV2aWNlcyB0aGF0IGhhdmUgYSBkb21haW4gbnVtYmVyIGhpZ2hlciB0aGFu IHdoYXQgY2FuCisJICogYmUgbG9va2VkIHVwIGluIERNQVIsIGUuZy4gVk1EIHN1YmRldmljZXMg d2l0aCBkb21haW4gMHgxMDAwMAorCSAqLworCWlmIChwY2lfZG9tYWluX25yKGRldi0+YnVzKSA+ IFUxNl9NQVgpCisJCXJldHVybiBOVUxMOworCiAJLyogT25seSBnZW5lcmF0ZSBwYXRoW10gZm9y IGRldmljZSBhZGRpdGlvbiBldmVudCAqLwogCWlmIChldmVudCA9PSBCVVNfTk9USUZZX0FERF9E RVZJQ0UpCiAJCWZvciAodG1wID0gZGV2OyB0bXA7IHRtcCA9IHRtcC0+YnVzLT5zZWxmKQotLSAK Mi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpp b21tdSBtYWlsaW5nIGxpc3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6 Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vaW9tbXU= 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 43A9EC4332E for ; Wed, 18 Mar 2020 20:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1878F2098B for ; Wed, 18 Mar 2020 20:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564911; bh=XBgTFlX9YXtui+urJgbxobj6L9lBEdzNQiE1J9yXk+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=scE2GJlqvMc7c+LXRWAerz+2G2VOw0AniHXAiV6Fg1AQr1I8xIdngEmj8I0+xwpZD x74v+zB16ZfBV9CaNlZAfTLsJNHWdnVtE587Ro8IkWpeIhezgjbBOqNxG5YRjHsKuj h+Kw67RK9zbszNkot3bgY//2g5Bl8NThiTRdHUj0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728206AbgCRUzK (ORCPT ); Wed, 18 Mar 2020 16:55:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:55224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728189AbgCRUzF (ORCPT ); Wed, 18 Mar 2020 16:55:05 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 47BFB2098B; Wed, 18 Mar 2020 20:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564905; bh=XBgTFlX9YXtui+urJgbxobj6L9lBEdzNQiE1J9yXk+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7u/QirphnINASAo0xmnOL3SrLXd0rrOrbkHtahdFJp+b8ItBchgga8IW6CnP2dEe dhXKG+YRyXbkvMc0tblbWN6DzvrR31/PsoCtQFhcR23aXQZsL85BBMHJy9t1Qmg2Ii d6sW1hevZch0rTcQv9PFmu30WKEDTIFRydxoWkH0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Drake , Lu Baolu , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.4 71/73] iommu/vt-d: Ignore devices with out-of-spec domain number Date: Wed, 18 Mar 2020 16:53:35 -0400 Message-Id: <20200318205337.16279-71-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Drake [ Upstream commit da72a379b2ec0bad3eb265787f7008bead0b040c ] VMD subdevices are created with a PCI domain ID of 0x10000 or higher. These subdevices are also handled like all other PCI devices by dmar_pci_bus_notifier(). However, when dmar_alloc_pci_notify_info() take records of such devices, it will truncate the domain ID to a u16 value (in info->seg). The device at (e.g.) 10000:00:02.0 is then treated by the DMAR code as if it is 0000:00:02.0. In the unlucky event that a real device also exists at 0000:00:02.0 and also has a device-specific entry in the DMAR table, dmar_insert_dev_scope() will crash on:   BUG_ON(i >= devices_cnt); That's basically a sanity check that only one PCI device matches a single DMAR entry; in this case we seem to have two matching devices. Fix this by ignoring devices that have a domain number higher than what can be looked up in the DMAR table. This problem was carefully diagnosed by Jian-Hong Pan. Signed-off-by: Lu Baolu Signed-off-by: Daniel Drake Fixes: 59ce0515cdaf3 ("iommu/vt-d: Update DRHD/RMRR/ATSR device scope caches when PCI hotplug happens") Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/dmar.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index aa15155b9401f..34e705d3b6bb6 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,13 @@ dmar_alloc_pci_notify_info(struct pci_dev *dev, unsigned long event) BUG_ON(dev->is_virtfn); + /* + * Ignore devices that have a domain number higher than what can + * be looked up in DMAR, e.g. VMD subdevices with domain 0x10000 + */ + if (pci_domain_nr(dev->bus) > U16_MAX) + return NULL; + /* Only generate path[] for device addition event */ if (event == BUS_NOTIFY_ADD_DEVICE) for (tmp = dev; tmp; tmp = tmp->bus->self) -- 2.20.1