Skip to contentSkip to conversation

staging: android: ion: Zero CMA allocated memory

PATCH In review Liam Mark 3 participants 4 messages Jan 26, 2018 – Feb 6, 2018 Staging

lore
Share & tools
lore

Liam Mark

author
#0 lore raw

PATCH v3 1/1 staging: android: ion: Zero CMA allocated memory

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

Changes in v3:
- Add support for highmem pages

 drivers/staging/android/ion/ion_cma_heap.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +17 -0
index 86196ffd2faf..fa3e4b7e0c9f 100644
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/cma.h>
 #include <linux/scatterlist.h>
+#include <linux/highmem.h>
 
 #include "ion.h"
 
@@ -51,6 +52,22 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
 	if (!pages)
 		return -ENOMEM;
 
+	if (PageHighMem(pages)) {
+		unsigned long nr_clear_pages = nr_pages;
+		struct page *page = pages;
+
+		while (nr_clear_pages > 0) {
+			void *vaddr = kmap_atomic(page);
+
+			memset(vaddr, 0, PAGE_SIZE);
+			kunmap_atomic(vaddr);
+			page++;
+			nr_clear_pages--;
+		}
+	} else {
+		memset(page_address(pages), 0, size);
+	}
+
 	table = kmalloc(sizeof(*table), GFP_KERNEL);
 	if (!table)
 		goto err;
Signature · 5 lines
1.8.5.2


Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 35 lines · Liam Mark

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

Changes in v3:
- Add support for highmem pages

 drivers/staging/android/ion/ion_cma_heap.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +1 -0
index 86196ffd2faf..fa3e4b7e0c9f 100644
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 #include <linux/cma.h>
 #include <linux/scatterlist.h>
+#include <linux/highmem.h>
 
 #include "ion.h"
 
@@ -51,6 +52,22 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
 	if (!pages)
 		return -ENOMEM;

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 63

Quoted 10 lines
drivers/staging/android/ion/ion_cma_heap.c +9 -0
 
+	if (PageHighMem(pages)) {
+		unsigned long nr_clear_pages = nr_pages;
+		struct page *page = pages;
+
+		while (nr_clear_pages > 0) {
+			void *vaddr = kmap_atomic(page);
+
+			memset(vaddr, 0, PAGE_SIZE);
+			kunmap_atomic(vaddr);

Here. This way may cause performance latency at mapping-memset-umap page one bye one.

Take a look at ion_heap_pages_zero.

Not very critical, arm64 always have linear mapping.

Quoted 11 lines
drivers/staging/android/ion/ion_cma_heap.c +7 -0
+			page++;
+			nr_clear_pages--;
+		}
+	} else {
+		memset(page_address(pages), 0, size);
+	}
+
 	table = kmalloc(sizeof(*table), GFP_KERNEL);
 	if (!table)
 		goto err;
#2 lore raw
Quoted 51 lines · Chen Feng
Quoted 35 lines · Liam Mark

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

Changes in v3:
- Add support for highmem pages

  drivers/staging/android/ion/ion_cma_heap.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +1 -0
index 86196ffd2faf..fa3e4b7e0c9f 100644
@@ -21,6 +21,7 @@
  #include <linux/err.h>
  #include <linux/cma.h>
  #include <linux/scatterlist.h>
+#include <linux/highmem.h>
 
  #include "ion.h"
 
@@ -51,6 +52,22 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
  	if (!pages)
  		return -ENOMEM;

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 63

Quoted 10 lines
drivers/staging/android/ion/ion_cma_heap.c +9 -0
 
+	if (PageHighMem(pages)) {
+		unsigned long nr_clear_pages = nr_pages;
+		struct page *page = pages;
+
+		while (nr_clear_pages > 0) {
+			void *vaddr = kmap_atomic(page);
+
+			memset(vaddr, 0, PAGE_SIZE);
+			kunmap_atomic(vaddr);

Here. This way may cause performance latency at mapping-memset-umap page one bye one.

Quoted 4 lines

Take a look at ion_heap_pages_zero.

Not very critical, arm64 always have linear mapping.

This is under a PageHighMem check so arm64 isn't affected. It's also the same algorithm arm32 dma-mapping.c uses so I'd like to see some data about the performance improvement before we go changing things too much.

Thanks,
Laura

Quoted 13 lines

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 73

Quoted 12 lines
drivers/staging/android/ion/ion_cma_heap.c +7 -0
+			page++;
+			nr_clear_pages--;
+		}
+	} else {
+		memset(page_address(pages), 0, size);
+	}
+
  	table = kmalloc(sizeof(*table), GFP_KERNEL);
  	if (!table)
  		goto err;

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Acked-by on v3 1/1
#3 lore raw
In reply to Liam Mark
Quoted 7 lines · Liam Mark

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Quoted 49 lines
Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

Changes in v3:
- Add support for highmem pages

  drivers/staging/android/ion/ion_cma_heap.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +17 -0
index 86196ffd2faf..fa3e4b7e0c9f 100644
@@ -21,6 +21,7 @@
  #include <linux/err.h>
  #include <linux/cma.h>
  #include <linux/scatterlist.h>
+#include <linux/highmem.h>
 
  #include "ion.h"
 
@@ -51,6 +52,22 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
  	if (!pages)
  		return -ENOMEM;
 
+	if (PageHighMem(pages)) {
+		unsigned long nr_clear_pages = nr_pages;
+		struct page *page = pages;
+
+		while (nr_clear_pages > 0) {
+			void *vaddr = kmap_atomic(page);
+
+			memset(vaddr, 0, PAGE_SIZE);
+			kunmap_atomic(vaddr);
+			page++;
+			nr_clear_pages--;
+		}
+	} else {
+		memset(page_address(pages), 0, size);
+	}
+
  	table = kmalloc(sizeof(*table), GFP_KERNEL);
  	if (!table)
  		goto err;