Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp73573ybg; Tue, 2 Jun 2020 16:54:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZcsCAmoCVa/XU2SE5oo/dO0InTStgAjsGLsAfHlNHUb0B/jCoV9QfNq+w+hL662Y+w4Q0 X-Received: by 2002:a50:f0c4:: with SMTP id a4mr7437467edm.125.1591142054365; Tue, 02 Jun 2020 16:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591142054; cv=none; d=google.com; s=arc-20160816; b=lExy1wdTxpVHymiu+Ni6NLj3FiGAvVd7hTLq1/alBHTdUxDffevVrpN21cXHCEsWDR YcdR4HQEjUFf+lFFQFG9vOmTeztqQ9GlICD93SwHm4uuCPqBZgydliuPJ/fZpVtgZRgq RtIuCiZNI/oMw57hk8sYmCgY4NRuj1Q4TIFSw2kmIQuyPuBallB4cDc9VXmQkkqRRxdK Q7Yt/ZO7/QDxL9evOl3/GMhst31SQ+t5c2k5mx9lqDqI8zGwTPtSFmyacRE2utucTixF 2z+VJSpxKB7uG88DgSP17B2qu/Mkd3C79X3RhIb3J8vzep5bsR5bLUwLeoendE5C9Tli fkdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=yVZeRlHhmAp/EMedhM3eoU5f2SVcU2Jx7IPSMK+7jJA=; b=yTXROmrw7Eoutvr3wW84tkwi+NfFvth4YxJ/Ak8/Bwz1MNbVR1TweGDwyB4Moatc8c smi65kwddpjC2zzVLHgqYwYdkTYDeMvLISLExk+6VPgRsSM5gqPubae/z4V/PI5wyRKq +h4zwZRxfgS0GYvDnJdC7MStFBqiP56yYQL6mssGzAkRByZCf2IjvE61vTXJRfxTlnMS UkLsD3N2fBezBfkC8J12rzHHuHSw04bO6OhaLaL+iBdAjlMhg/T2/HgE5K6iwAzosGj8 80Alwn6W2WKp1JVsE5yrIdaGBcsFqHqcPxAXiYHK5DQ/pgSgaknk3Uq7PyNWHhWABSAA 7J8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=E0d2Vlsq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si140864edp.280.2020.06.02.16.53.41; Tue, 02 Jun 2020 16:54:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=E0d2Vlsq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727795AbgFBXtV (ORCPT + 99 others); Tue, 2 Jun 2020 19:49:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726589AbgFBXtU (ORCPT ); Tue, 2 Jun 2020 19:49:20 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5E9FC08C5C0 for ; Tue, 2 Jun 2020 16:49:20 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id g5so268571pfm.10 for ; Tue, 02 Jun 2020 16:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yVZeRlHhmAp/EMedhM3eoU5f2SVcU2Jx7IPSMK+7jJA=; b=E0d2VlsqPj91lO5CAD8WZ5itr9frJvtu8iuXkw+qeXzjXC4Uip1vmXF8oIE1I7Ca1o nLnMIdg/5ZCKqU7lKZatNBkCKQGp60QG+BjHdhq5P9nAYAe/BwYvIT4s+2hf33fbtaoV AIJ/rWolSjpPsy1jTpCDrfDl5YKIGGgJbCrlTbKuDeK1rByox2oTrtEs2PSQOaGTTv9H aEHjiE2Pq+23Wn48sELeokRlGixHU8DwSOmOEOYxqZ0tK1C7/qos/NvYDJr9luTBISav B1ACivJy1WwLPQb/z4fxEr6civ6H5q1ub1cNpfSastZNT2OOzT2q14oDz6HEx9WhmgzB UW1A== 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=yVZeRlHhmAp/EMedhM3eoU5f2SVcU2Jx7IPSMK+7jJA=; b=PCCoYe4eqYVeEOIiEfgytK4jS9xqYehKUmWSxwf3oUJxYVQzMzh7IgtcKCVI7MlQU9 cUhEcqGeIu4H3pUGGmt8/RYsox4OBBZKNV+tMR5rEoPkJ65kBo6HTNqKe+qwbP+nm3Zc Rwt9MsAeAA9929JHTki7VVBOsRCsHiEbnN279KqbTGhZyNGy650ltzCdrge5UQLNQqXt 7+eSy+t6QyyZ2ZFTBStFPKdS3srgWYgu2jR862yh7F/L4aVGr2QvIsv44PE8U/N69el4 eHOFr5egSTXzItCxp+fAtjYwDn0bpD6HsSnJtsIoNeA1nBHPQH899W0SwxB00AEMl1Zd pCPg== X-Gm-Message-State: AOAM531R9avVFxttqFW2Nw+jpQiFly8OAGcaJXudf9Xfp/RAHYo8czH9 5RT/JNZ39XdljP4GWwfyQqqloHqPn54= X-Received: by 2002:a17:90a:17e6:: with SMTP id q93mr1755037pja.133.1591141759693; Tue, 02 Jun 2020 16:49:19 -0700 (PDT) Received: from google.com ([2620:15c:202:201:476b:691:abc3:38db]) by smtp.gmail.com with ESMTPSA id k7sm94000pga.87.2020.06.02.16.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 16:49:18 -0700 (PDT) Date: Tue, 2 Jun 2020 16:49:12 -0700 From: Prashant Malani To: Rajat Jain Cc: David Woodhouse , Lu Baolu , Joerg Roedel , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Mika Westerberg , Ashok Raj , lalithambika.krishnakumar@intel.com, rajatxjain@gmail.com, bleung@google.com, levinale@google.com, zsm@google.com, mnissler@google.com, tbroch@google.com Subject: Re: [PATCH v3] iommu/vt-d: Don't apply gfx quirks to untrusted devices Message-ID: <20200602234912.GB109930@google.com> References: <20200602232602.156049-1-rajatja@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200602232602.156049-1-rajatja@google.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rajat, On Tue, Jun 02, 2020 at 04:26:02PM -0700, Rajat Jain wrote: > Currently, an external malicious PCI device can masquerade the VID:PID > of faulty gfx devices, and thus apply iommu quirks to effectively > disable the IOMMU restrictions for itself. > > Thus we need to ensure that the device we are applying quirks to, is > indeed an internal trusted device. > > Signed-off-by: Rajat Jain > Acked-by: Lu Baolu > --- > v3: - Separate out the warning mesage in a function to be called from > other places. Change the warning string as suggested. > v2: - Change the warning print strings. > - Add Lu Baolu's acknowledgement. > > drivers/iommu/intel-iommu.c | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index ef0a5246700e5..dc859f02985a0 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -6185,6 +6185,23 @@ intel_iommu_domain_set_attr(struct iommu_domain *domain, > return ret; > } > > +/* > + * Check that the device does not live on an external facing PCI port that is > + * marked as untrusted. Such devices should not be able to apply quirks and > + * thus not be able to bypass the IOMMU restrictions. > + */ > +static bool risky_device(struct pci_dev *pdev) > +{ > + if (pdev->untrusted) { > + pci_warn(pdev, > + "Skipping IOMMU quirk for dev (%04X:%04X) on untrusted" > + " PCI link. Please check with your BIOS/Platform" > + " vendor about this\n", pdev->vendor, pdev->device); > + return true; > + } > + return false; minor suggestion: Perhaps you could use a guard clause here? It would save you a level of indentation, and possibly allow better string splitting (e.g keeping "untrusted PCI" together). So something like: if (!pdev->untrusted) return false; pci_warn(...); I also hear the column limit warning is now for 100 chars [1], though I'm not sure how it's being handled in this file. Best regards, -Prashant [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/Documentation/process/coding-style.rst?id=bdc48fa11e46f867ea4d75fa59ee87a7f48be144 > +} > + > const struct iommu_ops intel_iommu_ops = { > .capable = intel_iommu_capable, > .domain_alloc = intel_iommu_domain_alloc, > @@ -6214,6 +6231,9 @@ const struct iommu_ops intel_iommu_ops = { > > static void quirk_iommu_igfx(struct pci_dev *dev) > { > + if (risky_device(dev)) > + return; > + > pci_info(dev, "Disabling IOMMU for graphics on this chipset\n"); > dmar_map_gfx = 0; > } > @@ -6255,6 +6275,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx); > > static void quirk_iommu_rwbf(struct pci_dev *dev) > { > + if (risky_device(dev)) > + return; > + > /* > * Mobile 4 Series Chipset neglects to set RWBF capability, > * but needs it. Same seems to hold for the desktop versions. > @@ -6285,6 +6308,9 @@ static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev) > { > unsigned short ggc; > > + if (risky_device(dev)) > + return; > + > if (pci_read_config_word(dev, GGC, &ggc)) > return; > > @@ -6318,6 +6344,12 @@ static void __init check_tylersburg_isoch(void) > pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x3a3e, NULL); > if (!pdev) > return; > + > + if (risky_device(pdev)) { > + pci_dev_put(pdev); > + return; > + } > + > pci_dev_put(pdev); > > /* System Management Registers. Might be hidden, in which case > @@ -6327,6 +6359,11 @@ static void __init check_tylersburg_isoch(void) > if (!pdev) > return; > > + if (risky_device(pdev)) { > + pci_dev_put(pdev); > + return; > + } > + > if (pci_read_config_dword(pdev, 0x188, &vtisochctrl)) { > pci_dev_put(pdev); > return; > -- > 2.27.0.rc2.251.g90737beb825-goog >