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 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 1B0CFC433EF for ; Fri, 22 Jul 2022 07:43:34 +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:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WRppJrjpgEe5xLKRTV7JhaM5TV93KW57dMPYEc4wH/w=; b=uaxQhTO9FIMDy4 p+abIXK1k27dYwLpAWowwhC4O8fwvB0iONyr4dq5U8mm1N3vJ3LTFMYb3B5r+Y2D1TvfwyP5nDGKC Mc9qgxE83UDZK0PrCmkP9pTMci5Et/yBXYCXFr6fdT1raoBKo0d8SYR2jqOtcZj6qJwRYzvzG3ASN vP9nPBeY1J0sj37RgjMA9Mvpq0speVG9PPP63Oh4pA0WNYJTF+HPS8+Ot6WN0RP0g/mY7IXjUgltU 6v4mM/hb5sLWJp1so0CRueJgvJnUJ1ezjlo0x2m0Tl1sFnbDZsIvVZMR27TeCDk0tchxaKnaBN79t QjF4PDnZJ3URWQwW36+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oEnJh-000ia6-7Q; Fri, 22 Jul 2022 07:43:21 +0000 Received: from mail-yw1-x112f.google.com ([2607:f8b0:4864:20::112f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oEnJd-000iXz-FG for linux-riscv@lists.infradead.org; Fri, 22 Jul 2022 07:43:19 +0000 Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-31e45527da5so39524347b3.5 for ; Fri, 22 Jul 2022 00:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atishpatra.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iKIaSypFVYjNqK3UF0MeX1uLadeX9F3Ok+Ln5q+DbjI=; b=VUqsj7keIvOwEm3DCbFmxPyirWn7ZQoYV/6Oa7SWUtEp+DwZ2XdPOSzxBlZreg9Q+I OXt24U5uowN/S/d5PWcRxWvlOXhnilAgAVtmiQNQPCSaKAS/A8GfUVuZN4VvTx9NWIi3 8O7XKCNXDyKUGia51sEQkHG/LNz/1eyxPbIhc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iKIaSypFVYjNqK3UF0MeX1uLadeX9F3Ok+Ln5q+DbjI=; b=1UWY+05QwNcWOJYNiD57diSMkAL0tftMyJGt16IFUrkDRek1qTsbkUmsYqjb+SU298 8CukZwI6yrkF8kC3LtYgLER3hHrYaP4iY35wDcGKyabByOUOzz7Xvoo4oA5d+9v94Z5k iz87VxVcya1Z68q3yZYo70dgi4PWJ0JeZmdF0AFANNKKsgpdZkjIK3LfTIY541faL/4a gRdb+oNkymrnWxOD6jVYtEx+sW+9p554EdT9DQLX9ASw2ESmaKyGC9q1rmcJK+tagkel PZCE0HLI8XtI4bLSjWaL/TOkI2Pv4eXcMAJ6/Bth98bz1WmLVhr9jY/6oiJ3ka2wTTbG ovTw== X-Gm-Message-State: AJIora8S7NWXxmCmVqMuvLKTGDd20dWG8gVE+YG404IWQiNK1Mlc5vD3 0oNUeNnJduocSnG8XlVIKXiuekP52H5sJ9iHipRR X-Google-Smtp-Source: AGRyM1u64u+ogJpYA5v+bu4lLY7zZ/TjRksFjpfQgu6GNUBIQyu8+rjIg+XRXzaiAqXFk46lwk0tafSmilZn0T2HQHw= X-Received: by 2002:a81:9182:0:b0:31e:68cd:3d5c with SMTP id i124-20020a819182000000b0031e68cd3d5cmr2003480ywg.194.1658475793496; Fri, 22 Jul 2022 00:43:13 -0700 (PDT) MIME-Version: 1.0 References: <20220717101323.370245-1-xianting.tian@linux.alibaba.com> <20220717101323.370245-3-xianting.tian@linux.alibaba.com> In-Reply-To: <20220717101323.370245-3-xianting.tian@linux.alibaba.com> From: Atish Patra Date: Fri, 22 Jul 2022 00:43:02 -0700 Message-ID: Subject: Re: [PATCH 2/5] RISC-V: use __smp_processor_id() instead of smp_processor_id() To: Xianting Tian Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Guo Ren , Nick Kossifidis , Alexandre Ghiti , linux-riscv , "linux-kernel@vger.kernel.org List" , crash-utility@redhat.com, huanyi.xj@alibaba-inc.com, Heinrich Schuchardt , k-hagio-ab@nec.com, hschauhan@nulltrace.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220722_004317_714322_5DD8A65C X-CRM114-Status: GOOD ( 18.57 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Sun, Jul 17, 2022 at 3:14 AM Xianting Tian wrote: > > Use __smp_processor_id() to avoid check the preemption context when > CONFIG_DEBUG_PREEMPT enabled, as we will enter crash kernel and no > return. > > Without the patch, > [ 103.781044] sysrq: Trigger a crash > [ 103.784625] Kernel panic - not syncing: sysrq triggered crash > [ 103.837634] CPU1: off > [ 103.889668] CPU2: off > [ 103.933479] CPU3: off > [ 103.939424] Starting crashdump kernel... > [ 103.943442] BUG: using smp_processor_id() in preemptible [00000000] code: sh/346 > [ 103.950884] caller is debug_smp_processor_id+0x1c/0x26 > [ 103.956051] CPU: 0 PID: 346 Comm: sh Kdump: loaded Not tainted 5.10.113-00002-gce03f03bf4ec-dirty #149 > [ 103.965355] Call Trace: > [ 103.967805] [] walk_stackframe+0x0/0xa2 > [ 103.973206] [] show_stack+0x32/0x3e > [ 103.978258] [] dump_stack_lvl+0x72/0x8e > [ 103.983655] [] dump_stack+0x14/0x1c > [ 103.988705] [] check_preemption_disabled+0x9e/0xaa > [ 103.995057] [] debug_smp_processor_id+0x1c/0x26 > [ 104.001150] [] machine_kexec+0x22/0xd0 > [ 104.006463] [] __crash_kexec+0x6a/0xa4 > [ 104.011774] [] panic+0xfc/0x2b0 > [ 104.016480] [] sysrq_reset_seq_param_set+0x0/0x70 > [ 104.022745] [] __handle_sysrq+0x8c/0x154 > [ 104.028229] [] write_sysrq_trigger+0x5a/0x6a > [ 104.034061] [] proc_reg_write+0x58/0xd4 > [ 104.039459] [] vfs_write+0x7e/0x254 > [ 104.044509] [] ksys_write+0x58/0xbe > [ 104.049558] [] sys_write+0xe/0x16 > [ 104.054434] [] ret_from_syscall+0x0/0x2 > [ 104.067863] Will call new kernel at ecc00000 from hart id 0 > [ 104.074939] FDT image at fc5ee000 > [ 104.079523] Bye... > > With the patch we can got clear output, > [ 67.740553] sysrq: Trigger a crash > [ 67.744166] Kernel panic - not syncing: sysrq triggered crash > [ 67.809123] CPU1: off > [ 67.865210] CPU2: off > [ 67.909075] CPU3: off > [ 67.919123] Starting crashdump kernel... > [ 67.924900] Will call new kernel at ecc00000 from hart id 0 > [ 67.932045] FDT image at fc5ee000 > [ 67.935560] Bye... > > Fixes: 0e105f1d0037 ("riscv: use hart id instead of cpu id on machine_kexec") > Reviewed-by: Guo Ren > Signed-off-by: Xianting Tian > --- > arch/riscv/kernel/machine_kexec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/kernel/machine_kexec.c b/arch/riscv/kernel/machine_kexec.c > index df8e24559035..86d1b5f9dfb5 100644 > --- a/arch/riscv/kernel/machine_kexec.c > +++ b/arch/riscv/kernel/machine_kexec.c > @@ -171,7 +171,7 @@ machine_kexec(struct kimage *image) > struct kimage_arch *internal = &image->arch; > unsigned long jump_addr = (unsigned long) image->start; > unsigned long first_ind_entry = (unsigned long) &image->head; > - unsigned long this_cpu_id = smp_processor_id(); > + unsigned long this_cpu_id = __smp_processor_id(); > unsigned long this_hart_id = cpuid_to_hartid_map(this_cpu_id); > unsigned long fdt_addr = internal->fdt_addr; > void *control_code_buffer = page_address(image->control_code_page); > -- > 2.17.1 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv Reviewed-by: Atish Patra -- Regards, Atish _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv