Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2226860pxb; Fri, 25 Mar 2022 13:25:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLV6vU7DrwgKxrRSJhocVjt3mKxg7XkNT9Q2ljs8k2ZIQ/M/KbqN+RLtO2Q86AQ5Rh9j4T X-Received: by 2002:a17:902:8543:b0:154:9588:52ab with SMTP id d3-20020a170902854300b00154958852abmr13916949plo.50.1648239952980; Fri, 25 Mar 2022 13:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648239952; cv=none; d=google.com; s=arc-20160816; b=BeMAp4BhFqsmNUUpX0cbCE6welV1JMmRmQWS9ccjnMJp6ZjfPdje25080gyTVmKW2o TohE6CRkDW2wgmAOVWP3vl5TuWoF1k7rTv6/QucBbTal8QSzUJOKpTjkgblDNCvAsGQ1 w6ib7+93pWwJprgE1KHNYp2/fl/NVAj4Qpp7Be3+zLhPVKC+USfg4Rv7DFEI3T3zcUjG sX1FJ4SHHW4IWVbp2Wk/HdKVE6OeOeOUf+tQLURfLx2PtmGkWPqvy/O2nFfUUug1KefD VIKfGeDuq8IX5I76MOcQ+2n3BJFBT327xr0U4Bae0FupiaqG4UUyRpbNZ6ve9h7OG3+U 5ZwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :dkim-signature; bh=woMjFLNUegNjbJ51x62lvW6UbmQA+Ba7zyUjvkY6YYA=; b=JDzvHRrViNGfGZBnM+eiWK+hu3s6sTAhXD+PitGTC6qv4Wfln00uMhZ1bsGngYDhPF KtcQ3i9L8LE+qh211RG73jAjwHLOYW7gjqfuwLmUwAAvDOHBQFdH0NrKwJMoZwyX18m0 Xq6Tj8wuZqotxDNyzgeeGdUk8dbr0cF66/QCsv+RxG4EQPi121YXaGb2l7x/iCazvVK8 25cJIF8yN3TwXHmvdVLT2Bvhr1HW0Od5uEU3q2SCQ8bzBv/OyYnFru7Jj+BwdWBbyCDY ZNk+IfVVMFBWh7A9nYjeJzqEzj/rbgGzqrmkRk52Prcs+/9vgU+bG+DOqKup7owuL1v1 9tFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=pPUMCEvf; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id k71-20020a633d4a000000b003816043efc6si3151640pga.443.2022.03.25.13.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 13:25:52 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=pPUMCEvf; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 91CD52EDC1A; Fri, 25 Mar 2022 12:43:26 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231549AbiCYTnm (ORCPT + 99 others); Fri, 25 Mar 2022 15:43:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232084AbiCYTn3 (ORCPT ); Fri, 25 Mar 2022 15:43:29 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1555321BC7A for ; Fri, 25 Mar 2022 12:14:08 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2dc7bdd666fso67221137b3.7 for ; Fri, 25 Mar 2022 12:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=woMjFLNUegNjbJ51x62lvW6UbmQA+Ba7zyUjvkY6YYA=; b=pPUMCEvf8BZ62Y/c+W1qNInLop6JGyWd784jOQMkj1CbDHqg6py/a0QUTHIl90KdK9 w8p+a0V9OwXTGRp2ndKsQIWc5a+N8W0cnnGZFdPvIxrlF1S6agDjEDnrq+kop7VArS9W RbYNWRUOGzcuxrBV4L2CC5m9He2upt/Ljn2rs9gmG3kXrsXyBQMYXRw3Gbsg1t4Arnqw Vz5BauwAV3zM0pm0GHPutIyIuVDPFsGPQzM4SkLsQISvm66TNi9ybfRXySbc8zm/ozK8 dVwdJktR7GmW3rsxUBUyM3bSBrBGyKaXWu9kydtN+Kk/btVZUC8+M9kY4J9l0j+/DcQR l9Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=woMjFLNUegNjbJ51x62lvW6UbmQA+Ba7zyUjvkY6YYA=; b=TcqPamEcb6pAeifRGrcNTvAxmjPbiH3AxDAqrjiUZ4rUs2rTIojCXP/5p4MF6i5ZvZ gUuKeWuf1aqvEk3sk7r0Bibc7pAzmQw1G8MWnbljSibhtZYknpHz7TivMz0JZC5E6243 NEkzKKgPLNYqS9wM5j2a9VjWtNsbNEMc9BXp2lTd/JQxdC5s4nQTJMpJ3YrHhMMgqXjn i++6+CTFITMnWNwQKKLAjsQr+vyJHOlstXiKc0jxiwvNfwa4JCn///oXaInSmQOmXtMz GCAUbMF+jbQAyTFML9N2en4In0kJYI9qxHIgedKqhw7XXCyz0JfRoDePwrSjM1OA3j+/ 61rg== X-Gm-Message-State: AOAM533hLh+/d0EQWMp+1Xlqlr3FU4j9BRtnsgUymlRBYpAtQg9XMGn4 eodzaF9ALdGmjW0pNs1NAGEVEAGmsKtK X-Received: from rajat2.mtv.corp.google.com ([2620:15c:202:201:4cfc:6eaf:38d8:46d6]) (user=rajatja job=sendgmr) by 2002:a81:94d:0:b0:2e5:b91a:195b with SMTP id 74-20020a81094d000000b002e5b91a195bmr12106133ywj.44.1648233973993; Fri, 25 Mar 2022 11:46:13 -0700 (PDT) Date: Fri, 25 Mar 2022 11:46:08 -0700 Message-Id: <20220325184609.4059963-1-rajatja@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v5 1/2] PCI: ACPI: Support Microsoft's "DmaProperty" From: Rajat Jain To: "Rafael J. Wysocki" , Len Brown , linux-pci@vger.kernel.org, Mika Westerberg , Greg Kroah-Hartman , Bjorn Helgaas , Bjorn Helgaas , ACPI Devel Maling List , Linux Kernel Mailing List , Rajat Jain , Dmitry Torokhov , Jesse Barnes , Jean-Philippe Brucker , Pavel Machek , "Oliver O'Halloran" , Joerg Roedel , Will Deacon , David Woodhouse , Lu Baolu , iommu@lists.linux-foundation.org Cc: Rajat Jain Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The "DmaProperty" is supported and documented by Microsoft here: https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports They use this property for DMA protection: https://docs.microsoft.com/en-us/windows/security/information-protection/kernel-dma-protection-for-thunderbolt Support the "DmaProperty" with the same semantics. This is useful for internal PCI devices that do not hang off a PCIe rootport, but offer an attack surface for DMA attacks (e.g. internal network devices). Signed-off-by: Rajat Jain Reviewed-by: Mika Westerberg --- v5: * Reorder the patches in the series v4: * Add the GUID. * Update the comment and commitlog. v3: * Use Microsoft's documented property "DmaProperty" * Resctrict to ACPI only drivers/acpi/property.c | 3 +++ drivers/pci/pci-acpi.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index d0986bda2964..20603cacc28d 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -48,6 +48,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: dbb8e3e6-5886-4ba6-8795-1319f52a966b */ diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 1f15ab7eabf8..378e05096c52 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -1350,12 +1350,28 @@ static void pci_acpi_set_external_facing(struct pci_dev *dev) dev->external_facing = 1; } +static void pci_acpi_check_for_dma_protection(struct pci_dev *dev) +{ + u8 val; + + /* + * Property also used by Microsoft Windows for same purpose, + * (to implement DMA protection from a device, using the IOMMU). + */ + if (device_property_read_u8(&dev->dev, "DmaProperty", &val)) + return; + + if (val) + dev->untrusted = 1; +} + 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_acpi_check_for_dma_protection(pci_dev); pci_acpi_add_edr_notifier(pci_dev); pci_acpi_add_pm_notifier(adev, pci_dev); -- 2.35.1.1021.g381101b075-goog