Commit 6a123d6a authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

cpuidle, ACPI: Make noinstr clean 



objtool found cases where ACPI methods called out into instrumentation code:

  vmlinux.o: warning: objtool: io_idle+0xc: call to __inb.isra.0() leaves .noinstr.text section
  vmlinux.o: warning: objtool: acpi_idle_enter+0xfe: call to num_online_cpus() leaves .noinstr.text section
  vmlinux.o: warning: objtool: acpi_idle_enter+0x115: call to acpi_idle_fallback_to_c1.isra.0() leaves .noinstr.text section

Fix this by: marking the IO in/out, acpi_idle_fallback_to_c1() and
num_online_cpus() methods as __always_inline.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195541.294846301@infradead.org
parent 10fdb38c

arch/x86/include/asm/shared/io.h

+2 −2
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
#include <linux/types.h>



#define BUILDIO(bwl, bw, type)						\

static inline void __out##bwl(type value, u16 port)			\

static __always_inline void __out##bwl(type value, u16 port)		\

{									\

	asm volatile("out" #bwl " %" #bw "0, %w1"			\

		     : : "a"(value), "Nd"(port));			\

}									\

									\

static inline type __in##bwl(u16 port)					\

static __always_inline type __in##bwl(u16 port)				\

{									\

	type value;							\

	asm volatile("in" #bwl " %w1, %" #bw "0"			\

drivers/acpi/processor_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) 
	return 0;

}



static bool acpi_idle_fallback_to_c1(struct acpi_processor *pr)

static __always_inline bool acpi_idle_fallback_to_c1(struct acpi_processor *pr)

{

	return IS_ENABLED(CONFIG_HOTPLUG_CPU) && !pr->flags.has_cst &&

		!(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED);

include/linux/cpumask.h

+2 −2
Original line number Diff line number Diff line
@@ -1017,9 +1017,9 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu) 
 * concurrent CPU hotplug operations unless invoked from a cpuhp_lock held

 * region.

 */

static inline unsigned int num_online_cpus(void)

static __always_inline unsigned int num_online_cpus(void)

{

	return atomic_read(&__num_online_cpus);

	return arch_atomic_read(&__num_online_cpus);

}

#define num_possible_cpus()	cpumask_weight(cpu_possible_mask)

#define num_present_cpus()	cpumask_weight(cpu_present_mask)