2019-04-26 03:00:13

by Xiongfeng Wang

Subject: [PATCH] firmware: arm_sdei: Prohibit probing in '_sdei_handler'

Functions called in '_sdei_handler' are needed to be marked as
'nokprobe'. Because these functions are called in NMI context and
neither the arch-code's debug infrastructure nor kprobes core supports
this.

Signed-off-by: Xiongfeng Wang <[email protected]>
Reviewed-by: James Morse <[email protected]>
---
drivers/firmware/arm_sdei.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index e6376f9..9cd70d1 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -165,6 +165,7 @@ static int invoke_sdei_fn(unsigned long function_id, unsigned long arg0,

return err;
}
+NOKPROBE_SYMBOL(invoke_sdei_fn);

static struct sdei_event *sdei_event_find(u32 event_num)
{
@@ -879,6 +880,7 @@ static void sdei_smccc_smc(unsigned long function_id,
{
arm_smccc_smc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res);
}
+NOKPROBE_SYMBOL(sdei_smccc_smc);

static void sdei_smccc_hvc(unsigned long function_id,
unsigned long arg0, unsigned long arg1,
@@ -887,6 +889,7 @@ static void sdei_smccc_hvc(unsigned long function_id,
{
arm_smccc_hvc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res);
}
+NOKPROBE_SYMBOL(sdei_smccc_hvc);

int sdei_register_ghes(struct ghes *ghes, sdei_event_callback *normal_cb,
sdei_event_callback *critical_cb)
--
1.7.12.4

2019-04-29 15:52:52

by Will Deacon

Subject: Re: [PATCH] firmware: arm_sdei: Prohibit probing in '_sdei_handler'

On Fri, Apr 26, 2019 at 10:16:36AM +0800, Xiongfeng Wang wrote:
> Functions called in '_sdei_handler' are needed to be marked as
> 'nokprobe'. Because these functions are called in NMI context and
> neither the arch-code's debug infrastructure nor kprobes core supports
> this.
>
> Signed-off-by: Xiongfeng Wang <[email protected]>
> Reviewed-by: James Morse <[email protected]>
> ---
> drivers/firmware/arm_sdei.c | 3 +++
> 1 file changed, 3 insertions(+)

Queued for 5.2. Thanks.

Will