Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp2531036pxu; Fri, 9 Oct 2020 21:49:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoPpRoxaldU/p0OmSjbfFkvcMJA77heeI+AcN7r86ogxTYszuCiziv7zB7i/+rZzCY7Lfh X-Received: by 2002:a05:6402:1847:: with SMTP id v7mr2762135edy.307.1602305355026; Fri, 09 Oct 2020 21:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602305355; cv=none; d=google.com; s=arc-20160816; b=Sch3L/RylJcE/UnWBsr/E4pl/9afbEpxY3eNmcgSFP51ZW8dJ7gMR+rSOX7NRun6OJ qbJ+I37KhqWHb94J4P4Fwb8tNg5h9usj+qTi3YON/p6xiOtZ2qSxgP0j87gaSqIAz3ZL 6pSMy32FlnWCZLsG5YxtV7+obE6M7zkZpmC2wh27/u8sW25MGoeYwYmR+/TbbpqiICrR 8anHwBPsXmOx53KvFDg+uGqBCXD6917vhBkelo5Y4t38ShJzqyUwVHzP7tvCrJjEtlT5 hRKG5JrJvk/m9JJN+NI8vbeXsvipG+npBGTyFfQqx7B636eMOSVhsoiJthwG8swXERZM 3Mbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=Cj0AOr19taccvBKtxwBkDF7KCRmextTNA9u4OCHvj9Q=; b=EqcN9+lGIRYZUPkvuReo5i3ff09x29VoIMoZ22RbGL4uUI6YNMjRMLuAzObXAbtw0S qHLrKSXMYjafKMN56ryb1l0VAQZui+JQqLr+ImSsXIj1JH6Ril0sJ7F6BlE+ip4Zv8NE OGeSEITzm46XlPgVsyyF7xLPoKuPJmDpdedwpClDZP9mAjnse7+Qf0KO6JrVB4oXoZoh OtReBahVkZ2UplraEwtkMWR1fgnp4Mcyoaa4YQR9C2HIU2kTP1QUnEcJQ6Y08fad87PV 1h9MCu9TxenOmufjwvER/CEgSaF+izz3GT5gwVN0Tqks/56ngPODER/FPfJhO4YM6r4t dyqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@atishpatra.org header.s=google header.b=M34auMKs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lg24si7964039ejb.18.2020.10.09.21.48.51; Fri, 09 Oct 2020 21:49:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@atishpatra.org header.s=google header.b=M34auMKs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388860AbgJIVQN (ORCPT + 99 others); Fri, 9 Oct 2020 17:16:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388506AbgJIVQN (ORCPT ); Fri, 9 Oct 2020 17:16:13 -0400 Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69D4EC0613D2 for ; Fri, 9 Oct 2020 14:16:13 -0700 (PDT) Received: by mail-io1-xd43.google.com with SMTP id u19so11681047ion.3 for ; Fri, 09 Oct 2020 14:16:13 -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=Cj0AOr19taccvBKtxwBkDF7KCRmextTNA9u4OCHvj9Q=; b=M34auMKs1ahm9/p7uy8MqFSqqP2PLqC63j1cWuQCZWPpbX6wNNNN+jxwm8y+pyRdIC w1S682tD9Xbr+GEBUqWoUXSgv5RHFuhL4/Wd9y4Pa2vP38/F796ZyRCwdkJmvkBVTuan qApwUd+FVK2QnEoTMQzE9ooT/IV1JqJpv0FCU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Cj0AOr19taccvBKtxwBkDF7KCRmextTNA9u4OCHvj9Q=; b=pEkOu0bgBsU8P08/VTuRp1hl1RJsAnF8CUKqr91xyNY6iIcFQcRGZhNNZtqFQAawzM TfJztFCSRNfycgXAHtkNLO4GKfD522SkeucVawxLIagdWJiP1FlsGE0dk9Yw7YzmZI/K CIxi00v33o6E8TFeLZC8N9yVqpa4ABsuziIEpix9YTg82s1S+0P7l3yAmoP72dxKgMNy tIhZz7nb5TU6pa8oNVzos7eqkXkCBcUNLEuU6Rh/beAUyKq5tjZt2CSmeZd8xX49jrco fiBX7Yw9eWFURD7xt23sT/ghr3PyOjclTX1B3yUbmUhFvPgP0tU1yXrXG2rf/aw0vMY0 n1vg== X-Gm-Message-State: AOAM533ZVwsZUFv/0A8epmtTfTIxjKPBLI9nNChCY0nukCJGraAaifw9 SvTW8x+7Vg/lUKhS3w1nNOVVQieZXh9kBK9+DbYKT6MbZR8h X-Received: by 2002:a05:6638:2b3:: with SMTP id d19mr12269215jaq.141.1602278172649; Fri, 09 Oct 2020 14:16:12 -0700 (PDT) MIME-Version: 1.0 References: <1602083313-19239-2-git-send-email-guoren@kernel.org> In-Reply-To: From: Atish Patra Date: Fri, 9 Oct 2020 14:16:00 -0700 Message-ID: Subject: Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2 To: Guo Ren Cc: Palmer Dabbelt , linux-riscv , Linux Kernel Mailing List , Andreas Schwab , aurelien@aurel32.net, Guo Ren Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > 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/ -- Regards, Atish