From patchwork Sat Jan 29 00:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 12729332 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4862CC433EF for ; Sat, 29 Jan 2022 00:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=xcxzauXOsx5lPZnA9JqMolZAPzL5cYkL2XcnpS+PW3Q=; b=D1SQ4CJs7xxxoL trSSRv7V5BtGlRAOo3rn3zhjjAe5y3WU2lD8PaHOPrQJr8eFJxeSvMIhnE+q65iz2UzNd/YiWg/E6 4cMmBF4uAXEDzp4L7uk2FhmdilP37KWAMDCFRS83gx0fuBxlOAKDBkaGEdDLXs49sl5k9VMyaoFCv fa3JNHOuhksCIn+xDTBVc8NzoXt8ek44aj5c++sI4vMnjsRdoF+mEF/9pCm4AaIspoodOikX6l3lp JcSzFWkFG/bKG+1zSLeSTRMsF02cuN5AF1cHpfLjM7/2Ze7cL+X+T/Q6F3rSOKheqL/icnAitGChr 22pCn/qGrQGw1wq11Z3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDbpB-003qVW-BR; Sat, 29 Jan 2022 00:42:41 +0000 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDbp8-003qVD-Nk for linux-riscv@lists.infradead.org; Sat, 29 Jan 2022 00:42:40 +0000 Received: by mail-qt1-x832.google.com with SMTP id y8so6669858qtn.8 for ; Fri, 28 Jan 2022 16:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/3uwQP8SHhp1Z798VpavV4kzs0Y+7l84uUhq28tLIeE=; b=FRTrfCUNI8my/uWB6yKWKFyVGWhZ43aDLzQzSfVa9S/x7cPeNAYceT3sDrLlipz638 fcWwBbgYR0cGA7EHq/1bkap2iVdOYkx9XR5Co7S+J8XM1qVcFU3bzTkjjx5e2Gx+6qeR 4EwPg+gBHeha7odXHDQUBP9Fu/xagjIDosx5IYOK+Quv7bSVrwqfPUSzm4anBJD6L2PL rE9LIA6bHokEAGRXpUHNUceMs72FLZGPX0zTQj0Sgf0kKLC+xCqkLr/BQsFGJ43Hm2ob SAfwqgXY4wrNVtUDM3WMSoOMJgsYlg/n2rL1PUxGwrQOKM6iJxW2hnFo4Fb/ydcpkGM2 aOPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/3uwQP8SHhp1Z798VpavV4kzs0Y+7l84uUhq28tLIeE=; b=r0SCYRSb7SWL8xRQv5EDjQA0D4myrvmYUpzJ3iZdNsH2t4FALH5togSDv7qtMAKpY1 b37fM0zNO+BGGTMcqqhiJMgObRLZ7A52CJOJPQrXh3QpevLm6P9v9Dw8mW35WugTn4k3 yBRHDhSS7zpVcVZ3E3ptFduDcU/M/0wK7xz6Ys5CVhRDwGu6mBmXKV1xQMVHErCG3Unv PS+5HkOk8WC0p9xxzP9eiIVt5JxpnkLDgEKD3uKmasAfTSErAfuPtHkMGLFXecmB7z6I s6crfcDgdBzuXu4x7hmCcwnHw03r2p0sDR0kEjB1530piMezxX14du40CjY9fP7rm4Ms lTrw== X-Gm-Message-State: AOAM530ObiSvJKSoi/XZQx9op3rRjTTlPASTRCY9TjQzuizxZdAyq9p+ 0U5zPkA5qhJn48WLI9Od1uc= X-Google-Smtp-Source: ABdhPJxBpYKmB+eWPxjhuIkrhQ9GVVY3blEgnclKDGxeLa2Rlkc8kJAAuQKmiqYzamxOffB/NtEm8Q== X-Received: by 2002:a05:622a:5ce:: with SMTP id d14mr8215060qtb.642.1643416957534; Fri, 28 Jan 2022 16:42:37 -0800 (PST) Received: from WRT-WX9.. ([207.246.89.135]) by smtp.gmail.com with ESMTPSA id 66sm3731055qte.42.2022.01.28.16.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 16:42:37 -0800 (PST) From: Changbin Du To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Changbin Du Subject: [PATCH v2] riscv: fix oops caused by irq on/off tracer Date: Sat, 29 Jan 2022 08:42:26 +0800 Message-Id: <20220129004226.32868-1-changbin.du@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220128_164238_829520_EC6E7404 X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The trace_hardirqs_on/off requires at least two parent call frames. If not, the code generated by CALLER_ADDR1 (aka. ftrace_return_address(1)) could trigger memory access fault. [ 0.039615][ T0] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000f8 [ 0.041925][ T0] Oops [#1] [ 0.042063][ T0] Modules linked in: [ 0.042864][ T0] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.17.0-rc1-00233-g9a20c48d1ed2 #29 [ 0.043568][ T0] Hardware name: riscv-virtio,qemu (DT) [ 0.044343][ T0] epc : trace_hardirqs_on+0x56/0xe2 [ 0.044601][ T0] ra : restore_all+0x12/0x6e [ 0.044721][ T0] epc : ffffffff80126a5c ra : ffffffff80003b94 sp : ffffffff81403db0 [ 0.044801][ T0] gp : ffffffff8163acd8 tp : ffffffff81414880 t0 : 0000000000000020 [ 0.044882][ T0] t1 : 0098968000000000 t2 : 0000000000000000 s0 : ffffffff81403de0 [ 0.044967][ T0] s1 : 0000000000000000 a0 : 0000000000000001 a1 : 0000000000000100 [ 0.045046][ T0] a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000 [ 0.045124][ T0] a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000054494d45 [ 0.045210][ T0] s2 : ffffffff80003b94 s3 : ffffffff81a8f1b0 s4 : ffffffff80e27b50 [ 0.045289][ T0] s5 : ffffffff81414880 s6 : ffffffff8160fa00 s7 : 00000000800120e8 [ 0.045389][ T0] s8 : 0000000080013100 s9 : 000000000000007f s10: 0000000000000000 [ 0.045474][ T0] s11: 0000000000000000 t3 : 7fffffffffffffff t4 : 0000000000000000 [ 0.045548][ T0] t5 : 0000000000000000 t6 : ffffffff814aa368 [ 0.045620][ T0] status: 0000000200000100 badaddr: 00000000000000f8 cause: 000000000000000d [ 0.046402][ T0] [] restore_all+0x12/0x6e To fix above issue, here we add one extra level wrapper so they can be safely called by low level entry code. Signed-off-by: Changbin Du Reported-by: kernel test robot --- v2: fix compile warning. --- arch/riscv/kernel/Makefile | 2 ++ arch/riscv/kernel/entry.S | 10 +++++----- arch/riscv/kernel/trace_irq.c | 26 ++++++++++++++++++++++++++ arch/riscv/kernel/trace_irq.h | 11 +++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 arch/riscv/kernel/trace_irq.c create mode 100644 arch/riscv/kernel/trace_irq.h diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 612556faa527..ffc87e76b1dd 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -51,6 +51,8 @@ obj-$(CONFIG_MODULE_SECTIONS) += module-sections.o obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o +obj-$(CONFIG_TRACE_IRQFLAGS) += trace_irq.o + obj-$(CONFIG_RISCV_BASE_PMU) += perf_event.o obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index ed29e9c8f660..d6a46ed0bf05 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -108,7 +108,7 @@ _save_context: .option pop #ifdef CONFIG_TRACE_IRQFLAGS - call trace_hardirqs_off + call __trace_hardirqs_off #endif #ifdef CONFIG_CONTEXT_TRACKING @@ -143,7 +143,7 @@ skip_context_tracking: li t0, EXC_BREAKPOINT beq s4, t0, 1f #ifdef CONFIG_TRACE_IRQFLAGS - call trace_hardirqs_on + call __trace_hardirqs_on #endif csrs CSR_STATUS, SR_IE @@ -234,7 +234,7 @@ ret_from_exception: REG_L s0, PT_STATUS(sp) csrc CSR_STATUS, SR_IE #ifdef CONFIG_TRACE_IRQFLAGS - call trace_hardirqs_off + call __trace_hardirqs_off #endif #ifdef CONFIG_RISCV_M_MODE /* the MPP value is too large to be used as an immediate arg for addi */ @@ -270,10 +270,10 @@ restore_all: REG_L s1, PT_STATUS(sp) andi t0, s1, SR_PIE beqz t0, 1f - call trace_hardirqs_on + call __trace_hardirqs_on j 2f 1: - call trace_hardirqs_off + call __trace_hardirqs_off 2: #endif REG_L a0, PT_STATUS(sp) diff --git a/arch/riscv/kernel/trace_irq.c b/arch/riscv/kernel/trace_irq.c new file mode 100644 index 000000000000..fc194c56a35d --- /dev/null +++ b/arch/riscv/kernel/trace_irq.c @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022 Changbin Du + */ + +#include +#include +#include "trace_irq.h" + +/** + * trace_hardirqs_on/off requires at least two parent call frames. + * Here we add one extra level so they can be safely called by low + * level entry code. + */ + +void __trace_hardirqs_on(void) +{ + trace_hardirqs_on(); +} +NOKPROBE_SYMBOL(__trace_hardirqs_on); + +void __trace_hardirqs_off(void) +{ + trace_hardirqs_off(); +} +NOKPROBE_SYMBOL(__trace_hardirqs_off); diff --git a/arch/riscv/kernel/trace_irq.h b/arch/riscv/kernel/trace_irq.h new file mode 100644 index 000000000000..99fe67377e5e --- /dev/null +++ b/arch/riscv/kernel/trace_irq.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2022 Changbin Du + */ +#ifndef __TRACE_IRQ_H +#define __TRACE_IRQ_H + +void __trace_hardirqs_on(void); +void __trace_hardirqs_off(void); + +#endif /* __TRACE_IRQ_H */