Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp196662imw; Fri, 8 Jul 2022 00:52:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uYTQBjICA6ERpTFjL51su6BTJH5efzM4ugVaxNMJgmVhvpqgEu8BdLr0CWP2CiS0Wzi6rv X-Received: by 2002:a17:907:d22:b0:726:dbb1:8828 with SMTP id gn34-20020a1709070d2200b00726dbb18828mr2274112ejc.722.1657266777366; Fri, 08 Jul 2022 00:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657266777; cv=none; d=google.com; s=arc-20160816; b=j6/WktRKJgnYl+X1P2x5MgHbnCwMOdG/8mSh3kPD7jfX20jC9y6mosB64rX/Bu34uA 4w1no4udgPh3W0D06W1Hho97rMqM3/n3YN38AlAixkjsPi9NA9P/LZO2WDp8BVoPs6qs iufxEvkV7lt+tr6q35a/iplt68bR3WQyz65TEjwBJRl1TSsHmZGXPylFudRoDOtZHER6 EQicuiNTnAvOe4BrAgJPNbambAcD1l9Rg67WzUku8wB0NX5b1cwy81rfJXcAzyGyEhLs HBo5Fk2T/vKb0uqnWc3FUJSYn1p1sYbQl3HX3K1teq8AoPloDnbc1j+cx6AA7zqxWMEw P1bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=NSNqcIHdyxukbMTLqpTuz11JeQH8oeViKdANZQ9/jMY=; b=i5r2DFVKWZhdEab8EBTewWexSTjqMIJl+dkhDbFSfRg/eGr/hbuu6EKaiXX3vVhHw0 gqzY3v7EEF6FvSt5XVxFDH47dmnU83eoU1YyPEbQFzqAhG+BRaAgEuysZzNZePy5eCll U2LfcIswcW3NCqEu6hHQbMHMiusLBlQekuHPEGZ80+Awc+ThZ5yfKxukSqngfdCQ99bq KTnGOi+dt62eijU8pVNXcFjm8D1t8it3wo1viUH0OIPXd+UXZSXy7k6LlkQzIALMS7ws AqWIGkEvtqI/maojnDsE81zVqv1LeRdKOvWXbQR9uPJdYWIu+FlNrCg1E/gneNyK7Imw /CmQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hu9-20020a170907a08900b006ff492dc350si4898596ejc.378.2022.07.08.00.52.21; Fri, 08 Jul 2022 00:52:57 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237611AbiGHHcA (ORCPT + 99 others); Fri, 8 Jul 2022 03:32:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237597AbiGHHb6 (ORCPT ); Fri, 8 Jul 2022 03:31:58 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E19F27B379 for ; Fri, 8 Jul 2022 00:31:57 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VIiXsyp_1657265514; Received: from localhost(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VIiXsyp_1657265514) by smtp.aliyun-inc.com; Fri, 08 Jul 2022 15:31:55 +0800 From: Xianting Tian To: palmer@dabbelt.com Cc: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, guoren@kernel.org, Xianting Tian Subject: [RESEND PATCH V5 2/2] RISC-V: use __smp_processor_id() instead of smp_processor_id() Date: Fri, 8 Jul 2022 15:31:50 +0800 Message-Id: <20220708073150.352830-3-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220708073150.352830-1-xianting.tian@linux.alibaba.com> References: <20220708073150.352830-1-xianting.tian@linux.alibaba.com> X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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 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