Skip to contentSkip to conversation

rcuperf: Add ability to increase object allocation size

tip: core/rcu In review tip-bot2 for Joel Fernandes (Google) 5 participants 8 messages May 11, 2020 – Jun 17, 2020 RCU

lore
Share & tools
lore

tip-bot2 for Joel Fernandes (Google)

author merge bot Applied
#0 lore raw

The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     f87dc808009ac86c790031627698ef1a34c31e25
Gitweb:        https://git.kernel.org/tip/f87dc808009ac86c790031627698ef1a34c31e25
Author:        Joel Fernandes (Google) <[email protected]>
AuthorDate:    Mon, 16 Mar 2020 12:32:26 -04:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:02:50 -07:00

rcuperf: Add ability to increase object allocation size

This allows us to increase memory pressure dynamically using a new rcuperf boot command line parameter called 'rcumult'.

---
 kernel/rcu/rcuperf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/rcuperf.c +4 -1
index a4a8d09..16dd1e6 100644
@@ -88,6 +88,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
+torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
@@ -635,7 +636,7 @@ kfree_perf_thread(void *arg)
 		}
 
 		for (i = 0; i < kfree_alloc_num; i++) {
-			alloc_ptr = kmalloc(sizeof(struct kfree_obj), GFP_KERNEL);
+			alloc_ptr = kmalloc(kfree_mult * sizeof(struct kfree_obj), GFP_KERNEL);
 			if (!alloc_ptr)
 				return -ENOMEM;
 
@@ -722,6 +723,8 @@ kfree_perf_init(void)
 		schedule_timeout_uninterruptible(1);
 	}
 
+	pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
+
 	kfree_reader_tasks = kcalloc(kfree_nrealthreads, sizeof(kfree_reader_tasks[0]),
 			       GFP_KERNEL);
 	if (kfree_reader_tasks == NULL) {
#1 lore raw

PATCH 1/1 rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Quoted 42 lines · * tip-bot2 for Joel Fernandes (Google) <[email protected]> wrote:

The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     f87dc808009ac86c790031627698ef1a34c31e25
Gitweb:        https://git.kernel.org/tip/f87dc808009ac86c790031627698ef1a34c31e25
Author:        Joel Fernandes (Google) <[email protected]>
AuthorDate:    Mon, 16 Mar 2020 12:32:26 -04:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:02:50 -07:00

rcuperf: Add ability to increase object allocation size

This allows us to increase memory pressure dynamically using a new rcuperf boot command line parameter called 'rcumult'.

---
 kernel/rcu/rcuperf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/rcuperf.c +2 -1
index a4a8d09..16dd1e6 100644
@@ -88,6 +88,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
+torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
@@ -635,7 +636,7 @@ kfree_perf_thread(void *arg)
 		}
 
 		for (i = 0; i < kfree_alloc_num; i++) {
-			alloc_ptr = kmalloc(sizeof(struct kfree_obj), GFP_KERNEL);
+			alloc_ptr = kmalloc(kfree_mult * sizeof(struct kfree_obj), GFP_KERNEL);
 			if (!alloc_ptr)
 				return -ENOMEM;
 

kernel/rcu/rcuperf.c kfree_perf_init(void) · line 726

Quoted 4 lines
kernel/rcu/rcuperf.c +1 -0
@@ -722,6 +723,8 @@ kfree_perf_init(void)
 		schedule_timeout_uninterruptible(1);
 	}
 
+	pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));

There's a new build warning on certain 32-bit kernel builds due to this commit:

In file included from ./include/linux/printk.h:7,

                 from ./include/linux/kernel.h:15,
                 from kernel/rcu/rcuperf.c:13:

kernel/rcu/rcuperf.c: In function ‘kfree_perf_init’:
./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~
kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Thanks,

Ingo

 kernel/rcu/rcuperf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/rcuperf.c +1 -1
