From: Matthias Kaehlcke <mka@chromium.org>
To: hpa@zytor.com
Cc: Nick Desaulniers <ndesaulniers@google.com>,
Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, LKML <linux-kernel@vger.kernel.org>,
Manoj Gupta <manojgupta@chromium.org>,
Tiancong Wang <tcwang@chromium.org>,
Stephen Hines <srhines@google.com>,
clang-built-linux@googlegroups.com,
Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Subject: Re: [PATCH] lib: Add shared copy of __lshrti3 from libgcc
Date: Fri, 15 Mar 2019 16:47:01 -0700 [thread overview]
Message-ID: <20190315234701.GF112750@google.com> (raw)
In-Reply-To: <18F0D032-4FC4-4194-A2F4-B7ED68C2C5F2@zytor.com>
On Fri, Mar 15, 2019 at 03:12:08PM -0700, hpa@zytor.com wrote:
> On March 15, 2019 3:06:37 PM PDT, Nick Desaulniers <ndesaulniers@google.com> wrote:
> >On Fri, Mar 15, 2019 at 1:54 PM Matthias Kaehlcke <mka@chromium.org>
> >wrote:
> >>
> >> The compiler may emit calls to __lshrti3 from the compiler runtime
> >> library, which results in undefined references:
> >>
> >> arch/x86/kvm/x86.o: In function `mul_u64_u64_shr':
> >> include/linux/math64.h:186: undefined reference to `__lshrti3'
> >
> >Looks like Clang will emit this at -Oz (but not -O2):
> >https://godbolt.org/z/w1_2YC
> >
> >>
> >> Add a copy of the __lshrti3 libgcc routine (from gcc v4.9.2).
> >
> >Has it changed since? If so why not a newer version of libgcc_s?
> >
> >>
> >> Include the function for x86 builds with clang, which is the
> >> environment where the above error was observed.
> >>
> >> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> >> ---
> >> arch/x86/Kconfig | 1 +
> >> include/linux/libgcc.h | 16 ++++++++++++++++
> >> lib/Kconfig | 3 +++
> >> lib/Makefile | 1 +
> >> lib/lshrti3.c | 31 +++++++++++++++++++++++++++++++
> >> 5 files changed, 52 insertions(+)
> >> create mode 100644 lib/lshrti3.c
> >>
> >> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> >> index c1f9b3cf437c..a5e0d923845d 100644
> >> --- a/arch/x86/Kconfig
> >> +++ b/arch/x86/Kconfig
> >> @@ -105,6 +105,7 @@ config X86
> >> select GENERIC_IRQ_PROBE
> >> select GENERIC_IRQ_RESERVATION_MODE
> >> select GENERIC_IRQ_SHOW
> >> + select GENERIC_LIB_LSHRTI3 if CC_IS_CLANG
> >> select GENERIC_PENDING_IRQ if SMP
> >> select GENERIC_SMP_IDLE_THREAD
> >> select GENERIC_STRNCPY_FROM_USER
> >> diff --git a/include/linux/libgcc.h b/include/linux/libgcc.h
> >> index 32e1e0f4b2d0..a71036471838 100644
> >> --- a/include/linux/libgcc.h
> >> +++ b/include/linux/libgcc.h
> >> @@ -22,15 +22,26 @@
> >> #include <asm/byteorder.h>
> >>
> >> typedef int word_type __attribute__ ((mode (__word__)));
> >> +typedef int TItype __attribute__ ((mode (TI)));
> >
> >Well that's an interesting new compiler attribute.
> >https://stackoverflow.com/questions/4559025/what-does-gcc-attribute-modexx-actually-do
> >Please use `__mode(TI)` from include/linux/compiler_attributes.h ex.
> >typedef int TItype __mode(TI);
> >
> >>
> >> #ifdef __BIG_ENDIAN
> >> struct DWstruct {
> >> int high, low;
> >> };
> >> +
> >> +struct DWstruct128 {
> >> + long long high, low;
> >> +};
> >> +
> >> #elif defined(__LITTLE_ENDIAN)
> >> struct DWstruct {
> >> int low, high;
> >> };
> >> +
> >> +struct DWstruct128 {
> >> + long long low, high;
> >> +};
> >> +
> >> #else
> >> #error I feel sick.
> >> #endif
> >> @@ -40,4 +51,9 @@ typedef union {
> >> long long ll;
> >> } DWunion;
> >>
> >> +typedef union {
> >> + struct DWstruct128 s;
> >> + TItype ll;
> >> +} DWunion128;
> >> +
> >> #endif /* __ASM_LIBGCC_H */
> >> diff --git a/lib/Kconfig b/lib/Kconfig
> >> index a9e56539bd11..369e10259ea6 100644
> >> --- a/lib/Kconfig
> >> +++ b/lib/Kconfig
> >> @@ -624,6 +624,9 @@ config GENERIC_LIB_ASHRDI3
> >> config GENERIC_LIB_LSHRDI3
> >> bool
> >>
> >> +config GENERIC_LIB_LSHRTI3
> >> + bool
> >> +
> >> config GENERIC_LIB_MULDI3
> >> bool
> >>
> >> diff --git a/lib/Makefile b/lib/Makefile
> >> index 4e066120a0d6..42648411f451 100644
> >> --- a/lib/Makefile
> >> +++ b/lib/Makefile
> >> @@ -277,6 +277,7 @@ obj-$(CONFIG_PARMAN) += parman.o
> >> obj-$(CONFIG_GENERIC_LIB_ASHLDI3) += ashldi3.o
> >> obj-$(CONFIG_GENERIC_LIB_ASHRDI3) += ashrdi3.o
> >> obj-$(CONFIG_GENERIC_LIB_LSHRDI3) += lshrdi3.o
> >> +obj-$(CONFIG_GENERIC_LIB_LSHRTI3) += lshrti3.o
> >> obj-$(CONFIG_GENERIC_LIB_MULDI3) += muldi3.o
> >> obj-$(CONFIG_GENERIC_LIB_CMPDI2) += cmpdi2.o
> >> obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.o
> >> diff --git a/lib/lshrti3.c b/lib/lshrti3.c
> >> new file mode 100644
> >> index 000000000000..2d2123bb3030
> >> --- /dev/null
> >> +++ b/lib/lshrti3.c
> >> @@ -0,0 +1,31 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +
> >> +#include <linux/export.h>
> >> +#include <linux/libgcc.h>
> >> +
> >> +long long __lshrti3(long long u, word_type b)
> >> +{
> >> + DWunion128 uu, w;
> >> + word_type bm;
> >> +
> >> + if (b == 0)
> >> + return u;
> >> +
> >> + uu.ll = u;
> >> + bm = 64 - b;
> >> +
> >> + if (bm <= 0) {
> >> + w.s.high = 0;
> >> + w.s.low = (unsigned long long) uu.s.high >> -bm;
> >> + } else {
> >> + const unsigned long long carries =
> >> + (unsigned long long) uu.s.high << bm;
> >> + w.s.high = (unsigned long long) uu.s.high >> b;
> >> + w.s.low = ((unsigned long long) uu.s.low >> b) |
> >carries;
> >> + }
> >> +
> >> + return w.ll;
> >> +}
> >> +#ifndef BUILD_VDSO
> >> +EXPORT_SYMBOL(__lshrti3);
> >> +#endif
> >
> >I don't think you want this. Maybe that was carried over from
> >https://lkml.org/lkml/2019/3/15/669
> >by accident? The above linkage error mentions arch/x86/kvm/x86.o
> >which I wouldn't expect to be linked into the VDSO image?
>
> Or just "u64"...
Are you referring to TItype? It currenty is a 128-bit value.
next prev parent reply other threads:[~2019-03-15 23:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-15 20:54 [PATCH] lib: Add shared copy of __lshrti3 from libgcc Matthias Kaehlcke
2019-03-15 22:06 ` Nick Desaulniers
2019-03-15 22:08 ` hpa
2019-03-15 23:34 ` Matthias Kaehlcke
2019-03-15 23:51 ` hpa
2019-03-15 22:12 ` hpa
2019-03-15 23:47 ` Matthias Kaehlcke [this message]
2019-03-15 23:53 ` hpa
2019-03-18 16:38 ` Matthias Kaehlcke
2019-03-15 23:29 ` Matthias Kaehlcke
2019-03-18 9:14 ` Peter Zijlstra
2019-03-18 14:43 ` David Laight
2019-03-18 14:54 ` Peter Zijlstra
2019-03-18 21:31 ` Matthias Kaehlcke
2019-03-18 21:50 ` hpa
2019-03-18 22:16 ` Matthias Kaehlcke
2019-03-18 23:44 ` hpa
2019-03-18 23:52 ` Matthias Kaehlcke
2019-03-18 23:54 ` hpa
2019-03-18 23:55 ` hpa
2019-03-19 17:10 ` Matthias Kaehlcke
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=20190315234701.GF112750@google.com \
--to=mka@chromium.org \
--cc=bp@alien8.de \
--cc=clang-built-linux@googlegroups.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=manojgupta@chromium.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mingo@redhat.com \
--cc=ndesaulniers@google.com \
--cc=srhines@google.com \
--cc=tcwang@chromium.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).