Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp658870pxb; Mon, 7 Feb 2022 22:27:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxX+Y8f22q3+XBNWIdNnzBgkoAHA6vbTe0pOxxEmklHpLN+lXkzh/jYCL5z7BwMmESULLsM X-Received: by 2002:a05:6402:1601:: with SMTP id f1mr2884840edv.165.1644301655581; Mon, 07 Feb 2022 22:27:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644301655; cv=none; d=google.com; s=arc-20160816; b=jpL9ZDX5s5n4v78r/Kbaa8aZxGlycYKVrI9XJz/asmLaAPXxA9PffoPDWjViQSjUHk Ciid+8h2/duaCoognuD6dDvMrXftdzpJSjnUccCzX7KnGyFmdM56VoQcPf23bLoaCACG Sxr9FUyIymKVOrqWReLaGmUsuvMCWEzn7MYX8EqpdWdwX4J0HxHjS7cA9wwkapZMFhLy cPmSo+n+Cos4gVr5+zsISgYeYduLUzRuXxUPzi0Y6AqH0lb7USm52An42+9pbtPXAkPX kZvsNwPVJySMN+qGKIX1KeTmwHPakSWYfz7ANriq9ei1DU9E2U4NkNUkA7+Fu7qgS3U8 8pjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=DkD54i2Pug3GcN0vGMXIwskw5kZ403zclucyP/4FADw=; b=GDwwR5wJq4S4JJHO9ojO/7ANuDtLCBA3BYAquk6G/Gi3Zh43Y6BYgbg8BRgaovinbc +BpQiDDWqcA+bQLlUCvnRzsaPw7c3aG1DtbRjCfNXvqREYD5f5cQk8h2YOPm7Jb/0qEg jCwzGKrMePwodkJI7jtS8BaXnN89fI7bTARMx7XuYaJ9M58H/ugdz0HbGK0M2sq1oUCY Yfn8DHL3GwGTGCYSglniE2M3BHo4270t2gTOhyWH2i9Tf1KJCI1v0GGkJaH4YG22VI5X ijQJccxnBrmkbzZEdFrM+UaUp44AaDD+Qwh9RjrxqRVALeGG3xmgM9FwE2DmtdtF8v1O NAIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jejLNq9Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r4si5205531edw.381.2022.02.07.22.27.10; Mon, 07 Feb 2022 22:27:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jejLNq9Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1444069AbiBGNJ4 (ORCPT + 99 others); Mon, 7 Feb 2022 08:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1446315AbiBGMnO (ORCPT ); Mon, 7 Feb 2022 07:43:14 -0500 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C992EC0045EF for ; Mon, 7 Feb 2022 04:38:59 -0800 (PST) Received: by mail-qk1-x729.google.com with SMTP id c189so10681633qkg.11 for ; Mon, 07 Feb 2022 04:38:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DkD54i2Pug3GcN0vGMXIwskw5kZ403zclucyP/4FADw=; b=jejLNq9ZkAUM/1vtLhdi/Te45wokvj6FjwIW8AlLB1k5NEm5TM5g0CwJk0HDNunq/c 6W4b+6p5XRj7BipndV9DVl6qeBQUDxuA2t9aVfsgHBtTUreGRF2VJlsJST0i7l+dGEAU jXKut7VfVCZ2E+hEy2gkxGuFJNezlflnLtRFakk/VIJbd/sgO3BccmoGlfvC0JCvzp3J 2tMID7ZZ1b4NXRSy1Ykde3PurFm0gp35wEBgEZsJn2KO1xguHtzTQjSW4F1PNUcl8+b4 HdNHI0HdCBlheN6vmAvm84gJKD5z/UurHEfshXaDAVDLPeLnCNSSIeFWZs/nklfcXELn Gzfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DkD54i2Pug3GcN0vGMXIwskw5kZ403zclucyP/4FADw=; b=5jske699IwyUiG0xh5WiZfJLdkrKQZCqMt+OFWhVGzfWiwfv25lfCWBBahexVkRtOw AbOwsXsyTE5ZtjV455viG6DfK7ArLCYTt4xSFXPmHAp7KtkyJKJBHotAxNi4x5N0w4uU 4Lwy4Hg2P16Ha45OnGu3XgGa3YCpgMJmp3bcuJZivtOXpN5hVJgbAJT9pVwRxfihbVYW ZZJ3xK/DvcsMJ37zDnBf+z4STOwUrPMxHrMV8A2z0elmXwawMR/k+3utnFU02ZNQlovQ NuQHc7+TqlZFAGMTwYXER9IBfA/wKk1tjxAgmIFtGo1uzmcG13oeL1qouRe0HgoBlXMu fTkg== X-Gm-Message-State: AOAM531uxpKH39p3Ivkd62Wuw6bhf7neMN1bA0j4G7uFcZcNf7YET+q0 jBUzvvCmmuVhpYoTsZiu2wx+I3m6c1zDJE7G X-Received: by 2002:a05:620a:2443:: with SMTP id h3mr6108230qkn.258.1644237538894; Mon, 07 Feb 2022 04:38:58 -0800 (PST) Received: from mail.google.com ([207.246.89.135]) by smtp.gmail.com with ESMTPSA id 134sm5114278qkl.50.2022.02.07.04.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 04:38:58 -0800 (PST) Date: Mon, 7 Feb 2022 20:38:50 +0800 From: ChangbinCONFIG_IRQSOFF_TRACER Du To: Jisheng Zhang Cc: Changbin Du , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] riscv: fix oops caused by irq on/off tracer Message-ID: <20220207123850.l4r5qjswaegwisbx@mail.google.com> References: <20220129004226.32868-1-changbin.du@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 07, 2022 at 01:25:03AM +0800, Jisheng Zhang wrote: > On Sat, Jan 29, 2022 at 08:42:26AM +0800, Changbin Du wrote: > > 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 > > > > Hi Changbin, > > Could you please provide the reproduce steps? It looks a bit > interesting. > Just enable CONFIG_IRQSOFF_TRACER and rebuild kernel with llvm. Then boot the new kernel. > > 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 > > > > --- > > 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. > > + */ > > Hmm, I believe there's elegant solution without this grue, maybe > fix in stacktrace implementation or something else? > This is not about stacktrace. As describe in commit msg, the problem is introduced by ftrace_return_address(1). The complier doesn't have knowledge about how many frames available at rumtime and wether each frame is valid. > > > + > > +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 */ > > -- > > 2.32.0 > > > > > > _______________________________________________ > > linux-riscv mailing list > > linux-riscv@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-riscv -- Cheers, Changbin Du