| Message ID | 20210514100106.3404011-1-arnd@kernel.org |
|---|---|
| Headers | show |
| Series | Unify asm/unaligned.h around struct helper | expand |
On Fri, May 14, 2021 at 3:02 AM Arnd Bergmann <arnd@kernel.org> wrote: > > I've included this version in the asm-generic tree for 5.14 already, > addressing the few issues that were pointed out in the RFC. If there > are any remaining problems, I hope those can be addressed as follow-up > patches. This continues to look great to me, and now has the even simpler remaining implementation. I'd be tempted to just pull it in for 5.13, but I guess we don't actually have any _outstanding_ bug in this area (the bug was in our zlib code, required -O3 to trigger, has been fixed now, and the biggy case didn't even use "get_unaligned()"). So I guess your 5.14 timing is the right thing to do. Linus
On 5/14/21 10:32 AM, Linus Torvalds wrote: > On Fri, May 14, 2021 at 3:02 AM Arnd Bergmann <arnd@kernel.org> wrote: >> I've included this version in the asm-generic tree for 5.14 already, >> addressing the few issues that were pointed out in the RFC. If there >> are any remaining problems, I hope those can be addressed as follow-up >> patches. > This continues to look great to me, and now has the even simpler > remaining implementation. > > I'd be tempted to just pull it in for 5.13, but I guess we don't > actually have any _outstanding_ bug in this area (the bug was in our > zlib code, required -O3 to trigger, has been fixed now, Wasn't the new zlib code slated for 5.14. I don't see it in your master yet > and the biggy > case didn't even use "get_unaligned()"). Indeed this series is sort of orthogonal to that bug, but IMO that bug still exists in 5.13 for -O3 build, granted that is not enabled for !ARC. -Vineet > > So I guess your 5.14 timing is the right thing to do. > > Linus
On Fri, May 14, 2021 at 7:32 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Fri, May 14, 2021 at 3:02 AM Arnd Bergmann <arnd@kernel.org> wrote: > > > > I've included this version in the asm-generic tree for 5.14 already, > > addressing the few issues that were pointed out in the RFC. If there > > are any remaining problems, I hope those can be addressed as follow-up > > patches. > > This continues to look great to me, and now has the even simpler > remaining implementation. > > I'd be tempted to just pull it in for 5.13, but I guess we don't > actually have any _outstanding_ bug in this area (the bug was in our > zlib code, required -O3 to trigger, has been fixed now, and the biggy > case didn't even use "get_unaligned()"). > > So I guess your 5.14 timing is the right thing to do. Yes, I think that's best, just in case something does come up. While all the object code I looked at does appear better, this is one of those areas that can be hard to pinpoint if we hit a regression in a particular combination of architecture+compiler+source file. I have pushed a signed tag to https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic-unaligned-5.14 and plan to send that in the 5.14 merge window unless you decide to take it now after all. Arnd
On 5/14/21 12:22 PM, Linus Torvalds wrote: > On Fri, May 14, 2021 at 11:52 AM Vineet Gupta > <Vineet.Gupta1@synopsys.com> wrote: >> Wasn't the new zlib code slated for 5.14. I don't see it in your master yet > You're right, I never actually committed it, since it was specific to > ARC and -O3 Well, not really, the issue manifested in ARC O3 testing, but I showed the problem existed for arm64 gcc too. > and I wasn't entirely happy with the amount of testing it > got (with Heiko pointing out that the s390 stuff needed more fixes for > the change). With his addon patch everything seemed hunky dory. > The patch below is required on top of your patch to make it compile > for s390 as well. > Tested with kernel image decompression, and also btrfs with file > compression; both software and hardware compression. > Everything seems to work. > So in fact it's not even queued up for 5.14 due to this all, I just dropped it. But Why. Can't we throw it in linux-next for 5.14. I promise to test it - and will likely hit any corner cases. Also for the time being we could force just that file/files to build for -O3 to stress test the aspects that were fragile. >>> and the biggy >>> case didn't even use "get_unaligned()"). >> Indeed this series is sort of orthogonal to that bug, but IMO that bug >> still exists in 5.13 for -O3 build, granted that is not enabled for !ARC. > Right, the zlib bug is still there. > > But Arnd's series wouldn't even fix it: right now inffast has its own > - ugly and slow - special 2-byte-only version of "get_unaligned()", > called "get_unaligned16()". I know that's why said they are orthogonal. > And because it's ugly and slow, it's not actually used for > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. > > Vineet - maybe the fix is to not take my patch to update to a newer > zlib, but to just fix inffast to use the proper get_unaligned(). Then > Arnd's series _would_ actually fix all this.. OK if you say so. -Vineet
On Fri, May 14, 2021 at 12:45 PM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > > Well, not really, the issue manifested in ARC O3 testing, but I showed > the problem existed for arm64 gcc too. .. but not with a supported kernel configuration. > > So in fact it's not even queued up for 5.14 due to this all, I just dropped it. > > But Why. I just didn't have time to deal with it during the merge window. If you keep it alive, that's all fine and good. Linus
On Thu, Dec 16, 2021 at 9:29 AM Ard Biesheuvel <ardb@kernel.org> wrote: > > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is used in many places to > conditionally emit code that violates C alignment rules. E.g., there > is this example in Documentation/core-api/unaligned-memory-access.rst: > > bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > { > #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > u32 fold = ((*(const u32 *)addr1) ^ (*(const u32 *)addr2)) | > ((*(const u16 *)(addr1 + 4)) ^ (*(const u16 *)(addr2 + 4))); > return fold == 0; > #else It probably works fine in practice - the one case we had was really pretty special, and about the vectorizer doing odd things. But I think we should strive to convert these to use "get_unaligned()", since code generation is fine. It still often makes sense to have that test for the config variable, simply because the approach might be different if we know unaligned accesses are slow. So I'll happily take patches that do obvious conversions to get_unaligned() where they make sense, but I don't think we should consider this some huge hard requirement. Linus
On Thu, Dec 16, 2021 at 06:29:40PM +0100, Ard Biesheuvel wrote: > I think this series is a huge improvement, but it does not solve the > UB problem completely. As we found, there are open issues in the GCC > bugzilla regarding assumptions in the compiler that aligned quantities > either overlap entirely or not at all. (e.g., > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100363) That isn't open, it was closed as INVALID back in May. (Naturally) aligned quantities only overlap if they are the same datum. This follows directly from the definition of (naturally) aligned. There is no mystery here. All unaligned data need to be marked up properly. > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is used in many places to > conditionally emit code that violates C alignment rules. Most of this is ABI, not C. It is the ABI that requires certain alignments. Ignoring that plain does not work, but even if it would you will end up with much slower generated code. > whereas the following pattern makes more sense, I think, and does not > violate any C rules in the common case: > > #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > // use unaligned accessors, which are cheap or even entirely free > #else > // avoid unaligned accessors, as they are expensive; instead, reorganize > // the data so we don't need them (similar to setting NET_IP_ALIGN to 2) > #endif Yes, this looks more reasonable. > The only remaining problem here is reinterpreting a char* pointer to a > u32*, e.g., for accessing the IP address in an Ethernet frame when > NET_IP_ALIGN == 2, which could suffer from the same UB problem again, > as I understand it. The problem is never casting a pointer to pointer to character type, and then later back to an appriopriate pointer type. These things are both required to work. The problem always is accessing something as if it was something of another type, which is not valid C. This however is exactly what -fno-strict-aliasing allows, so that works as well. But this does not have much to do with alignment. Segher
On Fri, Dec 17, 2021 at 12:34:53PM +0000, David Laight wrote: > From: Segher Boessenkool > > Sent: 16 December 2021 18:56 > ... > > > The only remaining problem here is reinterpreting a char* pointer to a > > > u32*, e.g., for accessing the IP address in an Ethernet frame when > > > NET_IP_ALIGN == 2, which could suffer from the same UB problem again, > > > as I understand it. > > > > The problem is never casting a pointer to pointer to character type, and > > then later back to an appriopriate pointer type. > > These things are both required to work. > > I think that is true of 'void *', not 'char *'. No, see 6.3.2.3/7. Both are allowed (and behave the same in fact). > 'char' is special in that 'strict aliasing' doesn't apply to it. > (Which is actually a pain sometimes.) That has nothing to do with it. Yes, you can validly access any memory as a character type, but that has nothing to do with what pointer casts are allowed and which are not. > > The problem always is accessing something as if it > > was something of another type, which is not valid C. This however is > > exactly what -fno-strict-aliasing allows, so that works as well. > > IIRC the C language only allows you to have pointers to valid data items. > (Since they can only be generated by the & operator on a valid item.) Not so. For example you are explicitly allowed to have pointers one past the last element of an array (and do arithmetic on that!), and of course null pointers are a thing. C allows you to make up pointers from integers as well. This is perfectly fine to do. Accessing anything via such pointers might well be not standard C, of course. > Indirecting any other pointer is probably UB! If a pointer points to an object, indirecting it gives an lvalue of that object. It does not matter how you got that pointer, all that matters is that it points at a valid object. > This (sort of) allows the compiler to 'look through' casts to find > what the actual type is (or might be). > It can then use that information to make optimisation choices. > This has caused grief with memcpy() calls that are trying to copy > a structure that the coder knows is misaligned to an aligned buffer. This is 6.5/7. Alignment is 6.2.8 but it doesn't actually come into play at all here. > So while *(unaligned_ptr *)char_ptr probably has to work. Only if the original pointer points to an object that is correct (including correctly aligned) for such an lvalue. > If the compiler can see *(unaligned_ptr *)(char *)int_ptr it can > assume the alignment of the 'int_ptr' and do a single aligned access. It is undefined behaviour to have an address in int_ptr that is not correctly aligned for whatever type it points to. Segher
From: Arnd Bergmann <arnd@arndb.de> The get_unaligned()/put_unaligned() helpers are traditionally architecture specific, with the two main variants being the "access-ok.h" version that assumes unaligned pointer accesses always work on a particular architecture, and the "le-struct.h" version that casts the data to a byte aligned type before dereferencing, for architectures that cannot always do unaligned accesses in hardware. Based on the discussion linked below, it appears that the access-ok version is not realiable on any architecture, but the struct version probably has no downsides. This series changes the code to use the same implementation on all architectures, addressing the few exceptions separately. I've included this version in the asm-generic tree for 5.14 already, addressing the few issues that were pointed out in the RFC. If there are any remaining problems, I hope those can be addressed as follow-up patches. Arnd Link: https://lore.kernel.org/lkml/75d07691-1e4f-741f-9852-38c0b4f520bc@synopsys.com/ Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100363 Link: https://lore.kernel.org/lkml/20210507220813.365382-14-arnd@kernel.org/ Link: git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git unaligned-rework-v2 Arnd Bergmann (13): asm-generic: use asm-generic/unaligned.h for most architectures openrisc: always use unaligned-struct header sh: remove unaligned access for sh4a m68k: select CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS powerpc: use linux/unaligned/le_struct.h on LE power7 asm-generic: unaligned: remove byteshift helpers asm-generic: unaligned always use struct helpers partitions: msdos: fix one-byte get_unaligned() apparmor: use get_unaligned() only for multi-byte words mwifiex: re-fix for unaligned accesses netpoll: avoid put_unaligned() on single character asm-generic: uaccess: 1-byte access is always aligned asm-generic: simplify asm/unaligned.h arch/alpha/include/asm/unaligned.h | 12 -- arch/arm/include/asm/unaligned.h | 27 --- arch/ia64/include/asm/unaligned.h | 12 -- arch/m68k/Kconfig | 1 + arch/m68k/include/asm/unaligned.h | 26 --- arch/microblaze/include/asm/unaligned.h | 27 --- arch/mips/crypto/crc32-mips.c | 2 +- arch/openrisc/include/asm/unaligned.h | 47 ----- arch/parisc/include/asm/unaligned.h | 6 +- arch/powerpc/include/asm/unaligned.h | 22 --- arch/sh/include/asm/unaligned-sh4a.h | 199 -------------------- arch/sh/include/asm/unaligned.h | 13 -- arch/sparc/include/asm/unaligned.h | 11 -- arch/x86/include/asm/unaligned.h | 15 -- arch/xtensa/include/asm/unaligned.h | 29 --- block/partitions/ldm.h | 2 +- block/partitions/msdos.c | 2 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +- include/asm-generic/uaccess.h | 4 +- include/asm-generic/unaligned.h | 141 +++++++++++--- include/linux/unaligned/access_ok.h | 68 ------- include/linux/unaligned/be_byteshift.h | 71 ------- include/linux/unaligned/be_memmove.h | 37 ---- include/linux/unaligned/be_struct.h | 37 ---- include/linux/unaligned/generic.h | 115 ----------- include/linux/unaligned/le_byteshift.h | 71 ------- include/linux/unaligned/le_memmove.h | 37 ---- include/linux/unaligned/le_struct.h | 37 ---- include/linux/unaligned/memmove.h | 46 ----- net/core/netpoll.c | 4 +- security/apparmor/policy_unpack.c | 2 +- 31 files changed, 131 insertions(+), 1002 deletions(-) delete mode 100644 arch/alpha/include/asm/unaligned.h delete mode 100644 arch/arm/include/asm/unaligned.h delete mode 100644 arch/ia64/include/asm/unaligned.h delete mode 100644 arch/m68k/include/asm/unaligned.h delete mode 100644 arch/microblaze/include/asm/unaligned.h delete mode 100644 arch/openrisc/include/asm/unaligned.h delete mode 100644 arch/powerpc/include/asm/unaligned.h delete mode 100644 arch/sh/include/asm/unaligned-sh4a.h delete mode 100644 arch/sh/include/asm/unaligned.h delete mode 100644 arch/sparc/include/asm/unaligned.h delete mode 100644 arch/x86/include/asm/unaligned.h delete mode 100644 arch/xtensa/include/asm/unaligned.h delete mode 100644 include/linux/unaligned/access_ok.h delete mode 100644 include/linux/unaligned/be_byteshift.h delete mode 100644 include/linux/unaligned/be_memmove.h delete mode 100644 include/linux/unaligned/be_struct.h delete mode 100644 include/linux/unaligned/generic.h delete mode 100644 include/linux/unaligned/le_byteshift.h delete mode 100644 include/linux/unaligned/le_memmove.h delete mode 100644 include/linux/unaligned/le_struct.h delete mode 100644 include/linux/unaligned/memmove.h -- 2.29.2 Cc: Amitkumar Karwar <amitkarwar@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Eric Dumazet <edumazet@google.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Ganapathi Bhat <ganapathi017@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: James Morris <jmorris@namei.org> Cc: Jens Axboe <axboe@kernel.dk> Cc: John Johansen <john.johansen@canonical.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: Rich Felker <dalias@libc.org> Cc: "Richard Russon (FlatCap)" <ldm@flatcap.org> Cc: Russell King <linux@armlinux.org.uk> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Sharvari Harisangam <sharvari.harisangam@nxp.com> Cc: Stafford Horne <shorne@gmail.com> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vladimir Oltean <vladimir.oltean@nxp.com> Cc: Xinming Hu <huxinming820@gmail.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-crypto@vger.kernel.org Cc: openrisc@lists.librecores.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: sparclinux@vger.kernel.org Cc: linux-ntfs-dev@lists.sourceforge.net Cc: linux-block@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-security-module@vger.kernel.org