kernel/profile.c: use cpumask_available to check for NULL cpumask 64/292564/1
authorNathan Chancellor <natechancellor@gmail.com>
Thu, 5 Dec 2019 00:50:50 +0000 (16:50 -0800)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Mon, 8 May 2023 09:35:55 +0000 (18:35 +0900)
When building with clang + -Wtautological-pointer-compare, these
instances pop up:

  kernel/profile.c:339:6: warning: comparison of array 'prof_cpu_mask' not equal to a null pointer is always true [-Wtautological-pointer-compare]
          if (prof_cpu_mask != NULL)
              ^~~~~~~~~~~~~    ~~~~
  kernel/profile.c:376:6: warning: comparison of array 'prof_cpu_mask' not equal to a null pointer is always true [-Wtautological-pointer-compare]
          if (prof_cpu_mask != NULL)
              ^~~~~~~~~~~~~    ~~~~
  kernel/profile.c:406:26: warning: comparison of array 'prof_cpu_mask' not equal to a null pointer is always true [-Wtautological-pointer-compare]
          if (!user_mode(regs) && prof_cpu_mask != NULL &&
                                ^~~~~~~~~~~~~    ~~~~
  3 warnings generated.

This can be addressed with the cpumask_available helper, introduced in
commit f7e30f01a9e2 ("cpumask: Add helper cpumask_available()") to fix
warnings like this while keeping the code the same.

Link: https://github.com/ClangBuiltLinux/linux/issues/747
Link: http://lkml.kernel.org/r/20191022191957.9554-1-natechancellor@gmail.com
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[sw0312.kim: backport upstream commit ef70eff9dea6 to resolve gcc-12 build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: Ifbe97caa3ee7b2db0f071ba036218db7fe5a58fd

kernel/profile.c

index 2dbccf2..7d1a426 100644 (file)
@@ -333,7 +333,7 @@ static int profile_dead_cpu(unsigned int cpu)
        struct page *page;
        int i;
 
-       if (prof_cpu_mask != NULL)
+       if (cpumask_available(prof_cpu_mask))
                cpumask_clear_cpu(cpu, prof_cpu_mask);
 
        for (i = 0; i < 2; i++) {
@@ -370,7 +370,7 @@ static int profile_prepare_cpu(unsigned int cpu)
 
 static int profile_online_cpu(unsigned int cpu)
 {
-       if (prof_cpu_mask != NULL)
+       if (cpumask_available(prof_cpu_mask))
                cpumask_set_cpu(cpu, prof_cpu_mask);
 
        return 0;
@@ -400,7 +400,7 @@ void profile_tick(int type)
 {
        struct pt_regs *regs = get_irq_regs();
 
-       if (!user_mode(regs) && prof_cpu_mask != NULL &&
+       if (!user_mode(regs) && cpumask_available(prof_cpu_mask) &&
            cpumask_test_cpu(smp_processor_id(), prof_cpu_mask))
                profile_hit(type, (void *)profile_pc(regs));
 }