Skip to contentSkip to conversation

coresight: tmc-etr: Check if page is valid before dma_map_page()

PATCH Applied Sai Prakash Ranjan 4 participants 4 messages Nov 23, 2020 – Dec 29, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 coresight: tmc-etr: Check if page is valid before dma_map_page()

From: Mao Jinlong <[email protected]>

alloc_pages_node() return should be checked before calling dma_map_page() to make sure that valid page is mapped or else it can lead to aborts as below:

 Unable to handle kernel paging request at virtual address ffffffc008000000
 Mem abort info:
 <snip>...
 pc : __dma_inv_area+0x40/0x58
 lr : dma_direct_map_page+0xd8/0x1c8

 Call trace:
  __dma_inv_area
  tmc_pages_alloc
  tmc_alloc_data_pages
  tmc_alloc_sg_table
  tmc_init_etr_sg_table
  tmc_alloc_etr_buf
  tmc_enable_etr_sink_sysfs
  tmc_enable_etr_sink
  coresight_enable_path
  coresight_enable
  enable_source_store
  dev_attr_store
  sysfs_kf_write
Fixes 99443ea19e8b ("coresight: Add generic TMC sg table framework")
---
 drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/hwtracing/coresight/coresight-tmc-etr.c +2 -0
index 525f0ecc129c..a31a4d7ae25e 100644
@@ -217,6 +217,8 @@ static int tmc_pages_alloc(struct tmc_pages *tmc_pages,
 		} else {
 			page = alloc_pages_node(node,
 						GFP_KERNEL | __GFP_ZERO, 0);
+			if (!page)
+				goto err;
 		}
 		paddr = dma_map_page(real_dev, page, 0, PAGE_SIZE, dir);
 		if (dma_mapping_error(real_dev, paddr))

base-commit: c04e5d7bbf6f92a346d6b36770705e7f034df42d

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Sai Prakash Ranjan

From: Mao Jinlong <[email protected]>

alloc_pages_node() return should be checked before calling dma_map_page() to make sure that valid page is mapped or else it can lead to aborts as below:

  Unable to handle kernel paging request at virtual address ffffffc008000000
  Mem abort info:
  <snip>...
  pc : __dma_inv_area+0x40/0x58
  lr : dma_direct_map_page+0xd8/0x1c8

  Call trace:
   __dma_inv_area
   tmc_pages_alloc
   tmc_alloc_data_pages
   tmc_alloc_sg_table
   tmc_init_etr_sg_table
   tmc_alloc_etr_buf
   tmc_enable_etr_sink_sysfs
   tmc_enable_etr_sink
   coresight_enable_path
   coresight_enable
   enable_source_store
   dev_attr_store
   sysfs_kf_write
Quoted 4 lines
Fixes 99443ea19e8b ("coresight: Add generic TMC sg table framework")
Quoted 20 lines
---
  drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/hwtracing/coresight/coresight-tmc-etr.c +2 -0
index 525f0ecc129c..a31a4d7ae25e 100644
@@ -217,6 +217,8 @@ static int tmc_pages_alloc(struct tmc_pages *tmc_pages,
  		} else {
  			page = alloc_pages_node(node,
  						GFP_KERNEL | __GFP_ZERO, 0);
+			if (!page)
+				goto err;
  		}
  		paddr = dma_map_page(real_dev, page, 0, PAGE_SIZE, dir);
  		if (dma_mapping_error(real_dev, paddr))

base-commit: c04e5d7bbf6f92a346d6b36770705e7f034df42d

#2 lore raw
Quoted 28 lines · Suzuki K Poulose
Quoted 27 lines · Sai Prakash Ranjan

From: Mao Jinlong <[email protected]>

alloc_pages_node() return should be checked before calling dma_map_page() to make sure that valid page is mapped or else it can lead to aborts as below:

  Unable to handle kernel paging request at virtual address ffffffc008000000
  Mem abort info:
  <snip>...
  pc : __dma_inv_area+0x40/0x58
  lr : dma_direct_map_page+0xd8/0x1c8

  Call trace:
   __dma_inv_area
   tmc_pages_alloc
   tmc_alloc_data_pages
   tmc_alloc_sg_table
   tmc_init_etr_sg_table
   tmc_alloc_etr_buf
   tmc_enable_etr_sink_sysfs
   tmc_enable_etr_sink
   coresight_enable_path
   coresight_enable
   enable_source_store
   dev_attr_store
   sysfs_kf_write
Quoted 7 lines
Quoted 4 lines
Fixes 99443ea19e8b ("coresight: Add generic TMC sg table framework")

Applied - thanks

Mathieu

Quoted 21 lines
Quoted 20 lines
---
  drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/hwtracing/coresight/coresight-tmc-etr.c +2 -0
index 525f0ecc129c..a31a4d7ae25e 100644
@@ -217,6 +217,8 @@ static int tmc_pages_alloc(struct tmc_pages *tmc_pages,
  		} else {
  			page = alloc_pages_node(node,
  						GFP_KERNEL | __GFP_ZERO, 0);
+			if (!page)
+				goto err;
  		}
  		paddr = dma_map_page(real_dev, page, 0, PAGE_SIZE, dir);
  		if (dma_mapping_error(real_dev, paddr))

base-commit: c04e5d7bbf6f92a346d6b36770705e7f034df42d

#3 lore raw
In reply to Sai Prakash Ranjan
This patch was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

Quoted 6 lines · On Mon, 23 Nov 2020 15:51:33 +0530 you wrote:

From: Mao Jinlong <[email protected]>

alloc_pages_node() return should be checked before calling dma_map_page() to make sure that valid page is mapped or else it can lead to aborts as below:

Quoted 7 lines
 Unable to handle kernel paging request at virtual address ffffffc008000000
 Mem abort info:
 <snip>...
 pc : __dma_inv_area+0x40/0x58
 lr : dma_direct_map_page+0xd8/0x1c8

[...]

Here is the summary with links:
- coresight: tmc-etr: Check if page is valid before dma_map_page()

    https://git.kernel.org/qcom/c/1cc573d5754e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html