index 16dd1e6b7c09..221a0a3810e4 100644
@@ -88,7 +88,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
-torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
+torture_param(long, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
maintainer Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Quoted 77 lines · Ingo Molnar
Quoted 42 lines · * tip-bot2 for Joel Fernandes (Google) <[email protected]> wrote:

The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     f87dc808009ac86c790031627698ef1a34c31e25
Gitweb:        https://git.kernel.org/tip/f87dc808009ac86c790031627698ef1a34c31e25
Author:        Joel Fernandes (Google) <[email protected]>
AuthorDate:    Mon, 16 Mar 2020 12:32:26 -04:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:02:50 -07:00

rcuperf: Add ability to increase object allocation size

This allows us to increase memory pressure dynamically using a new rcuperf boot command line parameter called 'rcumult'.

---
 kernel/rcu/rcuperf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/rcuperf.c +2 -1
index a4a8d09..16dd1e6 100644
@@ -88,6 +88,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
+torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
@@ -635,7 +636,7 @@ kfree_perf_thread(void *arg)
 		}
 
 		for (i = 0; i < kfree_alloc_num; i++) {
-			alloc_ptr = kmalloc(sizeof(struct kfree_obj), GFP_KERNEL);
+			alloc_ptr = kmalloc(kfree_mult * sizeof(struct kfree_obj), GFP_KERNEL);
 			if (!alloc_ptr)
 				return -ENOMEM;
 

kernel/rcu/rcuperf.c kfree_perf_init(void) · line 726

Quoted 4 lines
kernel/rcu/rcuperf.c +1 -0
@@ -722,6 +723,8 @@ kfree_perf_init(void)
 		schedule_timeout_uninterruptible(1);
 	}
 
+	pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));

There's a new build warning on certain 32-bit kernel builds due to this commit:

In file included from ./include/linux/printk.h:7,

                 from ./include/linux/kernel.h:15,
                 from kernel/rcu/rcuperf.c:13:

kernel/rcu/rcuperf.c: In function ‘kfree_perf_init’:
./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~
kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u
Quoted 6 lines

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

Makes sense, and I have queued the patch below, which I am assuming that you want in the upcoming merge window. If you don't tell me otherwise, I will send you an urgent pull request later today. Or, if you just put it directly into -tip yourself:

Either way, please let me know.

Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Fair enough, especially given that perf was there first and is also way more heavily used. ;-)

But I am guessing that this one is OK for the v5.9 merge window. Either way, I will update as you say.

Thanx, Paul

------------------------------------------------------------------------

commit 2fbc7d67a2ed108e3ac63296670fecb3a42fddd0

Author: Ingo Molnar <[email protected]>
Date:   Tue May 26 12:10:01 2020 -0700

rcuperf: Fix kfree_mult to match printk() format

This commit changes the type of kfree_mult from int to long in order to match the printk() format on 32-bit systems.

kernel/rcu/rcuperf.c +1 -1
index d906ca9..fb3a1f0 100644
@@ -93,7 +93,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
-torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
+torture_param(long, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
#3 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Hi Paul,

Quoted 51 lines · Paul E. McKenney
Quoted 50 lines · Ingo Molnar
Quoted 26 lines · * tip-bot2 for Joel Fernandes (Google) <[email protected]> wrote:

The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     f87dc808009ac86c790031627698ef1a34c31e25
Gitweb:        https://git.kernel.org/tip/f87dc808009ac86c790031627698ef1a34c31e25
Author:        Joel Fernandes (Google) <[email protected]>
AuthorDate:    Mon, 16 Mar 2020 12:32:26 -04:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:02:50 -07:00

rcuperf: Add ability to increase object allocation size

This allows us to increase memory pressure dynamically using a new rcuperf boot command line parameter called 'rcumult'.

---
 kernel/rcu/rcuperf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/rcuperf.c +0 -0
index a4a8d09..16dd1e6 100644

kernel/rcu/rcuperf.c kfree_perf_init(void) · line 726

Quoted 4 lines
kernel/rcu/rcuperf.c +1 -0
@@ -722,6 +723,8 @@ kfree_perf_init(void)
            schedule_timeout_uninterruptible(1);
    }
 
+   pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));

There's a new build warning on certain 32-bit kernel builds due to this commit:

In file included from ./include/linux/printk.h:7,

                 from ./include/linux/kernel.h:15,
                 from kernel/rcu/rcuperf.c:13:

kernel/rcu/rcuperf.c: In function ‘kfree_perf_init’:
./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~

kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’

Quoted 8 lines
Quoted 8 lines
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u

This issue is now upstream.

Quoted 2 lines
Quoted 2 lines

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

sizeof() is of type size_t, which is either unsigned int (32-bit) or unsigned long (64-bit).
Hence the result of the multiplication is also of type size_t.

Quoted 4 lines
Quoted 4 lines

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

So the proper fix is Kefeng's patch from April:
"[PATCH -next] rcuperf: Fix printk format warning"
https://lore.kernel.org/r/[email protected]

":"--

Quoted 41 lines

