sched: move CPU field back into thread_info if THREAD_INFO_IN_TASK=y

Browse source

THREAD_INFO_IN_TASK moved the CPU field out of thread_info, but this
causes some issues on architectures that define raw_smp_processor_id()
in terms of this field, due to the fact that #include'ing linux/sched.h
to get at struct task_struct is problematic in terms of circular
dependencies.

Given that thread_info and task_struct are the same data structure
anyway when THREAD_INFO_IN_TASK=y, let's move it back so that having
access to the type definition of struct thread_info is sufficient to
reference the CPU number of the current task.

Note that this requires THREAD_INFO_IN_TASK's definition of the
task_thread_info() helper to be updated, as task_cpu() takes a
pointer-to-const, whereas task_thread_info() (which is used to generate
lvalues as well), needs a non-const pointer. So make it a macro instead.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>

...

This commit is contained in:

Ard Biesheuvel 2021-09-14 14:10:33 +02:00

parent 227d735d88

commit bcf9033e54

6 changed files with 4 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm64/kernel/asm-offsets.c

View file

2

arch/arm64/kernel/head.S

View file

2

arch/powerpc/kernel/asm-offsets.c

View file

2

arch/powerpc/kernel/smp.c

View file

13

include/linux/sched.h

View file

4

kernel/sched/sched.h

View file