Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3682253pxj; Tue, 15 Jun 2021 06:29:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyciA4VTcX7NCircwWudOu71bbUEFpTv88uNNGkM3ZUZdrLUing9Pr9WJmaVt5VZHR5Z6o X-Received: by 2002:a05:6402:1c8e:: with SMTP id cy14mr596655edb.271.1623763752189; Tue, 15 Jun 2021 06:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623763752; cv=none; d=google.com; s=arc-20160816; b=iQ7FC9H7Rq0iQ7Itr4q6l9uEAQLp4RpKD9genj+YxEDd2KEkzEChCNUIpa35tbjGOe GL57gqhtPiqkfAVEoj6YeIANXV9dK5eDU1ah4e9rUTh8TWmSnMzsElnfaoZTn9PNn3df vHIUlglwSlqNNa/hOzQEu8sYWTHtKhEST5gGCbkToOICU5XM5rI7EvIHb5k4L50cpxJX bFRJwifFssKYJucj4QT/iKTHfkMmes4/KyAHhpz8EW8M7rohD8Ap+asIrFCwI9qAcUgk WqmUnIW5g+8sgYtyobriEjxb6Q5PLUNqU7mZRIbToLjrTZg+sfMG4lEjNG4lfSjO0tyD YLBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ju6S8lgCxf3St5TjBpM/zWBg3zY1k2oOfdLAzP6ctcg=; b=l3YOOb7kI4oymi4C+MKX25yyqSumnxlUbHcYbAwxFOusZEmzMWoIqdXCPZd39Pk4l4 4uJcaNMlJRXokw6L92DTUOttDqCdBuk5HX9d13Wgmr/X75vMqs/M/lExn44aDSxCeaG3 wSRwUL+jQqqfmZ++2wwzYOGA9Og8glhBiQ9p2phrYh/Alux32K2iZiwaJrf0HRZkaJwC fVr4Rl3GubMxp8pX6dtuvRx1lWiQFUml/Okb+eX6NR1djUfUDaYhTDnDpqnw5KgL37ZG UlgGjHiOilYrXZApdhaWtAnZAlHBDV2F5KLXt6JDgxfDv0E/lvdyEvKu7ydu16QCfI/b VdYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=S0KOTmQ1; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cx5si15186085edb.407.2021.06.15.06.28.49; Tue, 15 Jun 2021 06:29:12 -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=@chromium.org header.s=google header.b=S0KOTmQ1; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231265AbhFON31 (ORCPT + 99 others); Tue, 15 Jun 2021 09:29:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230298AbhFON30 (ORCPT ); Tue, 15 Jun 2021 09:29:26 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A74DAC0617AF for ; Tue, 15 Jun 2021 06:27:21 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id h12-20020a17090aa88cb029016400fd8ad8so2212411pjq.3 for ; Tue, 15 Jun 2021 06:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ju6S8lgCxf3St5TjBpM/zWBg3zY1k2oOfdLAzP6ctcg=; b=S0KOTmQ1dyMFUgjraAGrRI0c2Mihsv8RUfx+tMl8U8V5wwFpZrXslfg71+0gtaQ4MS 920rIvXLA/w2InlV9cjhFj31GrTJmfYtMvDEkxHMkIU3x8/eylAN0MxowVG16KZdI3xd R6EZBcTiAFbROkN0bkdkSLOWCWkPs3n3Q835U= 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:mime-version :content-transfer-encoding; bh=ju6S8lgCxf3St5TjBpM/zWBg3zY1k2oOfdLAzP6ctcg=; b=qz4P9bOMyVBUdBdPjQ5i0nclcl/f7hdfsl7kE9Xd5yVB8C6hmoJFwH81a2OywMaBew RcPnpDernEGMZFHepeT0UA83fdHvTyRZ42w9chZGRvatESDFqBaiitqSpdPw4Tp+R+c7 kCIuY4Nh+usmlMLxvWD1m3l5ymCDVu9KeLGeQ5izM1NDFljhALtRKndakUDVae6CoMiF LCxaP1oUrOQavT2sa+n+00pHx9eMhVyMoNbinKsLp4tEYg0I3O+UZBNg6zMRy8AsFqPP x0P8cmtVN/NK7EZqC+4YG3DT1shfor9Ga3asejzvtIKOHtPUyhb0yX/q7JbzHjo7qMvc DOjw== X-Gm-Message-State: AOAM532CO7oK/RTgIaHBPVcp5rgtRiN1WEUGpESowVZFn5EaA88exw7w rmDGIQ0nupbwyacTBmUFu5V5iA== X-Received: by 2002:a17:90a:be0b:: with SMTP id a11mr25279126pjs.197.1623763641154; Tue, 15 Jun 2021 06:27:21 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:1846:5274:e444:139e]) by smtp.gmail.com with UTF8SMTPSA id k70sm16257566pgd.41.2021.06.15.06.27.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jun 2021 06:27:20 -0700 (PDT) From: Claire Chang To: Rob Herring , mpe@ellerman.id.au, Joerg Roedel , Will Deacon , Frank Rowand , Konrad Rzeszutek Wilk , boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig , Marek Szyprowski Cc: benh@kernel.crashing.org, paulus@samba.org, "list@263.net:IOMMU DRIVERS" , sstabellini@kernel.org, Robin Murphy , grant.likely@arm.com, xypron.glpk@gmx.de, Thierry Reding , mingo@kernel.org, bauerman@linux.ibm.com, peterz@infradead.org, Greg KH , Saravana Kannan , "Rafael J . Wysocki" , heikki.krogerus@linux.intel.com, Andy Shevchenko , Randy Dunlap , Dan Williams , Bartosz Golaszewski , linux-devicetree , lkml , linuxppc-dev@lists.ozlabs.org, xen-devel@lists.xenproject.org, Nicolas Boichat , Jim Quinlan , tfiga@chromium.org, bskeggs@redhat.com, bhelgaas@google.com, chris@chris-wilson.co.uk, tientzu@chromium.org, daniel@ffwll.ch, airlied@linux.ie, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, jxgao@google.com, joonas.lahtinen@linux.intel.com, linux-pci@vger.kernel.org, maarten.lankhorst@linux.intel.com, matthew.auld@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com Subject: [PATCH v10 00/12] Restricted DMA Date: Tue, 15 Jun 2021 21:26:59 +0800 Message-Id: <20210615132711.553451-1-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series implements mitigations for lack of DMA access control on systems without an IOMMU, which could result in the DMA accessing the system memory at unexpected times and/or unexpected addresses, possibly leading to data leakage or corruption. For example, we plan to use the PCI-e bus for Wi-Fi and that PCI-e bus is not behind an IOMMU. As PCI-e, by design, gives the device full access to system memory, a vulnerability in the Wi-Fi firmware could easily escalate to a full system exploit (remote wifi exploits: [1a], [1b] that shows a full chain of exploits; [2], [3]). To mitigate the security concerns, we introduce restricted DMA. Restricted DMA utilizes the existing swiotlb to bounce streaming DMA in and out of a specially allocated region and does memory allocation from the same region. The feature on its own provides a basic level of protection against the DMA overwriting buffer contents at unexpected times. However, to protect against general data leakage and system memory corruption, the system needs to provide a way to restrict the DMA to a predefined memory region (this is usually done at firmware level, e.g. MPU in ATF on some ARM platforms [4]). [1a] https://googleprojectzero.blogspot.com/2017/04/over-air-exploiting-broadcoms-wi-fi_4.html [1b] https://googleprojectzero.blogspot.com/2017/04/over-air-exploiting-broadcoms-wi-fi_11.html [2] https://blade.tencent.com/en/advisories/qualpwn/ [3] https://www.bleepingcomputer.com/news/security/vulnerabilities-found-in-highly-popular-firmware-for-wifi-chips/ [4] https://github.com/ARM-software/arm-trusted-firmware/blob/master/plat/mediatek/mt8183/drivers/emi_mpu/emi_mpu.c#L132 v10: Address the comments in v9 to - fix the dev->dma_io_tlb_mem assignment - propagate swiotlb_force setting into io_tlb_default_mem->force - move set_memory_decrypted out of swiotlb_init_io_tlb_mem - move debugfs_dir declaration into the main CONFIG_DEBUG_FS block - add swiotlb_ prefix to find_slots and release_slots - merge the 3 alloc/free related patches - move the CONFIG_DMA_RESTRICTED_POOL later v9: Address the comments in v7 to - set swiotlb active pool to dev->dma_io_tlb_mem - get rid of get_io_tlb_mem - dig out the device struct for is_swiotlb_active - move debugfs_create_dir out of swiotlb_create_debugfs - do set_memory_decrypted conditionally in swiotlb_init_io_tlb_mem - use IS_ENABLED in kernel/dma/direct.c - fix redefinition of 'of_dma_set_restricted_buffer' https://lore.kernel.org/patchwork/cover/1445081/ v8: - Fix reserved-memory.txt and add the reg property in example. - Fix sizeof for of_property_count_elems_of_size in drivers/of/address.c#of_dma_set_restricted_buffer. - Apply Will's suggestion to try the OF node having DMA configuration in drivers/of/address.c#of_dma_set_restricted_buffer. - Fix typo in the comment of drivers/of/address.c#of_dma_set_restricted_buffer. - Add error message for PageHighMem in kernel/dma/swiotlb.c#rmem_swiotlb_device_init and move it to rmem_swiotlb_setup. - Fix the message string in rmem_swiotlb_setup. https://lore.kernel.org/patchwork/cover/1437112/ v7: Fix debugfs, PageHighMem and comment style in rmem_swiotlb_device_init https://lore.kernel.org/patchwork/cover/1431031/ v6: Address the comments in v5 https://lore.kernel.org/patchwork/cover/1423201/ v5: Rebase on latest linux-next https://lore.kernel.org/patchwork/cover/1416899/ v4: - Fix spinlock bad magic - Use rmem->name for debugfs entry - Address the comments in v3 https://lore.kernel.org/patchwork/cover/1378113/ v3: Using only one reserved memory region for both streaming DMA and memory allocation. https://lore.kernel.org/patchwork/cover/1360992/ v2: Building on top of swiotlb. https://lore.kernel.org/patchwork/cover/1280705/ v1: Using dma_map_ops. https://lore.kernel.org/patchwork/cover/1271660/ Claire Chang (12): swiotlb: Refactor swiotlb init functions swiotlb: Refactor swiotlb_create_debugfs swiotlb: Set dev->dma_io_tlb_mem to the swiotlb pool used swiotlb: Update is_swiotlb_buffer to add a struct device argument swiotlb: Update is_swiotlb_active to add a struct device argument swiotlb: Use is_dev_swiotlb_force for swiotlb data bouncing swiotlb: Move alloc_size to swiotlb_find_slots swiotlb: Refactor swiotlb_tbl_unmap_single swiotlb: Add restricted DMA pool initialization swiotlb: Add restricted DMA alloc/free support dt-bindings: of: Add restricted DMA pool of: Add plumbing for restricted DMA pool .../reserved-memory/reserved-memory.txt | 36 ++- drivers/base/core.c | 4 + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/iommu/dma-iommu.c | 12 +- drivers/of/address.c | 33 +++ drivers/of/device.c | 3 + drivers/of/of_private.h | 6 + drivers/pci/xen-pcifront.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- include/linux/device.h | 4 + include/linux/swiotlb.h | 40 ++- kernel/dma/Kconfig | 14 + kernel/dma/direct.c | 60 +++-- kernel/dma/direct.h | 8 +- kernel/dma/swiotlb.c | 255 +++++++++++++----- 16 files changed, 380 insertions(+), 103 deletions(-) -- 2.32.0.272.g935e593368-goog