From: Robin Murphy <robin.murphy@arm.com>
To: Kees Cook <keescook@chromium.org>, Christoph Hellwig <hch@lst.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, Stephen Boyd <swboyd@chromium.org>,
iommu@lists.linux-foundation.org,
Semmle Security Reports <security-reports@semmle.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Laura Abbott <labbott@redhat.com>,
Allison Randal <allison@lohutok.net>
Subject: Re: [PATCH] dma-mapping: Lift address space checks out of debug code
Date: Wed, 2 Oct 2019 22:15:43 +0100 [thread overview]
Message-ID: <7a5dc7aa-66ec-0249-e73f-285b8807cb73@arm.com> (raw)
In-Reply-To: <201910021341.7819A660@keescook>
Hi Kees,
On 2019-10-02 9:46 pm, Kees Cook wrote:
> As we've seen from USB and other areas, we need to always do runtime
> checks for DMA operating on memory regions that might be remapped. This
> consolidates the (existing!) checks and makes them on by default. A
> warning will be triggered for any drivers still using DMA on the stack
> (as has been seen in a few recent reports).
>
> Suggested-by: Laura Abbott <labbott@redhat.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> include/linux/dma-debug.h | 8 --------
> include/linux/dma-mapping.h | 8 +++++++-
> kernel/dma/debug.c | 16 ----------------
> 3 files changed, 7 insertions(+), 25 deletions(-)
>
> diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
> index 4208f94d93f7..2af9765d9af7 100644
> --- a/include/linux/dma-debug.h
> +++ b/include/linux/dma-debug.h
> @@ -18,9 +18,6 @@ struct bus_type;
>
> extern void dma_debug_add_bus(struct bus_type *bus);
>
> -extern void debug_dma_map_single(struct device *dev, const void *addr,
> - unsigned long len);
> -
> extern void debug_dma_map_page(struct device *dev, struct page *page,
> size_t offset, size_t size,
> int direction, dma_addr_t dma_addr);
> @@ -75,11 +72,6 @@ static inline void dma_debug_add_bus(struct bus_type *bus)
> {
> }
>
> -static inline void debug_dma_map_single(struct device *dev, const void *addr,
> - unsigned long len)
> -{
> -}
> -
> static inline void debug_dma_map_page(struct device *dev, struct page *page,
> size_t offset, size_t size,
> int direction, dma_addr_t dma_addr)
> diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
> index 4a1c4fca475a..2d6b8382eab1 100644
> --- a/include/linux/dma-mapping.h
> +++ b/include/linux/dma-mapping.h
> @@ -583,7 +583,13 @@ static inline unsigned long dma_get_merge_boundary(struct device *dev)
> static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
> size_t size, enum dma_data_direction dir, unsigned long attrs)
> {
> - debug_dma_map_single(dev, ptr, size);
> + /* DMA must never operate on stack or other remappable places. */
> + WARN_ONCE(is_vmalloc_addr(ptr) || !virt_addr_valid(ptr),
This stands to absolutely cripple I/O performance on arm64, because
every valid call will end up going off and scanning the memblock list,
which is not something we want on a fastpath in non-debug
configurations. We'd need a much better solution to the "pfn_valid() vs.
EFI no-map" problem before this might be viable.
Robin.
> + "%s %s: driver maps %lu bytes from %s area\n",
> + dev ? dev_driver_string(dev) : "unknown driver",
> + dev ? dev_name(dev) : "unknown device", size,
> + is_vmalloc_addr(ptr) ? "vmalloc" : "invalid");
> +
> return dma_map_page_attrs(dev, virt_to_page(ptr), offset_in_page(ptr),
> size, dir, attrs);
> }
> diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
> index 099002d84f46..aa1e6a1990b2 100644
> --- a/kernel/dma/debug.c
> +++ b/kernel/dma/debug.c
> @@ -1232,22 +1232,6 @@ static void check_sg_segment(struct device *dev, struct scatterlist *sg)
> #endif
> }
>
> -void debug_dma_map_single(struct device *dev, const void *addr,
> - unsigned long len)
> -{
> - if (unlikely(dma_debug_disabled()))
> - return;
> -
> - if (!virt_addr_valid(addr))
> - err_printk(dev, NULL, "device driver maps memory from invalid area [addr=%p] [len=%lu]\n",
> - addr, len);
> -
> - if (is_vmalloc_addr(addr))
> - err_printk(dev, NULL, "device driver maps memory from vmalloc area [addr=%p] [len=%lu]\n",
> - addr, len);
> -}
> -EXPORT_SYMBOL(debug_dma_map_single);
> -
> void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
> size_t size, int direction, dma_addr_t dma_addr)
> {
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-10-02 21:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 20:46 [PATCH] dma-mapping: Lift address space checks out of debug code Kees Cook
2019-10-02 21:15 ` Robin Murphy [this message]
2019-10-02 23:58 ` Kees Cook
2019-10-03 0:03 ` Kees Cook
2019-10-03 9:42 ` Robin Murphy
2019-10-03 21:38 ` Kees Cook
2019-10-04 18:50 ` Robin Murphy
2019-10-04 20:25 ` Kees Cook
2019-10-05 8:27 ` Christoph Hellwig
2019-10-02 22:37 ` kbuild test robot
2019-10-03 0:05 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7a5dc7aa-66ec-0249-e73f-285b8807cb73@arm.com \
--to=robin.murphy@arm.com \
--cc=allison@lohutok.net \
--cc=brouer@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=keescook@chromium.org \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=security-reports@semmle.com \
--cc=swboyd@chromium.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).