Skip to contentSkip to conversation

nommu: remove __GFP_HIGHMEM in vmalloc/vzalloc

PATCH Applied Chen Li 3 participants 3 messages May 3, 2021 – May 5, 2021

Subsystems (2)

v1 of 2 Applied 1/1 Latest is v2 →

lore
Share & tools
lore

Chen Li

author
#0 lore raw

PATCH 1/1 nommu: remove __GFP_HIGHMEM in vmalloc/vzalloc

From mm/nommu.c:
void *__vmalloc(unsigned long size, gfp_t gfp_mask)

{
	/*
	 *  You can't specify __GFP_HIGHMEM with kmalloc() since kmalloc()
	 * returns only a logical address.
	 */
	return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM);
}

nommu's __vmalloc just uses kmalloc internally and elimitates __GFP_HIGHMEM, so it makes no sense to add __GFP_HIGHMEM for nommu's vmalloc/vzalloc.

---
 mm/nommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/nommu.c +2 -2
index 5c9ab799c0e6..339a2f2eb1aa 100644
@@ -233,7 +233,7 @@ long vwrite(char *buf, char *addr, unsigned long count)
  */
 void *vmalloc(unsigned long size)
 {
-       return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM);
+       return __vmalloc(size, GFP_KERNEL);
 }
 EXPORT_SYMBOL(vmalloc);
 
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(vmalloc);
  */
 void *vzalloc(unsigned long size)
 {
-	return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
+	return __vmalloc(size, GFP_KERNEL | __GFP_ZERO);
 }
 EXPORT_SYMBOL(vzalloc);
 
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Chen Li

From mm/nommu.c:
void *__vmalloc(unsigned long size, gfp_t gfp_mask)

{
	/*
	 *  You can't specify __GFP_HIGHMEM with kmalloc() since kmalloc()
	 * returns only a logical address.
	 */
	return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM);
}
Quoted 2 lines

nommu's __vmalloc just uses kmalloc internally and elimitates __GFP_HIGHMEM, so it makes no sense to add __GFP_HIGHMEM for nommu's vmalloc/vzalloc.

I think this was originally [1] a copy of vmalloc() from vmalloc.c, but of course the two have drifted apart over time. At the time, vmalloc.c's vmalloc() looked like this:

+void * vmalloc (unsigned long size)
+{
+ return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL);
+}

[1] And I do mean originally; this was present in Alan Cox's original submission of mm/nommu.c in 2002.

This patch makes sense to me, although I don't imagine it makes much difference.

Quoted 33 lines
---
 mm/nommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/nommu.c +2 -2
index 5c9ab799c0e6..339a2f2eb1aa 100644
@@ -233,7 +233,7 @@ long vwrite(char *buf, char *addr, unsigned long count)
  */
 void *vmalloc(unsigned long size)
 {
-       return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM);
+       return __vmalloc(size, GFP_KERNEL);
 }
 EXPORT_SYMBOL(vmalloc);
 
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(vmalloc);
  */
 void *vzalloc(unsigned long size)
 {
-	return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
+	return __vmalloc(size, GFP_KERNEL | __GFP_ZERO);
 }
 EXPORT_SYMBOL(vzalloc);
 
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Chen Li
Quoted 34 lines · Chen Li

From mm/nommu.c:
void *__vmalloc(unsigned long size, gfp_t gfp_mask)

{
	/*
	 *  You can't specify __GFP_HIGHMEM with kmalloc() since kmalloc()
	 * returns only a logical address.
	 */
	return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM);
}

nommu's __vmalloc just uses kmalloc internally and elimitates __GFP_HIGHMEM, so it makes no sense to add __GFP_HIGHMEM for nommu's vmalloc/vzalloc.

---
  mm/nommu.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
mm/nommu.c +1 -1
index 5c9ab799c0e6..339a2f2eb1aa 100644
@@ -233,7 +233,7 @@ long vwrite(char *buf, char *addr, unsigned long count)
   */
  void *vmalloc(unsigned long size)
  {
-       return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM);
+       return __vmalloc(size, GFP_KERNEL);
  }
  EXPORT_SYMBOL(vmalloc);
 

mm/nommu.c EXPORT_SYMBOL(vmalloc); · line 257

Quoted 8 lines
mm/nommu.c +1 -1
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(vmalloc);
   */
  void *vzalloc(unsigned long size)
  {
-	return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
+	return __vmalloc(size, GFP_KERNEL | __GFP_ZERO);
  }
  EXPORT_SYMBOL(vzalloc);
 
Signature · 3 lines
Thanks,

David / dhildenb