mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
eb37345ed2
commit 178d52c6e89c38d0553b0ac8b99927b11eb995b0 upstream. In kup.h we currently include kup-radix.h for all 64-bit builds, which includes Book3S and Book3E. The latter doesn't make sense, Book3E never uses the Radix MMU. This has worked up until now, but almost by accident, and the recent uaccess flush changes introduced a build breakage on Book3E because of the bad structure of the code. So disentangle things so that we only use kup-radix.h for Book3S. This requires some more stubs in kup.h. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
111 lines
2.6 KiB
C
111 lines
2.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_POWERPC_KUP_H_
|
|
#define _ASM_POWERPC_KUP_H_
|
|
|
|
#define KUAP_READ 1
|
|
#define KUAP_WRITE 2
|
|
#define KUAP_READ_WRITE (KUAP_READ | KUAP_WRITE)
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S_64
|
|
#include <asm/book3s/64/kup-radix.h>
|
|
#endif
|
|
#ifdef CONFIG_PPC_8xx
|
|
#include <asm/nohash/32/kup-8xx.h>
|
|
#endif
|
|
#ifdef CONFIG_PPC_BOOK3S_32
|
|
#include <asm/book3s/32/kup.h>
|
|
#endif
|
|
|
|
#ifdef __ASSEMBLY__
|
|
#ifndef CONFIG_PPC_KUAP
|
|
.macro kuap_save_and_lock sp, thread, gpr1, gpr2, gpr3
|
|
.endm
|
|
|
|
.macro kuap_restore sp, current, gpr1, gpr2, gpr3
|
|
.endm
|
|
|
|
.macro kuap_restore_amr gpr
|
|
.endm
|
|
|
|
.macro kuap_check current, gpr
|
|
.endm
|
|
|
|
.macro kuap_check_amr gpr1, gpr2
|
|
.endm
|
|
|
|
#endif
|
|
|
|
#else /* !__ASSEMBLY__ */
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
void setup_kup(void);
|
|
|
|
#ifdef CONFIG_PPC_KUEP
|
|
void setup_kuep(bool disabled);
|
|
#else
|
|
static inline void setup_kuep(bool disabled) { }
|
|
#endif /* CONFIG_PPC_KUEP */
|
|
|
|
#ifdef CONFIG_PPC_KUAP
|
|
void setup_kuap(bool disabled);
|
|
#else
|
|
static inline void setup_kuap(bool disabled) { }
|
|
|
|
static inline bool
|
|
bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline void kuap_check_amr(void) { }
|
|
|
|
/*
|
|
* book3s/64/kup-radix.h defines these functions for the !KUAP case to flush
|
|
* the L1D cache after user accesses. Only include the empty stubs for other
|
|
* platforms.
|
|
*/
|
|
#ifndef CONFIG_PPC_BOOK3S_64
|
|
static inline void allow_user_access(void __user *to, const void __user *from,
|
|
unsigned long size, unsigned long dir) { }
|
|
static inline void prevent_user_access(void __user *to, const void __user *from,
|
|
unsigned long size, unsigned long dir) { }
|
|
#endif /* CONFIG_PPC_BOOK3S_64 */
|
|
#endif /* CONFIG_PPC_KUAP */
|
|
|
|
static inline void allow_read_from_user(const void __user *from, unsigned long size)
|
|
{
|
|
allow_user_access(NULL, from, size, KUAP_READ);
|
|
}
|
|
|
|
static inline void allow_write_to_user(void __user *to, unsigned long size)
|
|
{
|
|
allow_user_access(to, NULL, size, KUAP_WRITE);
|
|
}
|
|
|
|
static inline void allow_read_write_user(void __user *to, const void __user *from,
|
|
unsigned long size)
|
|
{
|
|
allow_user_access(to, from, size, KUAP_READ_WRITE);
|
|
}
|
|
|
|
static inline void prevent_read_from_user(const void __user *from, unsigned long size)
|
|
{
|
|
prevent_user_access(NULL, from, size, KUAP_READ);
|
|
}
|
|
|
|
static inline void prevent_write_to_user(void __user *to, unsigned long size)
|
|
{
|
|
prevent_user_access(to, NULL, size, KUAP_WRITE);
|
|
}
|
|
|
|
static inline void prevent_read_write_user(void __user *to, const void __user *from,
|
|
unsigned long size)
|
|
{
|
|
prevent_user_access(to, from, size, KUAP_READ_WRITE);
|
|
}
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* _ASM_POWERPC_KUAP_H_ */
|