Skip to contentSkip to conversation

mm/mmap: use SZ_{8M, 128M} helper macro

PATCH Superseded Yajun Deng 2 participants 3 messages Jan 26, 2024 – Jan 30, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yajun Deng

author
#0 lore raw

PATCH 1/1 mm/mmap: use SZ_{8M, 128M} helper macro

Use SZ_{8M, 128M} macro intead of the number in init_user_reserve and reserve_mem_notifier.

---
 mm/mmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
mm/mmap.c +4 -4
index 476de5daf598..f90924b2a6d2 100644
@@ -3845,7 +3845,7 @@ static int init_user_reserve(void)
 
 	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17);
+	sysctl_user_reserve_kbytes = min(free_kbytes / 32, SZ_128M);
 	return 0;
 }
 subsys_initcall(init_user_reserve);
@@ -3866,7 +3866,7 @@ static int init_admin_reserve(void)
 
 	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13);
+	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, SZ_8M);
 	return 0;
 }
 subsys_initcall(init_admin_reserve);
@@ -3898,12 +3898,12 @@ static int reserve_mem_notifier(struct notifier_block *nb,
 	case MEM_ONLINE:
 		/* Default max is 128MB. Leave alone if modified by operator. */
 		tmp = sysctl_user_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 17))
+		if (tmp > 0 && tmp < SZ_128M)
 			init_user_reserve();
 
 		/* Default max is 8MB.  Leave alone if modified by operator. */
 		tmp = sysctl_admin_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 13))
+		if (tmp > 0 && tmp < SZ_8M)
 			init_admin_reserve();
 
 		break;
Signature · 1 line
2.25.1
#1 lore raw
Quoted 13 lines · Yajun Deng

Use SZ_{8M, 128M} macro intead of the number in init_user_reserve and reserve_mem_notifier.

---
 mm/mmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
mm/mmap.c +0 -0
index 476de5daf598..f90924b2a6d2 100644

mm/mmap.c static int init_user_reserve(void) · line 3848

Quoted 5 lines
mm/mmap.c +1 -1
@@ -3845,7 +3845,7 @@ static int init_user_reserve(void)
 
 	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17);
+	sysctl_user_reserve_kbytes = min(free_kbytes / 32, SZ_128M);

(1UL << 17) != SZ_128M

Quoted 14 lines
mm/mmap.c +1 -1
 	return 0;
 }
 subsys_initcall(init_user_reserve);
@@ -3866,7 +3866,7 @@ static int init_admin_reserve(void)
 
 	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13);
+	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, SZ_8M);
 	return 0;
 }
 subsys_initcall(init_admin_reserve);
@@ -3898,12 +3898,12 @@ static int reserve_mem_notifier(struct notifier_block *nb,
 	case MEM_ONLINE:

mm/mmap.c static int reserve_mem_notifier(struct notifier_block *nb, · line 3906

Quoted 10 lines
mm/mmap.c +2 -2
 		/* Default max is 128MB. Leave alone if modified by operator. */
 		tmp = sysctl_user_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 17))
+		if (tmp > 0 && tmp < SZ_128M)
 			init_user_reserve();
 
 		/* Default max is 8MB.  Leave alone if modified by operator. */
 		tmp = sysctl_admin_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 13))
+		if (tmp > 0 && tmp < SZ_8M)

(1UL << 13) != SZ_8M

Quoted 7 lines
mm/mmap.c +0 -0
 			init_admin_reserve();
 
 		break;
Signature · 1 line
2.25.1
Signature · 2 lines
Sincerely yours,
Mike.
author
#2 lore raw
Quoted 15 lines · Mike Rapoport
Quoted 14 lines · Yajun Deng

Use SZ_{8M, 128M} macro intead of the number in init_user_reserve and reserve_mem_notifier.

---
  mm/mmap.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
mm/mmap.c +0 -0
index 476de5daf598..f90924b2a6d2 100644
@@ -3845,7 +3845,7 @@ static int init_user_reserve(void)
 
Quoted 5 lines

mm/mmap.c static int init_user_reserve(void) · line 3848

Quoted 4 lines
mm/mmap.c +1 -1
  	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17);
+	sysctl_user_reserve_kbytes = min(free_kbytes / 32, SZ_128M);

(1UL << 17) != SZ_128M

I am sorry for this, I didn't realize that the unit was kbyte.

Quoted 34 lines
Quoted 15 lines
mm/mmap.c +1 -1
  	return 0;
  }
  subsys_initcall(init_user_reserve);
@@ -3866,7 +3866,7 @@ static int init_admin_reserve(void)
 
  	free_kbytes = K(global_zone_page_state(NR_FREE_PAGES));
 
-	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13);
+	sysctl_admin_reserve_kbytes = min(free_kbytes / 32, SZ_8M);
  	return 0;
  }
  subsys_initcall(init_admin_reserve);
@@ -3898,12 +3898,12 @@ static int reserve_mem_notifier(struct notifier_block *nb,
  	case MEM_ONLINE:

mm/mmap.c static int reserve_mem_notifier(struct notifier_block *nb, · line 3906

Quoted 10 lines
mm/mmap.c +2 -2
  		/* Default max is 128MB. Leave alone if modified by operator. */
  		tmp = sysctl_user_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 17))
+		if (tmp > 0 && tmp < SZ_128M)
  			init_user_reserve();
 
  		/* Default max is 8MB.  Leave alone if modified by operator. */
  		tmp = sysctl_admin_reserve_kbytes;
-		if (0 < tmp && tmp < (1UL << 13))
+		if (tmp > 0 && tmp < SZ_8M)

(1UL << 13) != SZ_8M

Quoted 7 lines
mm/mmap.c +0 -0
  			init_admin_reserve();
 
  		break;
Signature · 1 line
2.25.1