From: Nathan Chancellor <nathan@kernel.org> To: Changbin Du <changbin.du@huawei.com> Cc: Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, changbin.du@gmail.com, Nick Desaulniers <ndesaulniers@google.com>, Tom Rix <trix@redhat.com>, Hui Wang <hw.huiwang@huawei.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: Re: riscv: alternatives: move length validation inside the subsection Date: Thu, 2 Jun 2022 07:43:01 -0700 [thread overview] Message-ID: <YpjMdVjLzoIoSGz9@dev-arch.thelio-3990X> (raw) In-Reply-To: <20220602112734.it2bzlqaismotjof@M910t> On Thu, Jun 02, 2022 at 07:27:34PM +0800, Changbin Du wrote: > Apply the same fix from commit 966a0acce2fc ("arm64/alternatives: move > length validation inside the subsection") to riscv. Due to the one-pass > design of LLVM's integrated assembler, it can not compute the length of > instructions if the .org directive is outside of the subsection that these > instructions are in. > > Here is the build error reported by llvm: > > In file included from ./arch/riscv/include/asm/pgtable.h:108: > ./arch/riscv/include/asm/tlbflush.h:23:2: error: expected assembly-time absolute expression > ALT_FLUSH_TLB_PAGE(__asm__ __volatile__ ("sfence.vma %0" : : "r" (addr) : "memory")); > ^ > ./arch/riscv/include/asm/errata_list.h:41:5: note: expanded from macro 'ALT_FLUSH_TLB_PAGE' > asm(ALTERNATIVE("sfence.vma %0", "sfence.vma", SIFIVE_VENDOR_ID, \ > ^ > ./arch/riscv/include/asm/alternative-macros.h:187:2: note: expanded from macro 'ALTERNATIVE' > _ALTERNATIVE_CFG(old_content, new_content, vendor_id, errata_id, CONFIG_k) > ^ > ./arch/riscv/include/asm/alternative-macros.h:113:2: note: expanded from macro '_ALTERNATIVE_CFG' > __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)) > ^ > ./arch/riscv/include/asm/alternative-macros.h:110:2: note: expanded from macro '__ALTERNATIVE_CFG' > ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) > ^ > ./arch/riscv/include/asm/alternative-macros.h:98:3: note: expanded from macro 'ALT_NEW_CONTENT' > ".org . - (887b - 886b) + (889b - 888b)\n" \ > ^ > <inline asm>:25:6: note: instantiated into assembly here > .org . - (887b - 886b) + (889b - 888b) > ^ > > Signed-off-by: Changbin Du <changbin.du@gmail.com> Thanks for the patch! I already sent an equivalent change two weeks ago as https://lore.kernel.org/20220516214520.3252074-1-nathan@kernel.org/, which I think is slightly better because it handles the __ASSEMBLY__ version of the macro as well. Cheers, Nathan > --- > arch/riscv/include/asm/alternative-macros.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h > index e13b1f6bb400..c7d7f1945768 100644 > --- a/arch/riscv/include/asm/alternative-macros.h > +++ b/arch/riscv/include/asm/alternative-macros.h > @@ -94,9 +94,9 @@ > new_c "\n" \ > ".option pop\n" \ > "889 :\n" \ > - ".previous\n" \ > ".org . - (887b - 886b) + (889b - 888b)\n" \ > ".org . - (889b - 888b) + (887b - 886b)\n" \ > + ".previous\n" \ > ".endif\n" > > #define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \ > -- > 2.26.2 >
WARNING: multiple messages have this Message-ID (diff)
From: Nathan Chancellor <nathan@kernel.org> To: Changbin Du <changbin.du@huawei.com> Cc: Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, changbin.du@gmail.com, Nick Desaulniers <ndesaulniers@google.com>, Tom Rix <trix@redhat.com>, Hui Wang <hw.huiwang@huawei.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: Re: riscv: alternatives: move length validation inside the subsection Date: Thu, 2 Jun 2022 07:43:01 -0700 [thread overview] Message-ID: <YpjMdVjLzoIoSGz9@dev-arch.thelio-3990X> (raw) In-Reply-To: <20220602112734.it2bzlqaismotjof@M910t> On Thu, Jun 02, 2022 at 07:27:34PM +0800, Changbin Du wrote: > Apply the same fix from commit 966a0acce2fc ("arm64/alternatives: move > length validation inside the subsection") to riscv. Due to the one-pass > design of LLVM's integrated assembler, it can not compute the length of > instructions if the .org directive is outside of the subsection that these > instructions are in. > > Here is the build error reported by llvm: > > In file included from ./arch/riscv/include/asm/pgtable.h:108: > ./arch/riscv/include/asm/tlbflush.h:23:2: error: expected assembly-time absolute expression > ALT_FLUSH_TLB_PAGE(__asm__ __volatile__ ("sfence.vma %0" : : "r" (addr) : "memory")); > ^ > ./arch/riscv/include/asm/errata_list.h:41:5: note: expanded from macro 'ALT_FLUSH_TLB_PAGE' > asm(ALTERNATIVE("sfence.vma %0", "sfence.vma", SIFIVE_VENDOR_ID, \ > ^ > ./arch/riscv/include/asm/alternative-macros.h:187:2: note: expanded from macro 'ALTERNATIVE' > _ALTERNATIVE_CFG(old_content, new_content, vendor_id, errata_id, CONFIG_k) > ^ > ./arch/riscv/include/asm/alternative-macros.h:113:2: note: expanded from macro '_ALTERNATIVE_CFG' > __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)) > ^ > ./arch/riscv/include/asm/alternative-macros.h:110:2: note: expanded from macro '__ALTERNATIVE_CFG' > ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) > ^ > ./arch/riscv/include/asm/alternative-macros.h:98:3: note: expanded from macro 'ALT_NEW_CONTENT' > ".org . - (887b - 886b) + (889b - 888b)\n" \ > ^ > <inline asm>:25:6: note: instantiated into assembly here > .org . - (887b - 886b) + (889b - 888b) > ^ > > Signed-off-by: Changbin Du <changbin.du@gmail.com> Thanks for the patch! I already sent an equivalent change two weeks ago as https://lore.kernel.org/20220516214520.3252074-1-nathan@kernel.org/, which I think is slightly better because it handles the __ASSEMBLY__ version of the macro as well. Cheers, Nathan > --- > arch/riscv/include/asm/alternative-macros.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h > index e13b1f6bb400..c7d7f1945768 100644 > --- a/arch/riscv/include/asm/alternative-macros.h > +++ b/arch/riscv/include/asm/alternative-macros.h > @@ -94,9 +94,9 @@ > new_c "\n" \ > ".option pop\n" \ > "889 :\n" \ > - ".previous\n" \ > ".org . - (887b - 886b) + (889b - 888b)\n" \ > ".org . - (889b - 888b) + (887b - 886b)\n" \ > + ".previous\n" \ > ".endif\n" > > #define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \ > -- > 2.26.2 > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-06-02 14:43 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-02 11:27 riscv: alternatives: move length validation inside the subsection Changbin Du 2022-06-02 11:27 ` Changbin Du 2022-06-02 14:43 ` Nathan Chancellor [this message] 2022-06-02 14:43 ` Nathan Chancellor 2022-06-03 4:08 ` Changbin Du 2022-06-03 4:08 ` Changbin Du
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=YpjMdVjLzoIoSGz9@dev-arch.thelio-3990X \ --to=nathan@kernel.org \ --cc=aou@eecs.berkeley.edu \ --cc=changbin.du@gmail.com \ --cc=changbin.du@huawei.com \ --cc=hw.huiwang@huawei.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=llvm@lists.linux.dev \ --cc=ndesaulniers@google.com \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=trix@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.