From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 185F3C433E0 for ; Fri, 22 Jan 2021 15:59:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA4E323159 for ; Fri, 22 Jan 2021 15:59:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA4E323159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XIuJUa1D92ZJDo+0n1GisvWoKU8wbyfS9W5KCXYN1YU=; b=vNZ/M3lUTWEEjsX3KY+mYtRZN 6B8itQNfKnsa1RpaAwZmBZV80FJcWBSYPFUB+lB1E+eNtTqRNh5d37zAYh+fr3+uiT8A+fzNG0QkI TCuOuYBWMYYEM+/fI0RgyG4rlp4f+kpWCMQWqiAfMHTUDGKPkrh6pH44HKNDIbQfZw2FHqt/M6Q29 WCovhwwH7nI++YNdwJq8EFOQRxY8zPRkrI7VzfvqUs9zsEPmKIOMm6YxXOlqSPABEi1uvQ0i1HtB5 JpceTUxNh+Cz6MI2ri5CEBoWsKoBDcGJqkwyd9FnMtrkQIP5ssO/spsOB0FgjIAnOIrTF0yVv8tS7 FhjCYiwhA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2yoP-0001AK-Aj; Fri, 22 Jan 2021 15:57:25 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2yoD-00017O-Iq for linux-arm-kernel@lists.infradead.org; Fri, 22 Jan 2021 15:57:15 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F29522248; Fri, 22 Jan 2021 15:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611331032; bh=2q9jzIlTX6HLSbm2PDPJud2i9jj2YBRvZIjrpTQhNOs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CBKWu7+9IV9yBWD9dtflpn58N2O3uZeLg3UcclXVYO3fktFkmQUbWqKnQCSmS7Yoj v2v9OA5ol3bNMOmXtM4qHv1ZaXY8CiUPEaw4ILbkYi4LTz3jReQM0jOLxhT6XiL26A 1tJ6hwD6CWH+hW3gjnMcMhv+9aD4UnTrTRQcgDuD+G0GQWNt/mpd7UwDbU+WHLSb2X 9C9KWVyRz46Xz7qw3I908fwdSK5fb2MgZ9RfRIe9CIF2siVnmWGn5Sciy4tQwN3S6W kFs+D2CQYBdPQC8EEySj+HUZOH8EPa4/q3SPTiuotB7AP1VGXmZVZZorm+oBX0wpld foXDmXFwUkOXg== Date: Fri, 22 Jan 2021 15:57:08 +0000 From: Will Deacon To: Qais Yousef Subject: Re: [PATCH] arm64: kprobes: Fix Uexpected kernel BRK exception at EL1 Message-ID: <20210122155708.GA25088@willie-the-truck> References: <20210122110909.3324607-1-qais.yousef@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210122110909.3324607-1-qais.yousef@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210122_105713_728379_8D85D174 X-CRM114-Status: GOOD ( 11.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , linux-kernel@vger.kernel.org, Masami Hiramatsu , linux-arm-kernel@lists.infradead.org, Jean-Philippe Brucker Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 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