tjh.dev
+1
-1
arch/mips/Kconfig
+1
-1
arch/mips/Kconfig
···
47
47
select HAVE_ARCH_TRACEHOOK
48
48
select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
49
49
select HAVE_ASM_MODVERSIONS
50
-
select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
50
+
select HAVE_EBPF_JIT if 64BIT && !CPU_MICROMIPS && TARGET_ISA_REV >= 2
51
51
select HAVE_CONTEXT_TRACKING
52
52
select HAVE_COPY_THREAD_TLS
53
53
select HAVE_C_RECORDMCOUNT
+3
arch/mips/boot/compressed/Makefile
+3
arch/mips/boot/compressed/Makefile
···
29
29
-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
30
30
-DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)
31
31
32
+
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
33
+
KCOV_INSTRUMENT := n
34
+
32
35
# decompressor objects (linked with vmlinuz)
33
36
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
34
37
+2
-1
arch/mips/include/asm/cpu-type.h
+2
-1
arch/mips/include/asm/cpu-type.h
+19
-1
arch/mips/include/asm/thread_info.h
+19
-1
arch/mips/include/asm/thread_info.h
···
49
49
.addr_limit = KERNEL_DS, \
50
50
}
51
51
52
-
/* How to get the thread information struct from C. */
52
+
/*
53
+
* A pointer to the struct thread_info for the currently executing thread is
54
+
* held in register $28/$gp.
55
+
*
56
+
* We declare __current_thread_info as a global register variable rather than a
57
+
* local register variable within current_thread_info() because clang doesn't
58
+
* support explicit local register variables.
59
+
*
60
+
* When building the VDSO we take care not to declare the global register
61
+
* variable because this causes GCC to not preserve the value of $28/$gp in
62
+
* functions that change its value (which is common in the PIC VDSO when
63
+
* accessing the GOT). Since the VDSO shouldn't be accessing
64
+
* __current_thread_info anyway we declare it extern in order to cause a link
65
+
* failure if it's referenced.
66
+
*/
67
+
#ifdef __VDSO__
68
+
extern struct thread_info *__current_thread_info;
69
+
#else
53
70
register struct thread_info *__current_thread_info __asm__("$28");
71
+
#endif
54
72
55
73
static inline struct thread_info *current_thread_info(void)
56
74
{
-13
arch/mips/include/asm/vdso/gettimeofday.h
-13
arch/mips/include/asm/vdso/gettimeofday.h
···
26
26
27
27
#define __VDSO_USE_SYSCALL ULLONG_MAX
28
28
29
-
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
30
-
31
29
static __always_inline long gettimeofday_fallback(
32
30
struct __kernel_old_timeval *_tv,
33
31
struct timezone *_tz)
···
45
47
46
48
return error ? -ret : ret;
47
49
}
48
-
49
-
#else
50
-
51
-
static __always_inline long gettimeofday_fallback(
52
-
struct __kernel_old_timeval *_tv,
53
-
struct timezone *_tz)
54
-
{
55
-
return -1;
56
-
}
57
-
58
-
#endif
59
50
60
51
static __always_inline long clock_gettime_fallback(
61
52
clockid_t _clkid,
+26
-1
arch/mips/kernel/cacheinfo.c
+26
-1
arch/mips/kernel/cacheinfo.c
···
50
50
return 0;
51
51
}
52
52
53
+
static void fill_cpumask_siblings(int cpu, cpumask_t *cpu_map)
54
+
{
55
+
int cpu1;
56
+
57
+
for_each_possible_cpu(cpu1)
58
+
if (cpus_are_siblings(cpu, cpu1))
59
+
cpumask_set_cpu(cpu1, cpu_map);
60
+
}
61
+
62
+
static void fill_cpumask_cluster(int cpu, cpumask_t *cpu_map)
63
+
{
64
+
int cpu1;
65
+
int cluster = cpu_cluster(&cpu_data[cpu]);
66
+
67
+
for_each_possible_cpu(cpu1)
68
+
if (cpu_cluster(&cpu_data[cpu1]) == cluster)
69
+
cpumask_set_cpu(cpu1, cpu_map);
70
+
}
71
+
53
72
static int __populate_cache_leaves(unsigned int cpu)
54
73
{
55
74
struct cpuinfo_mips *c = ¤t_cpu_data;
···
76
57
struct cacheinfo *this_leaf = this_cpu_ci->info_list;
77
58
78
59
if (c->icache.waysize) {
60
+
/* L1 caches are per core */
61
+
fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);
79
62
populate_cache(dcache, this_leaf, 1, CACHE_TYPE_DATA);
63
+
fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);
80
64
populate_cache(icache, this_leaf, 1, CACHE_TYPE_INST);
81
65
} else {
82
66
populate_cache(dcache, this_leaf, 1, CACHE_TYPE_UNIFIED);
83
67
}
84
68
85
-
if (c->scache.waysize)
69
+
if (c->scache.waysize) {
70
+
/* L2 cache is per cluster */
71
+
fill_cpumask_cluster(cpu, &this_leaf->shared_cpu_map);
86
72
populate_cache(scache, this_leaf, 2, CACHE_TYPE_UNIFIED);
73
+
}
87
74
88
75
if (c->tcache.waysize)
89
76
populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED);
+1
-1
arch/mips/net/ebpf_jit.c
+1
-1
arch/mips/net/ebpf_jit.c
+20
arch/mips/vdso/vgettimeofday.c
+20
arch/mips/vdso/vgettimeofday.c
···
17
17
return __cvdso_clock_gettime32(clock, ts);
18
18
}
19
19
20
+
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
21
+
22
+
/*
23
+
* This is behind the ifdef so that we don't provide the symbol when there's no
24
+
* possibility of there being a usable clocksource, because there's nothing we
25
+
* can do without it. When libc fails the symbol lookup it should fall back on
26
+
* the standard syscall path.
27
+
*/
20
28
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
21
29
struct timezone *tz)
22
30
{
23
31
return __cvdso_gettimeofday(tv, tz);
24
32
}
33
+
34
+
#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
25
35
26
36
int __vdso_clock_getres(clockid_t clock_id,
27
37
struct old_timespec32 *res)
···
53
43
return __cvdso_clock_gettime(clock, ts);
54
44
}
55
45
46
+
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
47
+
48
+
/*
49
+
* This is behind the ifdef so that we don't provide the symbol when there's no
50
+
* possibility of there being a usable clocksource, because there's nothing we
51
+
* can do without it. When libc fails the symbol lookup it should fall back on
52
+
* the standard syscall path.
53
+
*/
56
54
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
57
55
struct timezone *tz)
58
56
{
59
57
return __cvdso_gettimeofday(tv, tz);
60
58
}
59
+
60
+
#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
61
61
62
62
int __vdso_clock_getres(clockid_t clock_id,
63
63
struct __kernel_timespec *res)