From: Will Deacon <will@kernel.org> To: Qais Yousef <qais.yousef@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>, Masami Hiramatsu <mhiramat@kernel.org>, Jean-Philippe Brucker <jean-philippe@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: kprobes: Fix Uexpected kernel BRK exception at EL1 Date: Fri, 22 Jan 2021 15:57:08 +0000 [thread overview] Message-ID: <20210122155708.GA25088@willie-the-truck> (raw) In-Reply-To: <20210122110909.3324607-1-qais.yousef@arm.com> On Fri, Jan 22, 2021 at 11:09:09AM +0000, Qais Yousef wrote: > I was hitting the below panic continuously when attaching kprobes to > scheduler functions [...] > diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c > index 89c64ada8732..66aac2881ba8 100644 > --- a/arch/arm64/kernel/probes/kprobes.c > +++ b/arch/arm64/kernel/probes/kprobes.c > @@ -352,8 +352,8 @@ kprobe_breakpoint_ss_handler(struct pt_regs *regs, unsigned int esr) > unsigned long addr = instruction_pointer(regs); > struct kprobe *cur = kprobe_running(); > > - if (cur && (kcb->kprobe_status == KPROBE_HIT_SS) > - && ((unsigned long)&cur->ainsn.api.insn[1] == addr)) { > + if (cur && (kcb->kprobe_status & (KPROBE_HIT_SS | KPROBE_REENTER)) && > + ((unsigned long)&cur->ainsn.api.insn[1] == addr)) { > kprobes_restore_local_irqflag(kcb, regs); > post_kprobe_handler(cur, kcb, regs); Acked-by: Will Deacon <will@kernel.org> Catalin can pick this up for 5.11. Will
WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org> To: Qais Yousef <qais.yousef@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>, linux-kernel@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>, linux-arm-kernel@lists.infradead.org, Jean-Philippe Brucker <jean-philippe@linaro.org> Subject: Re: [PATCH] arm64: kprobes: Fix Uexpected kernel BRK exception at EL1 Date: Fri, 22 Jan 2021 15:57:08 +0000 [thread overview] Message-ID: <20210122155708.GA25088@willie-the-truck> (raw) In-Reply-To: <20210122110909.3324607-1-qais.yousef@arm.com> On Fri, Jan 22, 2021 at 11:09:09AM +0000, Qais Yousef wrote: > I was hitting the below panic continuously when attaching kprobes to > scheduler functions [...] > diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c > index 89c64ada8732..66aac2881ba8 100644 > --- a/arch/arm64/kernel/probes/kprobes.c > +++ b/arch/arm64/kernel/probes/kprobes.c > @@ -352,8 +352,8 @@ kprobe_breakpoint_ss_handler(struct pt_regs *regs, unsigned int esr) > unsigned long addr = instruction_pointer(regs); > struct kprobe *cur = kprobe_running(); > > - if (cur && (kcb->kprobe_status == KPROBE_HIT_SS) > - && ((unsigned long)&cur->ainsn.api.insn[1] == addr)) { > + if (cur && (kcb->kprobe_status & (KPROBE_HIT_SS | KPROBE_REENTER)) && > + ((unsigned long)&cur->ainsn.api.insn[1] == addr)) { > kprobes_restore_local_irqflag(kcb, regs); > post_kprobe_handler(cur, kcb, regs); Acked-by: Will Deacon <will@kernel.org> Catalin can pick this up for 5.11. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-22 17:31 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-22 11:09 [PATCH] arm64: kprobes: Fix Uexpected kernel BRK exception at EL1 Qais Yousef 2021-01-22 11:09 ` Qais Yousef 2021-01-22 13:36 ` Masami Hiramatsu 2021-01-22 13:36 ` Masami Hiramatsu 2021-01-22 15:29 ` Qais Yousef 2021-01-22 15:29 ` Qais Yousef 2021-01-22 15:57 ` Will Deacon [this message] 2021-01-22 15:57 ` Will Deacon 2021-01-22 18:58 ` Catalin Marinas 2021-01-22 18:58 ` Catalin Marinas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210122155708.GA25088@willie-the-truck \ --to=will@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=jean-philippe@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mhiramat@kernel.org \ --cc=qais.yousef@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.