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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 10A36C41604 for ; Wed, 7 Oct 2020 15:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85ADA21548 for ; Wed, 7 Oct 2020 15:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602083373; bh=wa3UNQY5M68kvrp3WlQFqVMwzcbaee+F0aszO366QLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=llmzfudwhqQM84D2UBJBO9Jkoj8CqZUvkYw459qeedeMNlYrPZqqePScqVIDTDqkF PA4pEAVJEJ+GjHqYmiXeVxEenxmxyvI1R3Dx84oDrKlOJcp/oqtYWRBkwhtaFFnMaY VPdZ7/MVR44d9d+kg9CQJxoBz1U9tDqbTuRbAnmk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728046AbgJGPJc (ORCPT ); Wed, 7 Oct 2020 11:09:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:50636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727608AbgJGPJ3 (ORCPT ); Wed, 7 Oct 2020 11:09:29 -0400 Received: from localhost.localdomain (89.208.247.74.16clouds.com [89.208.247.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58935214DB; Wed, 7 Oct 2020 15:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602083368; bh=wa3UNQY5M68kvrp3WlQFqVMwzcbaee+F0aszO366QLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUL1Zi+ZPJLc5XySN4I9YEDa60ZStkGiL4GLA3bbLdiGwKqNDruD2i6syAirmXAUs dVCtMOy2HkuwXVzWCEyzuyamIUYbJJzWFWV131Xe4cSCqs1FERxZLNntp9G586gyJ2 InHkhK5QPWC3ZZUktqhM/Bh86WXEBl7Q0OXEHfJs= From: guoren@kernel.org To: palmerdabbelt@google.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, atishp@atishpatra.org, schwab@linux-m68k.org, aurelien@aurel32.net, Guo Ren Subject: [PATCH 2/2] riscv: Fixup static_obj() fail v2 Date: Wed, 7 Oct 2020 15:08:33 +0000 Message-Id: <1602083313-19239-2-git-send-email-guoren@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602083313-19239-1-git-send-email-guoren@kernel.org> References: <1602083313-19239-1-git-send-email-guoren@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guo Ren v1 is commit: 6184358da0004c8fd940afda6c0a0fa4027dc911 which has been reverted. When enable LOCKDEP, static_obj() will cause error: [ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [] walk_stackframe+0x0/0xa4 [ 0.068506] [] show_stack+0x2a/0x34 [ 0.068631] [] dump_stack+0x94/0xca [ 0.068757] [] register_lock_class+0x5b8/0x5bc [ 0.068969] [] __lock_acquire+0x6c/0x1d5c [ 0.069101] [] lock_acquire+0xae/0x312 [ 0.069228] [] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [] complete+0x1e/0x50 [ 0.069479] [] rest_init+0x1b0/0x28a [ 0.069660] [] 0xffffffe0000016a2 [ 0.069779] [] 0xffffffe000001b84 [ 0.069953] [] 0xffffffe000001092 Because some __initdata static variables is before _stext: static int static_obj(const void *obj) { unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1; We could implement arch_is_kernel_data to fixup it. Link: https://lore.kernel.org/linux-riscv/1593266228-61125-1-git-send-email-guoren@kernel.org/T/#t Signed-off-by: Guo Ren Reported-by: Aurelien Jarno Cc: Palmer Dabbelt Cc: Atish Patra Cc: Andreas Schwab Cc: Aurelien Jarno --- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.h diff --git a/arch/riscv/include/asm/sections.h b/arch/riscv/include/asm/sections.h new file mode 100644 index 00000000..2317b9e --- /dev/null +++ b/arch/riscv/include/asm/sections.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data(unsigned long addr) +{ + if (init_mem_is_free) + return 0; + + return addr >= (unsigned long)__init_begin && + addr < (unsigned long)__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 2c6dd32..9ebd5eb4 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -112,3 +113,11 @@ static int __init topology_init(void) return 0; } subsys_initcall(topology_init); + +bool init_mem_is_free = false; + +void free_initmem(void) +{ + free_initmem_default(POISON_FREE_INITMEM); + init_mem_is_free = true; +} -- 2.7.4