Makes sense, and I have queued the patch below, which I am assuming that you want in the upcoming merge window. If you don't tell me otherwise, I will send you an urgent pull request later today. Or, if you just put it directly into -tip yourself:

Either way, please let me know.

Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Fair enough, especially given that perf was there first and is also way more heavily used. ;-)

But I am guessing that this one is OK for the v5.9 merge window. Either way, I will update as you say.

Thanx, Paul

------------------------------------------------------------------------

commit 2fbc7d67a2ed108e3ac63296670fecb3a42fddd0

Author: Ingo Molnar <[email protected]>
Date:   Tue May 26 12:10:01 2020 -0700

rcuperf: Fix kfree_mult to match printk() format

This commit changes the type of kfree_mult from int to long in order to match the printk() format on 32-bit systems.

kernel/rcu/rcuperf.c +0 -0
index d906ca9..fb3a1f0 100644

kernel/rcu/rcuperf.c torture_param(bool, shutdown, RCUPERF_SHUTDOWN, · line 99

Quoted 8 lines
kernel/rcu/rcuperf.c +1 -1
@@ -93,7 +93,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
-torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
+torture_param(long, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
maintainer
#4 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Quoted 73 lines · Geert Uytterhoeven

Hi Paul,

Quoted 51 lines · Paul E. McKenney
Quoted 50 lines · Ingo Molnar
Quoted 26 lines · * tip-bot2 for Joel Fernandes (Google) <[email protected]> wrote:

The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     f87dc808009ac86c790031627698ef1a34c31e25
Gitweb:        https://git.kernel.org/tip/f87dc808009ac86c790031627698ef1a34c31e25
Author:        Joel Fernandes (Google) <[email protected]>
AuthorDate:    Mon, 16 Mar 2020 12:32:26 -04:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 27 Apr 2020 11:02:50 -07:00

rcuperf: Add ability to increase object allocation size

This allows us to increase memory pressure dynamically using a new rcuperf boot command line parameter called 'rcumult'.

---
 kernel/rcu/rcuperf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/rcu/rcuperf.c +0 -0
index a4a8d09..16dd1e6 100644

kernel/rcu/rcuperf.c kfree_perf_init(void) · line 726

Quoted 4 lines
kernel/rcu/rcuperf.c +1 -0
@@ -722,6 +723,8 @@ kfree_perf_init(void)
            schedule_timeout_uninterruptible(1);
    }
 
+   pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));

There's a new build warning on certain 32-bit kernel builds due to this commit:

In file included from ./include/linux/printk.h:7,

                 from ./include/linux/kernel.h:15,
                 from kernel/rcu/rcuperf.c:13:

kernel/rcu/rcuperf.c: In function ‘kfree_perf_init’:
./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~

kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’

Quoted 8 lines
Quoted 8 lines
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u

This issue is now upstream.

Quoted 2 lines
Quoted 2 lines

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

sizeof() is of type size_t, which is either unsigned int (32-bit) or unsigned long (64-bit).
Hence the result of the multiplication is also of type size_t.

Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

So the proper fix is Kefeng's patch from April:
"[PATCH -next] rcuperf: Fix printk format warning"
https://lore.kernel.org/r/[email protected]

Apologies for not having followed up on this one.

I applied this commit and sent the pull request, CCing you.

Thanx, Paul

Quoted 61 lines

":"--

Quoted 41 lines

Makes sense, and I have queued the patch below, which I am assuming that you want in the upcoming merge window. If you don't tell me otherwise, I will send you an urgent pull request later today. Or, if you just put it directly into -tip yourself:

Either way, please let me know.

Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Fair enough, especially given that perf was there first and is also way more heavily used. ;-)

But I am guessing that this one is OK for the v5.9 merge window. Either way, I will update as you say.

Thanx, Paul

------------------------------------------------------------------------

commit 2fbc7d67a2ed108e3ac63296670fecb3a42fddd0

Author: Ingo Molnar <[email protected]>
Date:   Tue May 26 12:10:01 2020 -0700

rcuperf: Fix kfree_mult to match printk() format

This commit changes the type of kfree_mult from int to long in order to match the printk() format on 32-bit systems.

kernel/rcu/rcuperf.c +0 -0
index d906ca9..fb3a1f0 100644

