mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
8c91058022
Initialize the cpu topology and therefore also the cpu to node mapping much earlier. Fixes this warning and subsequent crashes when using the fake numa emulation mode on s390: WARNING: CPU: 0 PID: 1 at include/linux/cpumask.h:121 select_task_rq+0xe6/0x1a8 CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc6-00001-ge9d867a67fd0-dirty #28 task: 00000001dd270008 ti: 00000001eccb4000 task.ti: 00000001eccb4000 Krnl PSW : 0404c00180000000 0000000000176c56 (select_task_rq+0xe6/0x1a8) R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 RI:0 EA:3 Call Trace: ([<0000000000176c30>] select_task_rq+0xc0/0x1a8) ([<0000000000177d64>] try_to_wake_up+0x2e4/0x478) ([<000000000015d46c>] create_worker+0x174/0x1c0) ([<0000000000161a98>] alloc_unbound_pwq+0x360/0x438) ([<0000000000162550>] apply_wqattrs_prepare+0x200/0x2a0) ([<000000000016266a>] apply_workqueue_attrs_locked+0x7a/0xb0) ([<0000000000162af0>] apply_workqueue_attrs+0x50/0x78) ([<000000000016441c>] __alloc_workqueue_key+0x304/0x520) ([<0000000000ee3706>] default_bdi_init+0x3e/0x70) ([<0000000000100270>] do_one_initcall+0x140/0x1d8) ([<0000000000ec9da8>] kernel_init_freeable+0x220/0x2d8) ([<0000000000984a7a>] kernel_init+0x2a/0x150) ([<00000000009913fa>] kernel_thread_starter+0x6/0xc) ([<00000000009913f4>] kernel_thread_starter+0x0/0xc) Reviewed-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
103 lines
2.7 KiB
C
103 lines
2.7 KiB
C
#ifndef _ASM_S390_TOPOLOGY_H
|
|
#define _ASM_S390_TOPOLOGY_H
|
|
|
|
#include <linux/cpumask.h>
|
|
#include <asm/numa.h>
|
|
|
|
struct sysinfo_15_1_x;
|
|
struct cpu;
|
|
|
|
#ifdef CONFIG_SCHED_TOPOLOGY
|
|
|
|
struct cpu_topology_s390 {
|
|
unsigned short thread_id;
|
|
unsigned short core_id;
|
|
unsigned short socket_id;
|
|
unsigned short book_id;
|
|
unsigned short drawer_id;
|
|
unsigned short node_id;
|
|
cpumask_t thread_mask;
|
|
cpumask_t core_mask;
|
|
cpumask_t book_mask;
|
|
cpumask_t drawer_mask;
|
|
};
|
|
|
|
extern struct cpu_topology_s390 cpu_topology[NR_CPUS];
|
|
extern cpumask_t cpus_with_topology;
|
|
|
|
#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)
|
|
#define topology_thread_id(cpu) (cpu_topology[cpu].thread_id)
|
|
#define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_mask)
|
|
#define topology_core_id(cpu) (cpu_topology[cpu].core_id)
|
|
#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_mask)
|
|
#define topology_book_id(cpu) (cpu_topology[cpu].book_id)
|
|
#define topology_book_cpumask(cpu) (&cpu_topology[cpu].book_mask)
|
|
#define topology_drawer_id(cpu) (cpu_topology[cpu].drawer_id)
|
|
#define topology_drawer_cpumask(cpu) (&cpu_topology[cpu].drawer_mask)
|
|
|
|
#define mc_capable() 1
|
|
|
|
void topology_init_early(void);
|
|
int topology_cpu_init(struct cpu *);
|
|
int topology_set_cpu_management(int fc);
|
|
void topology_schedule_update(void);
|
|
void store_topology(struct sysinfo_15_1_x *info);
|
|
void topology_expect_change(void);
|
|
const struct cpumask *cpu_coregroup_mask(int cpu);
|
|
|
|
#else /* CONFIG_SCHED_TOPOLOGY */
|
|
|
|
static inline void topology_init_early(void) { }
|
|
static inline void topology_schedule_update(void) { }
|
|
static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
|
|
static inline void topology_expect_change(void) { }
|
|
|
|
#endif /* CONFIG_SCHED_TOPOLOGY */
|
|
|
|
#define POLARIZATION_UNKNOWN (-1)
|
|
#define POLARIZATION_HRZ (0)
|
|
#define POLARIZATION_VL (1)
|
|
#define POLARIZATION_VM (2)
|
|
#define POLARIZATION_VH (3)
|
|
|
|
#define SD_BOOK_INIT SD_CPU_INIT
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
#define cpu_to_node cpu_to_node
|
|
static inline int cpu_to_node(int cpu)
|
|
{
|
|
return cpu_topology[cpu].node_id;
|
|
}
|
|
|
|
/* Returns a pointer to the cpumask of CPUs on node 'node'. */
|
|
#define cpumask_of_node cpumask_of_node
|
|
static inline const struct cpumask *cpumask_of_node(int node)
|
|
{
|
|
return &node_to_cpumask_map[node];
|
|
}
|
|
|
|
/*
|
|
* Returns the number of the node containing node 'node'. This
|
|
* architecture is flat, so it is a pretty simple function!
|
|
*/
|
|
#define parent_node(node) (node)
|
|
|
|
#define pcibus_to_node(bus) __pcibus_to_node(bus)
|
|
|
|
#define node_distance(a, b) __node_distance(a, b)
|
|
|
|
#else /* !CONFIG_NUMA */
|
|
|
|
#define numa_node_id numa_node_id
|
|
static inline int numa_node_id(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_S390_TOPOLOGY_H */
|