From patchwork Mon Nov 18 19:30:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Peraza X-Patchwork-Id: 844540 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B7391E5738 for ; Mon, 18 Nov 2024 19:30:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731958237; cv=none; b=ABKbdQPuCek851jl8Daa8YJaBP46LZiaxR6K2QGHuwdnBoFjf3C4MnZRZZxVLOWPOndZdLsP8kFsAK7sIeqNUpQgZ0sarb7EvYOEhLQ/DtoYMYKPe7bRRERlSz31gWqs0p6NxvfkycsVF+eCTSwLNxtTEAksTwfR783nQ2hf/BA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731958237; c=relaxed/simple; bh=S913wGvuB7JeIYgreY9ZXOD/DdRPiIb0Qi9yeUdOcbQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Q4u0dmXtZGBwPfqwt4TTh6hGc5WOQhb+7ly/8YP9VtU6AqD2Nx8pfL6KsoypHCg00yRRRuY9T+/piztCBjrTrmG3tnRHeebK8l0rS0U+uytR7C32rA0VA0ejh4tdn+HZQF3B/MnDG2iazG64vwoMVjJPD9cQIFu0797wutEt/rE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jperaza.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=GJS4Cxqs; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jperaza.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GJS4Cxqs" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ea6aa3b68bso57466807b3.3 for ; Mon, 18 Nov 2024 11:30:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731958234; x=1732563034; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2wr6P/ZNWs+UG6LNRih5t0AFP5XwPY2VvUHgua8CJ9U=; b=GJS4Cxqs1FjFxIFwOYiS6xPKhyNDSWWTdJBRt3kuhddkXWryBkxSDmnFnov0yvnYb9 FDxeZY+DFFA1DB9WOQ9asVqJG8O4BVEvLv0Vs0p2XpzO12Jcob+15xnj7rzZVEQ/c98h ZS9Rh9GqNAS3sgeV8BYtOFtM+8qg0unNDXDoCI2K7Pv/LR0MZx2zS8+DfNxtTfl4iIPh 2zSWiYkA3bdabPCDbmrf7dYxAoBJRsEHBVlW/X3r54CRaSxndjsAxFQz8lMveEl17443 szkFg0mkhgvcwE3FJBB5FePOQs2fXlNLpc5b46b4oRk/aUd4/iBwMB2MYPtn12UPGHjU FgcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731958234; x=1732563034; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2wr6P/ZNWs+UG6LNRih5t0AFP5XwPY2VvUHgua8CJ9U=; b=GHn3AL0m2LOxgZacJDHNtDZKcws4zRPzvmnCVmFJ74K8Yf9LjUFFWwbjoFHGJZSUFQ /uLsYzmvMCrUatMVJAuSZ+TZRSp8NmIdVPVYK+gxTXhIpmiHp/tpAQEGta0u+igbW0bJ 8Se01dLJcjJi5u5ORPsZZZs3PoI+dEmFyVMe42hTTQXXUXjm+NssiV/+cpMFfty4T9Wv 1JZEfpYHriC77hfE7OoWChvezcXKaQsh8i1RW/G28odxtnhMBtkmLOm2shoL0/wfMBAF 0cNNlcaIXXGcbFQOI5HsHvGzj6xAkrdh3i+m/4h8fm2x8amckw0ftNnruR/huNW2rYeo 8pmQ== X-Forwarded-Encrypted: i=1; AJvYcCXeZ+u58OloDOJwtW4fQ1iSsa3WRMP/qStV4gxOL6JHiYIZ7Ov3SuqVnXKrsbuLxhXhAfmQQ+sSBtdb@vger.kernel.org X-Gm-Message-State: AOJu0YwTcpzs+0vTHQRzngnDAOw3xY15SHb2J5qYuENGuIQNu1rnYnVa KIFVcUdt6xGo2umFz1CZLm30dLb0yU8TMTMsfJsFU3i6apRPAEn6jalmTFSy/WtTGCPB+xdS46y uiJyAkw== X-Google-Smtp-Source: AGHT+IHknQT/NkDmOr9j/PNk7G5Hvs0xMYQ4OkavikoXUQVZD+pjo7ZhfWwBfTDW00t0BAqaLLAnRDiIMb+G X-Received: from jperaza.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f86]) (user=jperaza job=sendgmr) by 2002:a05:690c:3081:b0:6ee:8453:f427 with SMTP id 00721157ae682-6ee8453f5b5mr551517b3.7.1731958234567; Mon, 18 Nov 2024 11:30:34 -0800 (PST) Date: Mon, 18 Nov 2024 19:30:23 +0000 In-Reply-To: <20241118193024.2695876-1-jperaza@google.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241118193024.2695876-1-jperaza@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241118193024.2695876-2-jperaza@google.com> Subject: [PATCH 1/2] PCI/ACPI: Support Microsoft's "DmaProperty" From: Joshua Peraza To: gregkh@linuxfoundation.org Cc: baolu.lu@linux.intel.com, bhelgaas@google.com, dtor@google.com, dwmw2@infradead.org, helgaas@kernel.org, iommu@lists.linux-foundation.org, jean-philippe@linaro.org, joro@8bytes.org, jperaza@google.com, jsbarnes@google.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, mika.westerberg@linux.intel.com, oohall@gmail.com, pavel@denx.de, rafael.j.wysocki@intel.com, rafael@kernel.org, rajatja@google.com, rajatxjain@gmail.com, will@kernel.org From: Rajat Jain The "DmaProperty" is supported and currently documented and used by Microsoft [link 1 below], to flag internal PCIe root ports that need DMA protection [link 2 below]. We have discussed with them and reached a common understanding that they shall change their MSDN documentation to say that the same property can be used to protect any PCI device, and not just internal PCIe root ports (since there is no point introducing yet another property for arbitrary PCI devices). This helps with security from internal devices that offer an attack surface for DMA attacks (e.g. internal network devices). Support DmaProperty to mark DMA from a PCI device as untrusted. Link: [1] https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports#identifying-internal-pcie-ports-accessible-to-users-and-requiring-dma-protection Link: [2] https://docs.microsoft.com/en-us/windows/security/information-protection/kernel-dma-protection-for-thunderbolt Signed-off-by: Rajat Jain Reviewed-by: Mika Westerberg Acked-by: Rafael J. Wysocki Signed-off-by: Joshua Peraza --- drivers/acpi/property.c | 3 +++ drivers/pci/pci-acpi.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 80a52a4e66dd..139e042ad2cb 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -56,6 +56,9 @@ static const guid_t prp_guids[] = { /* Storage device needs D3 GUID: 5025030f-842f-4ab4-a561-99a5189762d0 */ GUID_INIT(0x5025030f, 0x842f, 0x4ab4, 0xa5, 0x61, 0x99, 0xa5, 0x18, 0x97, 0x62, 0xd0), + /* DmaProperty for PCI devices GUID: 70d24161-6dd5-4c9e-8070-705531292865 */ + GUID_INIT(0x70d24161, 0x6dd5, 0x4c9e, + 0x80, 0x70, 0x70, 0x55, 0x31, 0x29, 0x28, 0x65), }; /* ACPI _DSD data subnodes GUID [1]: dbb8e3e6-5886-4ba6-8795-1319f52a966b */ diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index af370628e583..a457ae3e811a 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -1438,12 +1438,34 @@ static void pci_acpi_set_external_facing(struct pci_dev *dev) dev->external_facing = 1; } +static int pci_dev_has_dma_property(struct pci_dev *dev) +{ + struct acpi_device *adev; + const union acpi_object *obj; + + adev = ACPI_COMPANION(&dev->dev); + if (!adev) + return 0; + + /* + * Property used by Microsoft Windows to enforce IOMMU DMA + * protection from any device, that the system may not fully trust; + * we'll honour it the same way. + */ + if (!acpi_dev_get_property(adev, "DmaProperty", ACPI_TYPE_INTEGER, + &obj) && obj->integer.value == 1) + return 1; + + return 0; +} + void pci_acpi_setup(struct device *dev, struct acpi_device *adev) { struct pci_dev *pci_dev = to_pci_dev(dev); pci_acpi_optimize_delay(pci_dev, adev->handle); pci_acpi_set_external_facing(pci_dev); + pci_dev->untrusted |= pci_dev_has_dma_property(pci_dev); pci_acpi_add_edr_notifier(pci_dev); pci_acpi_add_pm_notifier(adev, pci_dev); From patchwork Mon Nov 18 19:30:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Peraza X-Patchwork-Id: 844157 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 064E21E5718 for ; Mon, 18 Nov 2024 19:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731958242; cv=none; b=h2W/7PU1pzqfuOT/VmRGWn6yYlZeSm5mxUkl5rqumPoBk7/7KZjeIFPLhJeLH0nfDTxEA6Efo9x3wdLKWwqUSqzg/ioM1+FwEELhbx+FatIkFmFmtOlaZ14b1rcw5sKuDeNg/auYv661FI/Y3WpZkCFMPKCOZPFAGhh8pY5KyZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731958242; c=relaxed/simple; bh=td9vYL42XQudNEN+8jFo86Viz34b4OIqizRZCdCexg4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Th+33DOs+MxrUMCIefpS0QooYeSYu/mZa18F0l+gaxpKL06EB6f6VyU3DQ6lYVegRZA48TL5gkYLhJQxyVl5PVWEgzZgarXf/smjdA2DK/RpcLf3jBmK1/DTfpEe4Edvk7g80PmqbFv8ifdmSd+8bSvONxsJN67gvQC/5+nUlts= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jperaza.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lLsxmTu2; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jperaza.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lLsxmTu2" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e387e8e8426so2967361276.1 for ; Mon, 18 Nov 2024 11:30:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731958239; x=1732563039; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=b+pvl25Ke4atXFJeCOh6KmNiscogjhJJHhnkl2/5XRs=; b=lLsxmTu2nLMwg1E/8KIbhe4nLuKqkNnkQnaXCUFByXN1tFF4g3qQ0brtR+tvlA5FSn LarZ8yHZY1bmq1onXrqmcTRYVVu7HGlcE/v57u9Z9MQO1yxqIFYLDy2ii0453/6GP2/G Nagg8h8/zBZdoqnhWhbvAfPv3qAb0FcsmuGmXp1EvqAj5FfzJZfyv4RDtUmPEMYf4oJk MawLbtoLFv559xDaTwTEQhpd7sm2IdtGRSDDj9kyNs9jlMyt3dcFHdje4ZNrnxxdebjF JAIGVEKTEbpVGRouCoRLHEgLcifRJxc7e46U9Nqbeqa2tb0p5AGnP5DwkKr6KBuZ0kIf p9aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731958239; x=1732563039; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b+pvl25Ke4atXFJeCOh6KmNiscogjhJJHhnkl2/5XRs=; b=RPY7/Sjpc1dmBbEdB6LjaZIaCZKv3Dt4BdvVELWORCqlW5XlsaAK1+LrXgyvxwkH/V 3t61U/wWZm7AOnebK0MNBDmt4b0zAEVM+/RhZrRN8FjMnyBS4ZSncMtpTgCoigkNORuE jFz3UjFYK09vfrsQg5yj3BX2nN1czD+k0/Ha7DFR6x4yCKAeQ8ZgCsQdfXSmlTl6YY7c NNVufLEfWhPnMuWGSspSMEQZBIsHwDqeFwssFzdvNaKHz4mOGNjDZk19huZoNFWzzHf/ ddrgomhx0r4Xhn/Ey61SssUepeu8S7GDm/iK340REc6pBLbF5Pfbr11djWKhsgxR+zVs Iv7A== X-Forwarded-Encrypted: i=1; AJvYcCVU6xf0zN9bQ119iwmWLRSqNdyt6udkg3/s7Y7GXpRyhmIyLVQuvTffJ40YxzH9u/VhtWVixTlrDAk5@vger.kernel.org X-Gm-Message-State: AOJu0YxUy+HWFkA7DsedfATUJHEpo9tiwHCKEXdviYO+U2q7fIccD8I6 rgLwwblw/ghmE7k9USo9Zan934VaD2TgbuJyPHnWYqmN3RJsuJc4EKEMgohiBrZjexS+JEQBOF8 c9UiFoA== X-Google-Smtp-Source: AGHT+IFybVuddM7p6vumMyd0W6qcjGgrhUDr1SZrFs3g1fT5Rf71/ZN2YHRL0nsAQtGNq9I3XiUcY8Ti4Pxs X-Received: from jperaza.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f86]) (user=jperaza job=sendgmr) by 2002:a25:c5d3:0:b0:e30:b89f:e3d with SMTP id 3f1490d57ef6-e38b76f605emr10686276.1.1731958238885; Mon, 18 Nov 2024 11:30:38 -0800 (PST) Date: Mon, 18 Nov 2024 19:30:24 +0000 In-Reply-To: <20241118193024.2695876-1-jperaza@google.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241118193024.2695876-1-jperaza@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241118193024.2695876-3-jperaza@google.com> Subject: [PATCH 2/2] PCI: Rename pci_dev->untrusted to pci_dev->requires_dma_protection From: Joshua Peraza To: gregkh@linuxfoundation.org Cc: baolu.lu@linux.intel.com, bhelgaas@google.com, dtor@google.com, dwmw2@infradead.org, helgaas@kernel.org, iommu@lists.linux-foundation.org, jean-philippe@linaro.org, joro@8bytes.org, jperaza@google.com, jsbarnes@google.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, mika.westerberg@linux.intel.com, oohall@gmail.com, pavel@denx.de, rafael.j.wysocki@intel.com, rafael@kernel.org, rajatja@google.com, rajatxjain@gmail.com, will@kernel.org From: Rajat Jain Rename the field to make it more clear, that the device can execute DMA attacks on the system, and thus the system may need protection from such attacks from this device. No functional change intended. Signed-off-by: Rajat Jain Reviewed-by: Mika Westerberg Reviewed-by: Lu Baolu Acked-by: Rafael J. Wysocki Signed-off-by: Joshua Peraza --- drivers/iommu/amd/iommu.c | 3 +-- drivers/iommu/dma-iommu.c | 16 ++++++++-------- drivers/iommu/intel/iommu.c | 10 +++++----- drivers/iommu/iommu.c | 5 ++--- drivers/pci/ats.c | 2 +- drivers/pci/pci-acpi.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/probe.c | 8 ++++---- drivers/pci/quirks.c | 4 ++-- include/linux/pci.h | 7 ++++--- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 8364cd6fa47d..6bf4944834b2 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2776,8 +2776,7 @@ static int amd_iommu_def_domain_type(struct device *dev) if (!dev_data) return 0; - /* Always use DMA domain for untrusted device */ - if (dev_is_pci(dev) && to_pci_dev(dev)->untrusted) + if (dev_is_pci(dev) && to_pci_dev(dev)->requires_dma_protection) return IOMMU_DOMAIN_DMA; /* diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 2a9fa0c8cc00..1358f98691ab 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -598,16 +598,16 @@ static int iova_reserve_iommu_regions(struct device *dev, return ret; } -static bool dev_is_untrusted(struct device *dev) +static bool dev_requires_dma_protection(struct device *dev) { - return dev_is_pci(dev) && to_pci_dev(dev)->untrusted; + return dev_is_pci(dev) && to_pci_dev(dev)->requires_dma_protection; } static bool dev_use_swiotlb(struct device *dev, size_t size, enum dma_data_direction dir) { return IS_ENABLED(CONFIG_SWIOTLB) && - (dev_is_untrusted(dev) || + (dev_requires_dma_protection(dev) || dma_kmalloc_needs_bounce(dev, size, dir)); } @@ -620,7 +620,7 @@ static bool dev_use_sg_swiotlb(struct device *dev, struct scatterlist *sg, if (!IS_ENABLED(CONFIG_SWIOTLB)) return false; - if (dev_is_untrusted(dev)) + if (dev_requires_dma_protection(dev)) return true; /* @@ -1192,12 +1192,12 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, return DMA_MAPPING_ERROR; /* - * Untrusted devices should not see padding areas with random - * leftover kernel data, so zero the pre- and post-padding. + * Zero the pre- and post-padding to prevent exposing kernel data to devices + * requiring DMA protection. * swiotlb_tbl_map_single() has initialized the bounce buffer * proper to the contents of the original memory buffer. */ - if (dev_is_untrusted(dev)) { + if (dev_requires_dma_protection(dev)) { size_t start, virt = (size_t)phys_to_virt(phys); /* Pre-padding */ @@ -1738,7 +1738,7 @@ size_t iommu_dma_opt_mapping_size(void) size_t iommu_dma_max_mapping_size(struct device *dev) { - if (dev_is_untrusted(dev)) + if (dev_requires_dma_protection(dev)) return swiotlb_max_mapping_size(dev); return SIZE_MAX; diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index e860bc9439a2..bcf907604c28 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3134,7 +3134,7 @@ static int __init platform_optin_force_iommu(void) /* * If Intel-IOMMU is disabled by default, we will apply identity - * map for all devices except those marked as being untrusted. + * map for all devices except those marked as requiring DMA protection. */ if (dmar_disabled) iommu_set_default_passthrough(false); @@ -4228,13 +4228,13 @@ static bool intel_iommu_is_attach_deferred(struct device *dev) } /* - * 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. + * Check that the device does not require DMA protection. 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) { + if (pdev->requires_dma_protection) { pci_info(pdev, "Skipping IOMMU quirk for dev [%04X:%04X] on untrusted PCI link\n", pdev->vendor, pdev->device); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 83c8e617a2c5..0165f1d232b9 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1745,10 +1745,9 @@ static int iommu_get_default_domain_type(struct iommu_group *group, driver_type = iommu_get_def_domain_type(group, gdev->dev, driver_type); - if (dev_is_pci(gdev->dev) && to_pci_dev(gdev->dev)->untrusted) { + if (dev_is_pci(gdev->dev) && to_pci_dev(gdev->dev)->requires_dma_protection) { /* - * No ARM32 using systems will set untrusted, it cannot - * work. + * ARM32 systems don't support DMA protection. */ if (WARN_ON(IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU))) return -1; diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index 6afff1f1b143..05aab7c74491 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -43,7 +43,7 @@ bool pci_ats_supported(struct pci_dev *dev) if (!dev->ats_cap) return false; - return (dev->untrusted == 0); + return (dev->requires_dma_protection == 0); } EXPORT_SYMBOL_GPL(pci_ats_supported); diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index a457ae3e811a..1713e2856a88 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -1465,7 +1465,7 @@ void pci_acpi_setup(struct device *dev, struct acpi_device *adev) pci_acpi_optimize_delay(pci_dev, adev->handle); pci_acpi_set_external_facing(pci_dev); - pci_dev->untrusted |= pci_dev_has_dma_property(pci_dev); + pci_dev->requires_dma_protection |= pci_dev_has_dma_property(pci_dev); pci_acpi_add_edr_notifier(pci_dev); pci_acpi_add_pm_notifier(adev, pci_dev); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 225a6cd2e9ca..761bc845a7f2 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1056,7 +1056,7 @@ static void pci_std_enable_acs(struct pci_dev *dev, struct pci_acs *caps) caps->ctrl |= (caps->cap & PCI_ACS_UF); /* Enable Translation Blocking for external devices and noats */ - if (pci_ats_disabled() || dev->external_facing || dev->untrusted) + if (pci_ats_disabled() || dev->external_facing || dev->requires_dma_protection) caps->ctrl |= (caps->cap & PCI_ACS_TB); } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f1615805f5b0..7589a524c9b8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1631,7 +1631,7 @@ static void set_pcie_thunderbolt(struct pci_dev *dev) dev->is_thunderbolt = 1; } -static void set_pcie_untrusted(struct pci_dev *dev) +static void pci_set_requires_dma_protection(struct pci_dev *dev) { struct pci_dev *parent; @@ -1640,8 +1640,8 @@ static void set_pcie_untrusted(struct pci_dev *dev) * untrusted as well. */ parent = pci_upstream_bridge(dev); - if (parent && (parent->untrusted || parent->external_facing)) - dev->untrusted = true; + if (parent && (parent->requires_dma_protection || parent->external_facing)) + dev->requires_dma_protection = true; } static void pci_set_removable(struct pci_dev *dev) @@ -1945,7 +1945,7 @@ int pci_setup_device(struct pci_dev *dev) /* Need to have dev->cfg_size ready */ set_pcie_thunderbolt(dev); - set_pcie_untrusted(dev); + pci_set_requires_dma_protection(dev); /* "Unknown power state" */ dev->current_state = PCI_UNKNOWN; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index dccb60c1d9cc..cc2f4792e03b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5296,7 +5296,7 @@ static void pci_quirk_enable_intel_rp_mpc_acs(struct pci_dev *dev) * PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF * * TODO: This quirk also needs to do equivalent of PCI_ACS_TB, - * if dev->external_facing || dev->untrusted + * if dev->external_facing || dev->requires_dma_protection */ static int pci_quirk_enable_intel_pch_acs(struct pci_dev *dev) { @@ -5337,7 +5337,7 @@ static int pci_quirk_enable_intel_spt_pch_acs(struct pci_dev *dev) ctrl |= (cap & PCI_ACS_CR); ctrl |= (cap & PCI_ACS_UF); - if (pci_ats_disabled() || dev->external_facing || dev->untrusted) + if (pci_ats_disabled() || dev->external_facing || dev->requires_dma_protection) ctrl |= (cap & PCI_ACS_TB); pci_write_config_dword(dev, pos + INTEL_SPT_ACS_CTRL, ctrl); diff --git a/include/linux/pci.h b/include/linux/pci.h index 573b4c4c2be6..b883539cfd88 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -444,13 +444,14 @@ struct pci_dev { unsigned int shpc_managed:1; /* SHPC owned by shpchp */ unsigned int is_thunderbolt:1; /* Thunderbolt controller */ /* - * Devices marked being untrusted are the ones that can potentially - * execute DMA attacks and similar. They are typically connected + * Devices marked with requires_dma_protection are the ones that can + * potentially execute DMA attacks and similar. They are typically connected * through external ports such as Thunderbolt but not limited to * that. When an IOMMU is enabled they should be getting full * mappings to make sure they cannot access arbitrary memory. */ - unsigned int untrusted:1; + unsigned int requires_dma_protection:1; + /* * Info from the platform, e.g., ACPI or device tree, may mark a * device as "external-facing". An external-facing device is