From: Palmer Dabbelt <palmerdabbelt@google.com>
To: mhiramat@kernel.org
Cc: guoren@kernel.org, greentime.hu@sifive.com,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
Paul Walmsley <paul.walmsley@sifive.com>,
anup@brainfault.org, linux-csky@vger.kernel.org,
zong.li@sifive.com, guoren@linux.alibaba.com
Subject: Re: [PATCH V2] riscv: Fixup compile error BUILD_BUG_ON failed
Date: Mon, 29 Jun 2020 16:22:50 -0700 (PDT) [thread overview]
Message-ID: <mhng-37e70bbc-2616-41e6-bc8a-f144ca647c97@palmerdabbelt-glaptop1> (raw)
In-Reply-To: <20200629012524.c941a5f18aa7f312d325f714@kernel.org>
On Sun, 28 Jun 2020 09:25:24 PDT (-0700), mhiramat@kernel.org wrote:
> On Sun, 28 Jun 2020 16:07:37 +0000
> guoren@kernel.org wrote:
>
>> From: Guo Ren <guoren@linux.alibaba.com>
>>
>> Unfortunately, the current code couldn't be compiled:
>>
>> CC arch/riscv/kernel/patch.o
>> In file included from ./include/linux/kernel.h:11,
>> from ./include/linux/list.h:9,
>> from ./include/linux/preempt.h:11,
>> from ./include/linux/spinlock.h:51,
>> from arch/riscv/kernel/patch.c:6:
>> In function ‘fix_to_virt’,
>> inlined from ‘patch_map’ at arch/riscv/kernel/patch.c:37:17:
>> ./include/linux/compiler.h:392:38: error: call to ‘__compiletime_assert_205’ declared with attribute error: BUILD_BUG_ON failed: idx >= __end_of_fixed_addresses
>> _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>> ^
>> ./include/linux/compiler.h:373:4: note: in definition of macro ‘__compiletime_assert’
>> prefix ## suffix(); \
>> ^~~~~~
>> ./include/linux/compiler.h:392:2: note: in expansion of macro ‘_compiletime_assert’
>> _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>> ^~~~~~~~~~~~~~~~~~~
>> ./include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’
>> #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
>> ^~~~~~~~~~~~~~~~~~
>> ./include/linux/build_bug.h:50:2: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
>> BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
>> ^~~~~~~~~~~~~~~~
>> ./include/asm-generic/fixmap.h:32:2: note: in expansion of macro ‘BUILD_BUG_ON’
>> BUILD_BUG_ON(idx >= __end_of_fixed_addresses);
>> ^~~~~~~~~~~~
>>
>> Because fix_to_virt(, idx) needs a const value, not a dynamic variable of
>> reg-a0 or BUILD_BUG_ON failed with "idx >= __end_of_fixed_addresses".
>
> Looks good to me :)
>
> Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Is there a configuration that runs into this bug? It's not showing up for me,
and I generally try to add regressions to my test suite.
> Thanks!
>
>>
>> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
>> Cc: Masami Hiramatsu <mhiramat@kernel.org>
>> Cc: Zong Li <zong.li@sifive.com>
>> ---
>> Changelog V2:
>> - Use __always_inline as same as fix_to_virt
>> - Use const "const unsigned int" for 2th param
>>
>> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
>> ---
>> arch/riscv/kernel/patch.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c
>> index d4a64df..3179a4e 100644
>> --- a/arch/riscv/kernel/patch.c
>> +++ b/arch/riscv/kernel/patch.c
>> @@ -20,7 +20,12 @@ struct patch_insn {
>> };
>>
>> #ifdef CONFIG_MMU
>> -static void *patch_map(void *addr, int fixmap)
>> +/*
>> + * The fix_to_virt(, idx) needs a const value (not a dynamic variable of
>> + * reg-a0) or BUILD_BUG_ON failed with "idx >= __end_of_fixed_addresses".
>> + * So use '__always_inline' and 'const unsigned int fixmap' here.
>> + */
>> +static __always_inline void *patch_map(void *addr, const unsigned int fixmap)
>> {
>> uintptr_t uintaddr = (uintptr_t) addr;
>> struct page *page;
>> @@ -37,7 +42,6 @@ static void *patch_map(void *addr, int fixmap)
>> return (void *)set_fixmap_offset(fixmap, page_to_phys(page) +
>> (uintaddr & ~PAGE_MASK));
>> }
>> -NOKPROBE_SYMBOL(patch_map);
>>
>> static void patch_unmap(int fixmap)
>> {
>> --
>> 2.7.4
>>
next prev parent reply other threads:[~2020-06-29 23:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-28 16:07 [PATCH V2] riscv: Fixup compile error BUILD_BUG_ON failed guoren
2020-06-28 16:25 ` Masami Hiramatsu
2020-06-29 23:22 ` Palmer Dabbelt [this message]
2020-06-30 0:12 ` Guo Ren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mhng-37e70bbc-2616-41e6-bc8a-f144ca647c97@palmerdabbelt-glaptop1 \
--to=palmerdabbelt@google.com \
--cc=anup@brainfault.org \
--cc=greentime.hu@sifive.com \
--cc=guoren@kernel.org \
--cc=guoren@linux.alibaba.com \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mhiramat@kernel.org \
--cc=paul.walmsley@sifive.com \
--cc=zong.li@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).