* improve dma-direct / swiotlb error reporting
@ 2020-02-04 6:32 Christoph Hellwig
2020-02-04 6:32 ` [PATCH 1/2] dma-direct: improve " Christoph Hellwig
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
0 siblings, 2 replies; 7+ messages in thread
From: Christoph Hellwig @ 2020-02-04 6:32 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: iommu
Hi all,
this small series improves the message when the dma mask overflows,
and splits the warning for the genuine dma mask overflow from that
of a not addressable swiotlb buffer to help better diagnosing the
root cause.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] dma-direct: improve swiotlb error reporting
2020-02-04 6:32 improve dma-direct / swiotlb error reporting Christoph Hellwig
@ 2020-02-04 6:32 ` Christoph Hellwig
2020-02-04 14:54 ` Konrad Rzeszutek Wilk
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
1 sibling, 1 reply; 7+ messages in thread
From: Christoph Hellwig @ 2020-02-04 6:32 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: iommu
Untangle the way how dma_direct_map_page calls into swiotlb to be able
to properly report errors where the swiotlb DMA address overflows the
mask separately from overflows in the !swiotlb case. This means that
siotlb_map now has to do a little more work that duplicates
dma_direct_map_page, but doing so greatly simplifies the calling
convention.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/swiotlb.h | 11 +++--------
kernel/dma/direct.c | 16 +++++++--------
kernel/dma/swiotlb.c | 43 +++++++++++++++++++++++------------------
3 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index cde3dc18e21a..046bb94bd4d6 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -64,6 +64,9 @@ extern void swiotlb_tbl_sync_single(struct device *hwdev,
size_t size, enum dma_data_direction dir,
enum dma_sync_target target);
+dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys,
+ size_t size, enum dma_data_direction dir, unsigned long attrs);
+
#ifdef CONFIG_SWIOTLB
extern enum swiotlb_force swiotlb_force;
extern phys_addr_t io_tlb_start, io_tlb_end;
@@ -73,8 +76,6 @@ static inline bool is_swiotlb_buffer(phys_addr_t paddr)
return paddr >= io_tlb_start && paddr < io_tlb_end;
}
-bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
- size_t size, enum dma_data_direction dir, unsigned long attrs);
void __init swiotlb_exit(void);
unsigned int swiotlb_max_segment(void);
size_t swiotlb_max_mapping_size(struct device *dev);
@@ -85,12 +86,6 @@ static inline bool is_swiotlb_buffer(phys_addr_t paddr)
{
return false;
}
-static inline bool swiotlb_map(struct device *dev, phys_addr_t *phys,
- dma_addr_t *dma_addr, size_t size, enum dma_data_direction dir,
- unsigned long attrs)
-{
- return false;
-}
static inline void swiotlb_exit(void)
{
}
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 6af7ae83c4ad..82ad50aaf42c 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -357,13 +357,6 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl,
EXPORT_SYMBOL(dma_direct_unmap_sg);
#endif
-static inline bool dma_direct_possible(struct device *dev, dma_addr_t dma_addr,
- size_t size)
-{
- return swiotlb_force != SWIOTLB_FORCE &&
- dma_capable(dev, dma_addr, size, true);
-}
-
dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction dir,
unsigned long attrs)
@@ -371,8 +364,13 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
phys_addr_t phys = page_to_phys(page) + offset;
dma_addr_t dma_addr = phys_to_dma(dev, phys);
- if (unlikely(!dma_direct_possible(dev, dma_addr, size)) &&
- !swiotlb_map(dev, &phys, &dma_addr, size, dir, attrs)) {
+ if (unlikely(swiotlb_force == SWIOTLB_FORCE))
+ return swiotlb_map(dev, phys, size, dir, attrs);
+
+ if (unlikely(!dma_capable(dev, dma_addr, size, true))) {
+ if (swiotlb_force != SWIOTLB_NO_FORCE)
+ return swiotlb_map(dev, phys, size, dir, attrs);
+
report_addr(dev, dma_addr, size);
return DMA_MAPPING_ERROR;
}
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 9280d6f8271e..589bb9a40f21 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -22,6 +22,7 @@
#include <linux/cache.h>
#include <linux/dma-direct.h>
+#include <linux/dma-noncoherent.h>
#include <linux/mm.h>
#include <linux/export.h>
#include <linux/spinlock.h>
@@ -656,35 +657,39 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
}
/*
- * Create a swiotlb mapping for the buffer at @phys, and in case of DMAing
+ * Create a swiotlb mapping for the buffer at @paddr, and in case of DMAing
* to the device copy the data into it as well.
*/
-bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
- size_t size, enum dma_data_direction dir, unsigned long attrs)
+dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,
+ enum dma_data_direction dir, unsigned long attrs)
{
- trace_swiotlb_bounced(dev, *dma_addr, size, swiotlb_force);
+ phys_addr_t swiotlb_addr;
+ dma_addr_t dma_addr;
- if (unlikely(swiotlb_force == SWIOTLB_NO_FORCE)) {
- dev_warn_ratelimited(dev,
- "Cannot do DMA to address %pa\n", phys);
- return false;
- }
+ trace_swiotlb_bounced(dev, phys_to_dma(dev, paddr), size,
+ swiotlb_force);
- /* Oh well, have to allocate and map a bounce buffer. */
- *phys = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start),
- *phys, size, size, dir, attrs);
- if (*phys == (phys_addr_t)DMA_MAPPING_ERROR)
- return false;
+ swiotlb_addr = swiotlb_tbl_map_single(dev,
+ __phys_to_dma(dev, io_tlb_start),
+ paddr, size, size, dir, attrs);
+ if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)
+ return DMA_MAPPING_ERROR;
/* Ensure that the address returned is DMA'ble */
- *dma_addr = __phys_to_dma(dev, *phys);
- if (unlikely(!dma_capable(dev, *dma_addr, size, true))) {
- swiotlb_tbl_unmap_single(dev, *phys, size, size, dir,
+ dma_addr = __phys_to_dma(dev, swiotlb_addr);
+ if (unlikely(!dma_capable(dev, dma_addr, size, true))) {
+ swiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,
attrs | DMA_ATTR_SKIP_CPU_SYNC);
- return false;
+ dev_err_once(dev,
+ "swiotlb addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
+ &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
+ WARN_ON_ONCE(1);
+ return DMA_MAPPING_ERROR;
}
- return true;
+ if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+ arch_sync_dma_for_device(swiotlb_addr, size, dir);
+ return dma_addr;
}
size_t swiotlb_max_mapping_size(struct device *dev)
--
2.24.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] dma-direct: improve DMA mask overflow reporting
2020-02-04 6:32 improve dma-direct / swiotlb error reporting Christoph Hellwig
2020-02-04 6:32 ` [PATCH 1/2] dma-direct: improve " Christoph Hellwig
@ 2020-02-04 6:32 ` Christoph Hellwig
2020-02-04 14:55 ` Konrad Rzeszutek Wilk
2020-02-04 15:14 ` Robin Murphy
1 sibling, 2 replies; 7+ messages in thread
From: Christoph Hellwig @ 2020-02-04 6:32 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: iommu
Remove the unset dma_mask case as that won't get into mapping calls
anymore, and also report the other errors unconditonally and with a
slightly improved message. Remove the now pointless report_addr helper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
kernel/dma/direct.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 82ad50aaf42c..04f308a47fc3 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -23,18 +23,6 @@
*/
unsigned int zone_dma_bits __ro_after_init = 24;
-static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
-{
- if (!dev->dma_mask) {
- dev_err_once(dev, "DMA map on device without dma_mask\n");
- } else if (*dev->dma_mask >= DMA_BIT_MASK(32) || dev->bus_dma_limit) {
- dev_err_once(dev,
- "overflow %pad+%zu of DMA mask %llx bus limit %llx\n",
- &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
- }
- WARN_ON_ONCE(1);
-}
-
static inline dma_addr_t phys_to_dma_direct(struct device *dev,
phys_addr_t phys)
{
@@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
if (swiotlb_force != SWIOTLB_NO_FORCE)
return swiotlb_map(dev, phys, size, dir, attrs);
- report_addr(dev, dma_addr, size);
+ dev_err_once(dev,
+ "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
+ &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
+ WARN_ON_ONCE(1);
return DMA_MAPPING_ERROR;
}
@@ -409,7 +400,10 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
dma_addr_t dma_addr = paddr;
if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
- report_addr(dev, dma_addr, size);
+ dev_err_once(dev,
+ "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
+ &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
+ WARN_ON_ONCE(1);
return DMA_MAPPING_ERROR;
}
--
2.24.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] dma-direct: improve swiotlb error reporting
2020-02-04 6:32 ` [PATCH 1/2] dma-direct: improve " Christoph Hellwig
@ 2020-02-04 14:54 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 7+ messages in thread
From: Konrad Rzeszutek Wilk @ 2020-02-04 14:54 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: iommu
On Tue, Feb 04, 2020 at 07:32:04AM +0100, Christoph Hellwig wrote:
> Untangle the way how dma_direct_map_page calls into swiotlb to be able
> to properly report errors where the swiotlb DMA address overflows the
> mask separately from overflows in the !swiotlb case. This means that
> siotlb_map now has to do a little more work that duplicates
> dma_direct_map_page, but doing so greatly simplifies the calling
> convention.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Konrad Rzeszutek Wilk <konrad@darnok.org>
(Pick whichever tag you want :-))
> ---
> include/linux/swiotlb.h | 11 +++--------
> kernel/dma/direct.c | 16 +++++++--------
> kernel/dma/swiotlb.c | 43 +++++++++++++++++++++++------------------
> 3 files changed, 34 insertions(+), 36 deletions(-)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index cde3dc18e21a..046bb94bd4d6 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -64,6 +64,9 @@ extern void swiotlb_tbl_sync_single(struct device *hwdev,
> size_t size, enum dma_data_direction dir,
> enum dma_sync_target target);
>
> +dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys,
> + size_t size, enum dma_data_direction dir, unsigned long attrs);
> +
> #ifdef CONFIG_SWIOTLB
> extern enum swiotlb_force swiotlb_force;
> extern phys_addr_t io_tlb_start, io_tlb_end;
> @@ -73,8 +76,6 @@ static inline bool is_swiotlb_buffer(phys_addr_t paddr)
> return paddr >= io_tlb_start && paddr < io_tlb_end;
> }
>
> -bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
> - size_t size, enum dma_data_direction dir, unsigned long attrs);
> void __init swiotlb_exit(void);
> unsigned int swiotlb_max_segment(void);
> size_t swiotlb_max_mapping_size(struct device *dev);
> @@ -85,12 +86,6 @@ static inline bool is_swiotlb_buffer(phys_addr_t paddr)
> {
> return false;
> }
> -static inline bool swiotlb_map(struct device *dev, phys_addr_t *phys,
> - dma_addr_t *dma_addr, size_t size, enum dma_data_direction dir,
> - unsigned long attrs)
> -{
> - return false;
> -}
> static inline void swiotlb_exit(void)
> {
> }
> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
> index 6af7ae83c4ad..82ad50aaf42c 100644
> --- a/kernel/dma/direct.c
> +++ b/kernel/dma/direct.c
> @@ -357,13 +357,6 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl,
> EXPORT_SYMBOL(dma_direct_unmap_sg);
> #endif
>
> -static inline bool dma_direct_possible(struct device *dev, dma_addr_t dma_addr,
> - size_t size)
> -{
> - return swiotlb_force != SWIOTLB_FORCE &&
> - dma_capable(dev, dma_addr, size, true);
> -}
> -
> dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
> unsigned long offset, size_t size, enum dma_data_direction dir,
> unsigned long attrs)
> @@ -371,8 +364,13 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
> phys_addr_t phys = page_to_phys(page) + offset;
> dma_addr_t dma_addr = phys_to_dma(dev, phys);
>
> - if (unlikely(!dma_direct_possible(dev, dma_addr, size)) &&
> - !swiotlb_map(dev, &phys, &dma_addr, size, dir, attrs)) {
> + if (unlikely(swiotlb_force == SWIOTLB_FORCE))
> + return swiotlb_map(dev, phys, size, dir, attrs);
> +
> + if (unlikely(!dma_capable(dev, dma_addr, size, true))) {
> + if (swiotlb_force != SWIOTLB_NO_FORCE)
> + return swiotlb_map(dev, phys, size, dir, attrs);
> +
> report_addr(dev, dma_addr, size);
> return DMA_MAPPING_ERROR;
> }
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index 9280d6f8271e..589bb9a40f21 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -22,6 +22,7 @@
>
> #include <linux/cache.h>
> #include <linux/dma-direct.h>
> +#include <linux/dma-noncoherent.h>
> #include <linux/mm.h>
> #include <linux/export.h>
> #include <linux/spinlock.h>
> @@ -656,35 +657,39 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
> }
>
> /*
> - * Create a swiotlb mapping for the buffer at @phys, and in case of DMAing
> + * Create a swiotlb mapping for the buffer at @paddr, and in case of DMAing
> * to the device copy the data into it as well.
> */
> -bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
> - size_t size, enum dma_data_direction dir, unsigned long attrs)
> +dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,
> + enum dma_data_direction dir, unsigned long attrs)
> {
> - trace_swiotlb_bounced(dev, *dma_addr, size, swiotlb_force);
> + phys_addr_t swiotlb_addr;
> + dma_addr_t dma_addr;
>
> - if (unlikely(swiotlb_force == SWIOTLB_NO_FORCE)) {
> - dev_warn_ratelimited(dev,
> - "Cannot do DMA to address %pa\n", phys);
> - return false;
> - }
> + trace_swiotlb_bounced(dev, phys_to_dma(dev, paddr), size,
> + swiotlb_force);
>
> - /* Oh well, have to allocate and map a bounce buffer. */
> - *phys = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start),
> - *phys, size, size, dir, attrs);
> - if (*phys == (phys_addr_t)DMA_MAPPING_ERROR)
> - return false;
> + swiotlb_addr = swiotlb_tbl_map_single(dev,
> + __phys_to_dma(dev, io_tlb_start),
> + paddr, size, size, dir, attrs);
> + if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)
> + return DMA_MAPPING_ERROR;
>
> /* Ensure that the address returned is DMA'ble */
> - *dma_addr = __phys_to_dma(dev, *phys);
> - if (unlikely(!dma_capable(dev, *dma_addr, size, true))) {
> - swiotlb_tbl_unmap_single(dev, *phys, size, size, dir,
> + dma_addr = __phys_to_dma(dev, swiotlb_addr);
> + if (unlikely(!dma_capable(dev, dma_addr, size, true))) {
> + swiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,
> attrs | DMA_ATTR_SKIP_CPU_SYNC);
> - return false;
> + dev_err_once(dev,
> + "swiotlb addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> + return DMA_MAPPING_ERROR;
> }
>
> - return true;
> + if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
> + arch_sync_dma_for_device(swiotlb_addr, size, dir);
> + return dma_addr;
> }
>
> size_t swiotlb_max_mapping_size(struct device *dev)
> --
> 2.24.1
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dma-direct: improve DMA mask overflow reporting
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
@ 2020-02-04 14:55 ` Konrad Rzeszutek Wilk
2020-02-04 15:14 ` Robin Murphy
1 sibling, 0 replies; 7+ messages in thread
From: Konrad Rzeszutek Wilk @ 2020-02-04 14:55 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: iommu
On Tue, Feb 04, 2020 at 07:32:05AM +0100, Christoph Hellwig wrote:
> Remove the unset dma_mask case as that won't get into mapping calls
> anymore, and also report the other errors unconditonally and with a
> slightly improved message. Remove the now pointless report_addr helper.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad@darnok.org>
> ---
> kernel/dma/direct.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
> index 82ad50aaf42c..04f308a47fc3 100644
> --- a/kernel/dma/direct.c
> +++ b/kernel/dma/direct.c
> @@ -23,18 +23,6 @@
> */
> unsigned int zone_dma_bits __ro_after_init = 24;
>
> -static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
> -{
> - if (!dev->dma_mask) {
> - dev_err_once(dev, "DMA map on device without dma_mask\n");
> - } else if (*dev->dma_mask >= DMA_BIT_MASK(32) || dev->bus_dma_limit) {
> - dev_err_once(dev,
> - "overflow %pad+%zu of DMA mask %llx bus limit %llx\n",
> - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> - }
> - WARN_ON_ONCE(1);
> -}
> -
> static inline dma_addr_t phys_to_dma_direct(struct device *dev,
> phys_addr_t phys)
> {
> @@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
> if (swiotlb_force != SWIOTLB_NO_FORCE)
> return swiotlb_map(dev, phys, size, dir, attrs);
>
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> return DMA_MAPPING_ERROR;
> }
>
> @@ -409,7 +400,10 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
> dma_addr_t dma_addr = paddr;
>
> if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> return DMA_MAPPING_ERROR;
> }
>
> --
> 2.24.1
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dma-direct: improve DMA mask overflow reporting
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
2020-02-04 14:55 ` Konrad Rzeszutek Wilk
@ 2020-02-04 15:14 ` Robin Murphy
2020-02-04 15:58 ` Christoph Hellwig
1 sibling, 1 reply; 7+ messages in thread
From: Robin Murphy @ 2020-02-04 15:14 UTC (permalink / raw)
To: Christoph Hellwig, Konrad Rzeszutek Wilk; +Cc: iommu
On 04/02/2020 6:32 am, Christoph Hellwig wrote:
> Remove the unset dma_mask case as that won't get into mapping calls
> anymore, and also report the other errors unconditonally and with a
> slightly improved message. Remove the now pointless report_addr helper.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> kernel/dma/direct.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
> index 82ad50aaf42c..04f308a47fc3 100644
> --- a/kernel/dma/direct.c
> +++ b/kernel/dma/direct.c
> @@ -23,18 +23,6 @@
> */
> unsigned int zone_dma_bits __ro_after_init = 24;
>
> -static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
> -{
> - if (!dev->dma_mask) {
> - dev_err_once(dev, "DMA map on device without dma_mask\n");
> - } else if (*dev->dma_mask >= DMA_BIT_MASK(32) || dev->bus_dma_limit) {
> - dev_err_once(dev,
> - "overflow %pad+%zu of DMA mask %llx bus limit %llx\n",
> - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> - }
> - WARN_ON_ONCE(1);
> -}
> -
> static inline dma_addr_t phys_to_dma_direct(struct device *dev,
> phys_addr_t phys)
> {
> @@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
> if (swiotlb_force != SWIOTLB_NO_FORCE)
> return swiotlb_map(dev, phys, size, dir, attrs);
>
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
Or even dev_WARN_ONCE() to make them even simpler?
Robin.
> return DMA_MAPPING_ERROR;
> }
>
> @@ -409,7 +400,10 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
> dma_addr_t dma_addr = paddr;
>
> if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> return DMA_MAPPING_ERROR;
> }
>
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dma-direct: improve DMA mask overflow reporting
2020-02-04 15:14 ` Robin Murphy
@ 2020-02-04 15:58 ` Christoph Hellwig
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Hellwig @ 2020-02-04 15:58 UTC (permalink / raw)
To: Robin Murphy; +Cc: iommu, Christoph Hellwig, Konrad Rzeszutek Wilk
On Tue, Feb 04, 2020 at 03:14:06PM +0000, Robin Murphy wrote:
>> @@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
>> if (swiotlb_force != SWIOTLB_NO_FORCE)
>> return swiotlb_map(dev, phys, size, dir, attrs);
>> - report_addr(dev, dma_addr, size);
>> + dev_err_once(dev,
>> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
>> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
>> + WARN_ON_ONCE(1);
>
> Or even dev_WARN_ONCE() to make them even simpler?
It looks like dev_WARN_ONCE supports format strings (unlike
WARN_ON_ONCE), so that sounds fine. If there are no other comments
coming in I'll apply the patches with that change.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-04 15:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 6:32 improve dma-direct / swiotlb error reporting Christoph Hellwig
2020-02-04 6:32 ` [PATCH 1/2] dma-direct: improve " Christoph Hellwig
2020-02-04 14:54 ` Konrad Rzeszutek Wilk
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
2020-02-04 14:55 ` Konrad Rzeszutek Wilk
2020-02-04 15:14 ` Robin Murphy
2020-02-04 15:58 ` Christoph Hellwig
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.