iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error-injection: Consolidate override function definition

Browse Source 
The function override_function_with_return() is defined separately for
each architecture and every architecture's definition is almost same
with each other.  E.g. x86 and powerpc both define function in its own
asm/error-injection.h header and override_function_with_return() has
the same definition, the only difference is that x86 defines an extra
function just_return_func() but it is specific for x86 and is only used
by x86's override_function_with_return(), so don't need to export this
function.

This patch consolidates override_function_with_return() definition into
asm-generic/error-injection.h header, thus all architectures can use the
common definition.  As result, the architecture specific headers are
removed; the include/linux/error-injection.h header also changes to
include asm-generic/error-injection.h header rather than architecture
header, furthermore, it includes linux/compiler.h for successful
compilation.

Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Leo Yan 2019-08-06 18:00:13 +08:00 committed by Will Deacon
parent e21a712a96
commit 45880f7b7b
4 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/include/asm/error-injection.h
View File

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _ASM_ERROR_INJECTION_H
#define _ASM_ERROR_INJECTION_H
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/ptrace.h>
#include <asm-generic/error-injection.h>
void override_function_with_return(struct pt_regs *regs);
#endif /* _ASM_ERROR_INJECTION_H */

13
arch/x86/include/asm/error-injection.h
View File

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_ERROR_INJECTION_H
#define _ASM_ERROR_INJECTION_H
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/ptrace.h>
#include <asm-generic/error-injection.h>
asmlinkage void just_return_func(void);
void override_function_with_return(struct pt_regs *regs);
#endif /* _ASM_ERROR_INJECTION_H */

6
include/asm-generic/error-injection.h
View File

@ -16,6 +16,8 @@ struct error_injection_entry {
int etype; int etype;
}; };
struct pt_regs;
#ifdef CONFIG_FUNCTION_ERROR_INJECTION #ifdef CONFIG_FUNCTION_ERROR_INJECTION
/* /*
* Whitelist ganerating macro. Specify functions which can be * Whitelist ganerating macro. Specify functions which can be
@ -28,8 +30,12 @@ static struct error_injection_entry __used \
.addr = (unsigned long)fname, \ .addr = (unsigned long)fname, \
.etype = EI_ETYPE_##_etype, \ .etype = EI_ETYPE_##_etype, \
}; };
void override_function_with_return(struct pt_regs *regs);
#else #else
#define ALLOW_ERROR_INJECTION(fname, _etype) #define ALLOW_ERROR_INJECTION(fname, _etype)
static inline void override_function_with_return(struct pt_regs *regs) { }
#endif #endif
#endif #endif

6
include/linux/error-injection.h
View File

@ -2,16 +2,16 @@
#ifndef _LINUX_ERROR_INJECTION_H #ifndef _LINUX_ERROR_INJECTION_H
#define _LINUX_ERROR_INJECTION_H #define _LINUX_ERROR_INJECTION_H
#ifdef CONFIG_FUNCTION_ERROR_INJECTION #include <linux/compiler.h>
#include <asm-generic/error-injection.h>
#include <asm/error-injection.h> #ifdef CONFIG_FUNCTION_ERROR_INJECTION
extern bool within_error_injection_list(unsigned long addr); extern bool within_error_injection_list(unsigned long addr);
extern int get_injectable_error_type(unsigned long addr); extern int get_injectable_error_type(unsigned long addr);
#else /* !CONFIG_FUNCTION_ERROR_INJECTION */ #else /* !CONFIG_FUNCTION_ERROR_INJECTION */
#include <asm-generic/error-injection.h>
static inline bool within_error_injection_list(unsigned long addr) static inline bool within_error_injection_list(unsigned long addr)
{ {
return false; return false;