diff options
Diffstat (limited to 'lib/smp_processor_id.c')
| -rw-r--r-- | lib/smp_processor_id.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index 85925aaa4fff..94b3f6b19538 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -5,10 +5,11 @@ * DEBUG_PREEMPT variant of smp_processor_id(). */ #include <linux/export.h> +#include <linux/kprobes.h> #include <linux/sched.h> -notrace static unsigned int check_preemption_disabled(const char *what1, - const char *what2) +noinstr static +unsigned int check_preemption_disabled(const char *what1, const char *what2) { int this_cpu = raw_smp_processor_id(); @@ -18,11 +19,10 @@ notrace static unsigned int check_preemption_disabled(const char *what1, if (irqs_disabled()) goto out; - /* - * Kernel threads bound to a single CPU can safely use - * smp_processor_id(): - */ - if (cpumask_equal(¤t->cpus_allowed, cpumask_of(this_cpu))) + if (is_percpu_thread()) + goto out; + + if (current->migration_disabled) goto out; /* @@ -36,6 +36,7 @@ notrace static unsigned int check_preemption_disabled(const char *what1, */ preempt_disable_notrace(); + instrumentation_begin(); if (!printk_ratelimit()) goto out_enable; @@ -46,18 +47,19 @@ notrace static unsigned int check_preemption_disabled(const char *what1, dump_stack(); out_enable: + instrumentation_end(); preempt_enable_no_resched_notrace(); out: return this_cpu; } -notrace unsigned int debug_smp_processor_id(void) +noinstr unsigned int debug_smp_processor_id(void) { return check_preemption_disabled("smp_processor_id", ""); } EXPORT_SYMBOL(debug_smp_processor_id); -notrace void __this_cpu_preempt_check(const char *op) +noinstr void __this_cpu_preempt_check(const char *op) { check_preemption_disabled("__this_cpu_", op); } |