kernel/rcu/rcuperf.c torture_param(bool, shutdown, RCUPERF_SHUTDOWN, · line 99

Quoted 8 lines
kernel/rcu/rcuperf.c +1 -1
@@ -93,7 +93,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
-torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
+torture_param(long, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#5 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

In reply to Ingo Molnar

On Tue, May 26, 2020 at 08:27:44PM +0200, Ingo Molnar wrote:
[...]

Quoted 21 lines

./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~
kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u
Quoted 6 lines

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

Thanks for fixing it.

Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Would it be better to call it 'RCUPERF_TEST' instead of the 'RCU_PERFORMANCE_TEST' you are proposing? I feel the word 'PERFORMANCE' is too long. Also, 'rcuperf test' instead of the 'rcu performance test' you are proposing. I am Ok with doing it however you and Paul want it though, let me know.

Paul, should I send you a renaming patch for the new performance tests as well (which I believe should be in the -dev branch).

thanks,

- Joel

Quoted 23 lines

Thanks,

Ingo

 kernel/rcu/rcuperf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/rcuperf.c +1 -1
index 16dd1e6b7c09..221a0a3810e4 100644
@@ -88,7 +88,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
 torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?");
-torture_param(int, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
+torture_param(long, kfree_mult, 1, "Multiple of kfree_obj size to allocate.");
 
 static char *perf_type = "rcu";
 module_param(perf_type, charp, 0444);
maintainer
#6 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Quoted 36 lines · Joel Fernandes

On Tue, May 26, 2020 at 08:27:44PM +0200, Ingo Molnar wrote:
[...]

Quoted 21 lines

./include/linux/kern_levels.h:5:18: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘unsigned int’ [-Wformat=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~
./include/linux/kern_levels.h:9:20: note: in expansion of macro ‘KERN_SOH’
9 | #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */
| ^~~~~~~~
./include/linux/printk.h:295:9: note: in expansion of macro ‘KERN_ALERT’
295 | printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)

      |         ^~~~~~~~~~
kernel/rcu/rcuperf.c:726:2: note: in expansion of macro ‘pr_alert’
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |  ^~~~~~~~
kernel/rcu/rcuperf.c:726:32: note: format string is defined here
  726 |  pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj));
      |                              ~~^
      |                                |
      |                                long unsigned int
      |                              %u
Quoted 6 lines

The reason for the warning is that both kfree_mult and sizeof() are 'int' types on 32-bit kernels, while the format string expects a long.

Instead of casting the type to long or tweaking the format string, the most straightforward solution is to upgrade kfree_mult to a long. Since this depends on CONFIG_RCU_PERF_TEST

Thanks for fixing it.

Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Quoted 5 lines

Would it be better to call it 'RCUPERF_TEST' instead of the 'RCU_PERFORMANCE_TEST' you are proposing? I feel the word 'PERFORMANCE' is too long. Also, 'rcuperf test' instead of the 'rcu performance test' you are proposing. I am Ok with doing it however you and Paul want it though, let me know.

As long as we are bikeshedding the name... How about refscale.c and RCU_REF_SCALE_TEST on the one hand and rcuscale.c and RCU_SCALE_TEST on the other? That keeps the names reasonably short and does not allude to perf at all.

Quoted 2 lines

Paul, should I send you a renaming patch for the new performance tests as well (which I believe should be in the -dev branch).

I am still modifying refperf/refscale/refwhatever, so I will update that one.

Thanx, Paul

maintainer
#7 lore raw

Re: [PATCH] rcu/performance: Fix kfree_perf_init() build warning on 32-bit kernels

Quoted 2 lines · Paul E. McKenney
Quoted 1 line · Joel Fernandes

On Tue, May 26, 2020 at 08:27:44PM +0200, Ingo Molnar wrote:

[ . . . ]

Quoted 10 lines
Quoted 9 lines
Quoted 3 lines

BTW., could we please also rename this code from 'PERF_TEST'/'perf test' to 'PERFORMANCE_TEST'/'performance test'? At first glance I always mistakenly believe that it's somehow related to perf, while it isn't. =B-)

Would it be better to call it 'RCUPERF_TEST' instead of the 'RCU_PERFORMANCE_TEST' you are proposing? I feel the word 'PERFORMANCE' is too long. Also, 'rcuperf test' instead of the 'rcu performance test' you are proposing. I am Ok with doing it however you and Paul want it though, let me know.

Quoted 4 lines

As long as we are bikeshedding the name... How about refscale.c and RCU_REF_SCALE_TEST on the one hand and rcuscale.c and RCU_SCALE_TEST on the other? That keeps the names reasonably short and does not allude to perf at all.

Hearing no objections, I will go with the scale/SCALE names.

Thanx, Paul