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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 426CFC433DF for ; Fri, 9 Oct 2020 21:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9DB822245 for ; Fri, 9 Oct 2020 21:23:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mKcTZl9Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389095AbgJIVXq (ORCPT ); Fri, 9 Oct 2020 17:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731533AbgJIVXq (ORCPT ); Fri, 9 Oct 2020 17:23:46 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00A9EC0613D2 for ; Fri, 9 Oct 2020 14:23:44 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id 144so7914214pfb.4 for ; Fri, 09 Oct 2020 14:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=gfk15+k9jGL0BJq8q29xYq+LvxcjldBa4hbI68xOIO4=; b=mKcTZl9ZY8Eul6WwxDbAaa6M4qlyxHd9u8ZQ2VOaYErFofa+X/M/88u40dAdkoMrO5 TGfYMwQk+UZzjYMAtlDcNcj5kUXpX0nxpOFvmBwLY1Sq5jwi2BV8BlrqPO/3L/vM4XRW UnKPb5Jt1Rbk8pxuuLwV4RYIu6Zr666XphFPKSjBpP4L2uQ7O4dnhFoo8CXeiiAj48rr +bHuDPkX5pc9iiuDGSw9XnEmSuUlbl/nncst3InBnXKoJRew+c7z44X/0ciDsmva3lQP askbRy4HHT9Uc6a+aGFWiP78FEfsn/ufTTAmTRBbLfzXrjqggq3KOP6bzf3t9E0eWT8E VBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=gfk15+k9jGL0BJq8q29xYq+LvxcjldBa4hbI68xOIO4=; b=gqPvuz351gfzQ+WgWzDvRJ+2nSy2HTHUcjhAcHOAKDN78+eT8EeL3npiePrqw087Q/ GXhtTzdyGpW1Gu4h2Tlp5I1WW6cE++vB0e+XUjl9p3ckLeTYVtfNNe0gM4okaSGFGkcI LO8qwG03EbxAN5+SRtOo6Rw/3fiGBII/F3riF05etkDuGS2zsHXSWFvAouEW8BEBAMS2 GIWWH7mtgmmbF9b9kKiMFsldrPZrZPCU8Ki9Up3Xm1ONg5GfdzBsWEadJNRhe9v7jcNu Rcz1DbTCVjgn3vjAHbnZDipxYL87bU5cpmUsOnwaihZRoEEf+i2aSxF7LxGIbi25Pz8t npkQ== X-Gm-Message-State: AOAM532fqYG/rar9/T+u932cPuZMDt/SBQRYGrjDAlfizo8ZONhB62hQ Ju7arco1Lz2ZSiB1SIh02ywuEA== X-Google-Smtp-Source: ABdhPJye3iKV2j9Z4Wvr0ZKX+PnYJJfnnSXc+QCI6WiIh6klDEitoRAJ9NsYAwLzwNqF2a/rYS+4vw== X-Received: by 2002:a62:7d4d:0:b029:152:1b09:f34 with SMTP id y74-20020a627d4d0000b02901521b090f34mr14545474pfc.76.1602278624056; Fri, 09 Oct 2020 14:23:44 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id fy24sm12755823pjb.35.2020.10.09.14.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 14:23:43 -0700 (PDT) Date: Fri, 09 Oct 2020 14:23:43 -0700 (PDT) X-Google-Original-Date: Fri, 09 Oct 2020 14:23:42 PDT (-0700) Subject: Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2 In-Reply-To: CC: guoren@kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, schwab@linux-m68k.org, aurelien@aurel32.net, guoren@linux.alibaba.com From: Palmer Dabbelt To: atishp@atishpatra.org Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 09 Oct 2020 14:16:00 PDT (-0700), atishp@atishpatra.org wrote: > On Thu, Oct 8, 2020 at 6:53 PM Guo Ren wrote: >> >> On Thu, Oct 8, 2020 at 11:54 AM Palmer Dabbelt wrote: >> > >> > On Wed, 07 Oct 2020 08:08:33 PDT (-0700), guoren@kernel.org wrote: >> > > 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; >> > > +} >> > >> > I'm a bit confused as to what you're trying to do here. Yesterday I got >> > another version of this patch set that moves init data around, today a >> > different one. Yesterday's is tested and simpler, and given it's so late in >> > the process I'm inclined to take that as I don't want to break anything. >> > >> > Right now I have >> > >> > 84814460eef9 ("riscv: Fixup bootup failure with HARDENED_USERCOPY") >> > a78c6f5956a9 ("RISC-V: Make sure memblock reserves the memory containing DT") >> > 549738f15da0 ("Linux 5.9-rc8") >> > >> > Unless there's some functional bug, that's what I'm going to send out for 5.9 >> > -- I'm not all that worried about lacking the ability to free init data. The >> > above seems like fine 5.10 material. >> > >> > Let me know if I'm missing something here. >> 84814460eef9 could resolve the problem and Atish ask for any other >> idea? So It's another choice, I forgot RFC in prefix. >> > > I prefer this fix as it is cleaner and doesn't waste memory. I have > sent another series > on top of this fix, that addresses the init section protections we > talked about. All of these are definitely > next merge window material. Thanks, I'll take a look. > >> 6184358da0004c8fd940afda6c0a0fa4027dc911("riscv: Fixup static_obj() >> fail") is a sloppy patch that introduces another problem. Sorry about >> that. >> >> -- >> Best Regards >> Guo Ren >> >> ML: https://lore.kernel.org/linux-csky/