1. 13 Sep, 2024 9 commits
    • Jason A. Donenfeld's avatar
      selftests: vDSO: fix cross build for getrandom and chacha tests · 67a121ac
      Jason A. Donenfeld authored
      Unlike the check for the standalone x86 test, the check for building the
      vDSO getrandom and chacaha tests looks at the architecture for the host
      rather than the architecture for the target when deciding if they should
      be built. Since the chacha test includes some assembler code this means
      that cross building with x86 as either the target or host is broken.
      
      There's also some additional complications, where ARCH can legitimately
      be either x86_64 or x86, but the source code we need to compile lives in
      a directory path containing arch/x86. The standard SRCARCH variable
      handles that. And actually, all these variables and proper substitutions
      are already described in tools/scripts/Makefile.arch, so just include
      that to handle it.
      
      Similarly, ARCH=x86 can actually describe ARCH=x86_64,
      just with CONFIG_64BIT, so we can't rely on ARCH for selecting
      non-32-bit tests. For that, check against $(ARCH)$(CONFIG_X86_32). This
      won't help for people manually running this inside the vDSO selftest
      directory (which isn't really supported anyway and has problems on
      various archs), but it should work for builds of the kselftests, where
      the CONFIG_* variables are defined. On x86_64 machines,
      $(ARCH)$(CONFIG_X86_32) will evaluate to x86. On arm64 machines, it will
      evaluate to arm64. On 32-bit x86 machines, it will evaluate to x86y,
      which won't match the filter list.
      Reported-by: default avatarMark Brown <broonie@kernel.org>
      Reported-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      67a121ac
    • Christophe Leroy's avatar
      random: vDSO: minimize and simplify header includes · 7f053812
      Christophe Leroy authored
      Depending on the architecture, building a 32-bit vDSO on a 64-bit kernel
      is problematic when some system headers are included.
      
      Minimise the amount of headers by moving needed items, such as
      __{get,put}_unaligned_t, into dedicated common headers and in general
      use more specific headers, similar to what was done in commit
      8165b57b ("linux/const.h: Extract common header for vDSO") and
      commit 8c59ab83 ("lib/vdso: Enable common headers").
      
      On some architectures this results in missing PAGE_SIZE, as was
      described by commit 8b3843ae ("vdso/datapage: Quick fix - use
      asm/page-def.h for ARM64"), so define this if necessary, in the same way
      as done prior by commit cffaefd1 ("vdso: Use CONFIG_PAGE_SHIFT in
      vdso/datapage.h").
      
      Removing linux/time64.h leads to missing 'struct timespec64' in
      x86's asm/pvclock.h. Add a forward declaration of that struct in
      that file.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      7f053812
    • Christophe Leroy's avatar
      random: vDSO: avoid call to out of line memset() · b7bad082
      Christophe Leroy authored
      With the current implementation, __cvdso_getrandom_data() calls
      memset() on certain architectures, which is unexpected in the VDSO.
      
      Rather than providing a memset(), simply rewrite opaque data
      initialization to avoid memset().
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      b7bad082
    • Christophe Leroy's avatar
      random: vDSO: add missing c-getrandom-y in Makefile · 81723e3a
      Christophe Leroy authored
      Same as for the gettimeofday CVDSO implementation, add c-getrandom-y to
      ease the inclusion of lib/vdso/getrandom.c in architectures' VDSO
      builds.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      81723e3a
    • Christophe Leroy's avatar
      random: vDSO: add __arch_get_k_vdso_rng_data() helper for data page access · b757959f
      Christophe Leroy authored
      _vdso_data is specific to x86 and __arch_get_k_vdso_data() is provided
      so that all architectures can provide the requested pointer.
      
      Do the same with _vdso_rng_data, provide __arch_get_k_vdso_rng_data()
      and don't use x86 _vdso_rng_data directly.
      
      Until now vdso/vsyscall.h was only included by time/vsyscall.c but now
      it will also be included in char/random.c, leading to a duplicate
      declaration of _vdso_data and _vdso_rng_data.
      
      To fix this issue, move the declaration in a C file. vma.c looks like
      the most appropriate candidate. We don't need to replace the definitions
      in vsyscall.h by declarations as declarations are already in asm/vvar.h.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      b757959f
    • Christophe Leroy's avatar
      random: vDSO: don't use 64-bit atomics on 32-bit architectures · 81c68960
      Christophe Leroy authored
      Performing SMP atomic operations on u64 fails on powerpc32:
      
          CC      drivers/char/random.o
        In file included from <command-line>:
        drivers/char/random.c: In function 'crng_reseed':
        ././include/linux/compiler_types.h:510:45: error: call to '__compiletime_assert_391' declared with attribute error: Need native word sized stores/loads for atomicity.
          510 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
              |                                             ^
        ././include/linux/compiler_types.h:491:25: note: in definition of macro '__compiletime_assert'
          491 |                         prefix ## suffix();                             \
              |                         ^~~~~~
        ././include/linux/compiler_types.h:510:9: note: in expansion of macro '_compiletime_assert'
          510 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
              |         ^~~~~~~~~~~~~~~~~~~
        ././include/linux/compiler_types.h:513:9: note: in expansion of macro 'compiletime_assert'
          513 |         compiletime_assert(__native_word(t),                            \
              |         ^~~~~~~~~~~~~~~~~~
        ./arch/powerpc/include/asm/barrier.h:74:9: note: in expansion of macro 'compiletime_assert_atomic_type'
           74 |         compiletime_assert_atomic_type(*p);                             \
              |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        ./include/asm-generic/barrier.h:172:55: note: in expansion of macro '__smp_store_release'
          172 | #define smp_store_release(p, v) do { kcsan_release(); __smp_store_release(p, v); } while (0)
              |                                                       ^~~~~~~~~~~~~~~~~~~
        drivers/char/random.c:286:9: note: in expansion of macro 'smp_store_release'
          286 |         smp_store_release(&__arch_get_k_vdso_rng_data()->generation, next_gen + 1);
              |         ^~~~~~~~~~~~~~~~~
      
      The kernel-side generation counter in the random driver is handled as an
      unsigned long, not as a u64, in base_crng and struct crng.
      
      But on the vDSO side, it needs to be an u64, not just an unsigned long,
      in order to support a 32-bit vDSO atop a 64-bit kernel.
      
      On kernel side, however, it is an unsigned long, hence a 32-bit value on
      32-bit architectures, so just cast it to unsigned long for the
      smp_store_release(). A side effect is that on big endian architectures
      the store will be performed in the upper 32 bits. It is not an issue on
      its own because the vDSO site doesn't mind the value, as it only checks
      differences. Just make sure that the vDSO side checks the full 64 bits.
      For that, the local current_generation has to be u64 as well.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      81c68960
    • Jason A. Donenfeld's avatar
      selftests: vDSO: open code basic chacha instead of linking to libsodium · 7fe5b3e4
      Jason A. Donenfeld authored
      Linking to libsodium makes building this test annoying in cross
      compilation environments and is just way too much. Since this is just a
      basic correctness test, simply open code a simple, unoptimized, dumb
      chacha, rather than linking to libsodium.
      
      This also fixes a correctness issue on big endian systems. The kernel's
      random.c doesn't bother doing a le32_to_cpu operation on the random
      bytes that are passed as the key, and consequently neither does
      vgetrandom-chacha.S. However, libsodium's chacha _does_ do this, since
      it takes the key as an array of bytes. This meant that the test was
      broken on big endian systems, which this commit rectifies.
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      7fe5b3e4
    • Jason A. Donenfeld's avatar
      random: vDSO: move prototype of arch chacha function to vdso/getrandom.h · 6fd13b28
      Jason A. Donenfeld authored
      Having the prototype for __arch_chacha20_blocks_nostack in
      arch/x86/include/asm/vdso/getrandom.h meant that the prototype and large
      doc comment were cloned by every architecture, which has been causing
      unnecessary churn. Instead move it into include/vdso/getrandom.h, where
      it can be shared by all archs implementing it.
      
      As a side bonus, this then lets us use that prototype in the
      vdso_test_chacha self test, to ensure that it matches the source, and
      indeed doing so turned up some inconsistencies, which are rectified
      here.
      Suggested-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      6fd13b28
    • Jason A. Donenfeld's avatar
      selftests: vDSO: ensure vgetrandom works in a time namespace · 2aec9003
      Jason A. Donenfeld authored
      After verifying that vDSO getrandom does work, which ensures that the
      RNG is initialized, test to see if it also works inside of a time
      namespace. This is important to test, because the vvar pages get
      swizzled around there. If the arch code isn't careful, the RNG will
      appear uninitialized inside of a time namespace.
      
      Because broken code makes the RNG appear uninitialized, test that
      everything works by issuing a call to vgetrandom from a fork in a time
      namespace, and use ptrace to ensure that the actual syscall getrandom
      doesn't get called. If it doesn't get called, then the test succeeds.
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      2aec9003
  2. 30 Aug, 2024 15 commits
    • Jason A. Donenfeld's avatar
      selftests: vDSO: quash clang omitted parameter warning in getrandom test · 33ffa2dd
      Jason A. Donenfeld authored
      When building with clang, there's this warning:
      
      vdso_test_getrandom.c:145:40: warning: omitting the parameter name in a function definition is a C23 extension [-Wc23-extensions]
        145 | static void *test_vdso_getrandom(void *)
            |                                        ^
      vdso_test_getrandom.c:155:40: warning: omitting the parameter name in a function definition is a C23 extension [-Wc23-extensions]
        155 | static void *test_libc_getrandom(void *)
            |                                        ^
      vdso_test_getrandom.c:165:43: warning: omitting the parameter name in a function definition is a C23 extension [-Wc23-extensions]
        165 | static void *test_syscall_getrandom(void *)
      
      Add the named ctx parameter to quash it.
      Reported-by: default avatarMark Brown <broonie@kernel.org>
      Reviewed-by: default avatarMark Brown <broonie@kernel.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      33ffa2dd
    • Christophe Leroy's avatar
      selftests: vDSO: use parse_vdso.h in vdso_test_abi · f0d0dbbc
      Christophe Leroy authored
      Don't duplicate parse_vdso function prototypes, include
      the header instead.
      
      Fixes: 693f5ca0 ("kselftest: Extend vDSO selftest")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      f0d0dbbc
    • Christophe Leroy's avatar
      selftests: vDSO: fix the way vDSO functions are called for powerpc · 6eda706a
      Christophe Leroy authored
      vdso_test_correctness test fails on powerpc:
      
      ~ # ./vdso_test_correctness
      ...
      [RUN]	Testing clock_gettime for clock CLOCK_REALTIME_ALARM (8)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      [RUN]	Testing clock_gettime for clock CLOCK_BOOTTIME_ALARM (9)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      [RUN]	Testing clock_gettime for clock CLOCK_SGI_CYCLE (10)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      ...
      [RUN]	Testing clock_gettime for clock invalid (-1)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      [RUN]	Testing clock_gettime for clock invalid (-2147483648)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      [RUN]	Testing clock_gettime for clock invalid (2147483647)...
      [FAIL]	No such clock, but __vdso_clock_gettime returned 22
      
      On powerpc, a call to a VDSO function is not an ordinary C function
      call. Unlike several architectures which returns a negative error code
      in case of an error, powerpc sets CR[SO] and returns the error code
      as a positive value.
      
      Define and use a macro called VDSO_CALL() which takes a pointer
      to the function to call, the number of arguments and the arguments.
      
      Also update ABI vdso documentation to reflect this subtlety.
      
      Provide a specific version of VDSO_CALL() for powerpc that negates
      the error code on return when CR[SO] is set.
      
      Fixes: c7e5789b ("kselftest: Move test_vdso to the vDSO test suite")
      Fixes: 2e9a9725 ("selftests: vdso: Add a selftest for vDSO getcpu()")
      Fixes: 693f5ca0 ("kselftest: Extend vDSO selftest")
      Fixes: b2f1c3db ("kselftest: Extend vdso correctness test to clock_gettime64")
      Fixes: 4920a259 ("selftests/vDSO: add tests for vgetrandom")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      6eda706a
    • Christophe Leroy's avatar
      selftests: vDSO: fix vDSO symbols lookup for powerpc64 · ba83b323
      Christophe Leroy authored
      On powerpc64, following tests fail locating vDSO functions:
      
        ~ # ./vdso_test_abi
        TAP version 13
        1..16
        # [vDSO kselftest] VDSO_VERSION: LINUX_2.6.15
        # Couldn't find __kernel_gettimeofday
        ok 1 # SKIP __kernel_gettimeofday
        # clock_id: CLOCK_REALTIME
        # Couldn't find __kernel_clock_gettime
        ok 2 # SKIP __kernel_clock_gettime CLOCK_REALTIME
        # Couldn't find __kernel_clock_getres
        ok 3 # SKIP __kernel_clock_getres CLOCK_REALTIME
        ...
        # Couldn't find __kernel_time
        ok 16 # SKIP __kernel_time
        # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:16 error:0
      
        ~ # ./vdso_test_getrandom
        __kernel_getrandom is missing!
      
        ~ # ./vdso_test_gettimeofday
        Could not find __kernel_gettimeofday
      
        ~ # ./vdso_test_getcpu
        Could not find __kernel_getcpu
      
      On powerpc64, as shown below by readelf, vDSO functions symbols have
      type NOTYPE, so also accept that type when looking for symbols.
      
      $ powerpc64-linux-gnu-readelf -a arch/powerpc/kernel/vdso/vdso64.so.dbg
      ELF Header:
        Magic:   7f 45 4c 46 02 02 01 00 00 00 00 00 00 00 00 00
        Class:                             ELF64
        Data:                              2's complement, big endian
        Version:                           1 (current)
        OS/ABI:                            UNIX - System V
        ABI Version:                       0
        Type:                              DYN (Shared object file)
        Machine:                           PowerPC64
        Version:                           0x1
      ...
      
      Symbol table '.dynsym' contains 12 entries:
         Num:    Value          Size Type    Bind   Vis      Ndx Name
           0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND
           1: 0000000000000524    84 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           2: 00000000000005f0    36 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           3: 0000000000000578    68 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           4: 0000000000000000     0 OBJECT  GLOBAL DEFAULT  ABS LINUX_2.6.15
           5: 00000000000006c0    48 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           6: 0000000000000614   172 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           7: 00000000000006f0    84 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           8: 000000000000047c    84 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
           9: 0000000000000454    12 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
          10: 00000000000004d0    84 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
          11: 00000000000005bc    52 NOTYPE  GLOBAL DEFAULT    8 __[...]@@LINUX_2.6.15
      
      Symbol table '.symtab' contains 56 entries:
         Num:    Value          Size Type    Bind   Vis      Ndx Name
      ...
          45: 0000000000000000     0 OBJECT  GLOBAL DEFAULT  ABS LINUX_2.6.15
          46: 00000000000006c0    48 NOTYPE  GLOBAL DEFAULT    8 __kernel_getcpu
          47: 0000000000000524    84 NOTYPE  GLOBAL DEFAULT    8 __kernel_clock_getres
          48: 00000000000005f0    36 NOTYPE  GLOBAL DEFAULT    8 __kernel_get_tbfreq
          49: 000000000000047c    84 NOTYPE  GLOBAL DEFAULT    8 __kernel_gettimeofday
          50: 0000000000000614   172 NOTYPE  GLOBAL DEFAULT    8 __kernel_sync_dicache
          51: 00000000000006f0    84 NOTYPE  GLOBAL DEFAULT    8 __kernel_getrandom
          52: 0000000000000454    12 NOTYPE  GLOBAL DEFAULT    8 __kernel_sigtram[...]
          53: 0000000000000578    68 NOTYPE  GLOBAL DEFAULT    8 __kernel_time
          54: 00000000000004d0    84 NOTYPE  GLOBAL DEFAULT    8 __kernel_clock_g[...]
          55: 00000000000005bc    52 NOTYPE  GLOBAL DEFAULT    8 __kernel_get_sys[...]
      
      Fixes: 98eedc3a ("Document the vDSO and add a reference parser")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      ba83b323
    • Christophe Leroy's avatar
      selftests: vDSO: fix vdso_config for powerpc · 7d297c41
      Christophe Leroy authored
      Running vdso_test_correctness on powerpc64 gives the following warning:
      
        ~ # ./vdso_test_correctness
        Warning: failed to find clock_gettime64 in vDSO
      
      This is because vdso_test_correctness was built with VDSO_32BIT defined.
      
      __powerpc__ macro is defined on both powerpc32 and powerpc64 so
      __powerpc64__ needs to be checked first in vdso_config.h
      
      Fixes: 693f5ca0 ("kselftest: Extend vDSO selftest")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      7d297c41
    • Christophe Leroy's avatar
      selftests: vDSO: fix vDSO name for powerpc · 59eb856c
      Christophe Leroy authored
      Following error occurs when running vdso_test_correctness on powerpc:
      
      ~ # ./vdso_test_correctness
      [WARN]	failed to find vDSO
      [SKIP]	No vDSO, so skipping clock_gettime() tests
      [SKIP]	No vDSO, so skipping clock_gettime64() tests
      [RUN]	Testing getcpu...
      [OK]	CPU 0: syscall: cpu 0, node 0
      
      On powerpc, vDSO is neither called linux-vdso.so.1 nor linux-gate.so.1
      but linux-vdso32.so.1 or linux-vdso64.so.1.
      
      Also search those two names before giving up.
      
      Fixes: c7e5789b ("kselftest: Move test_vdso to the vDSO test suite")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      59eb856c
    • Jason A. Donenfeld's avatar
      selftests: vDSO: skip getrandom test if architecture is unsupported · f78280b1
      Jason A. Donenfeld authored
      If the getrandom test compiles for an arch, don't exit fatally if the
      actual cpu it's running on is unsupported.
      Suggested-by: default avatarAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      f78280b1
    • Xi Ruoyao's avatar
      selftests: vDSO: use KHDR_INCLUDES for UAPI headers for getrandom test · b90eeff1
      Xi Ruoyao authored
      Building test_vdso_getrandom currently leads to following issue:
      
          In file included from /home/xry111/git-repos/linux/tools/include/linux/compiler_types.h:36,
                           from /home/xry111/git-repos/linux/include/uapi/linux/stddef.h:5,
                           from /home/xry111/git-repos/linux/include/uapi/linux/posix_types.h:5,
                           from /usr/include/asm/sigcontext.h:12,
                           from /usr/include/bits/sigcontext.h:30,
                           from /usr/include/signal.h:301,
                           from vdso_test_getrandom.c:14:
          /home/xry111/git-repos/linux/tools/include/linux/compiler-gcc.h:3:2: error: #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
              3 | #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
                |  ^~~~~
      
      It's because the compiler_types.h inclusion in
      include/uapi/linux/stddef.h is expected to be removed by the
      header_install.sh script, as compiler_types.h shouldn't be used from
      user space.
      
      Add KHDR_INCLUDES before the existing include/uapi inclusion so that
      usr/include takes precedence if it's populated.
      Signed-off-by: default avatarXi Ruoyao <xry111@xry111.site>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      b90eeff1
    • Jason A. Donenfeld's avatar
      selftests: vDSO: remove unnecessary command line defs from chacha test · be915515
      Jason A. Donenfeld authored
      CONFIG_FUNCTION_ALIGNMENT=0 is no longer necessary and BULID_VDSO wasn't
      spelled right while BUILD_VDSO isn't necessary, so just remove these.
      Reported-by: default avatarAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      be915515
    • Jason A. Donenfeld's avatar
      selftests: vDSO: separate LDLIBS from CFLAGS for libsodium · a5330eb3
      Jason A. Donenfeld authored
      On systems that set -Wl,--as-needed, putting the -lsodium in the wrong
      place on the command line means we get a linker error:
      
            CC       vdso_test_chacha
          /usr/bin/ld: /tmp/ccKpjnSM.o: in function `main':
          vdso_test_chacha.c:(.text+0x276): undefined reference to `crypto_stream_chacha20'
          collect2: error: ld returned 1 exit status
      
      Fix this by passing pkg-config's --libs output to the LDFLAGS field
      instead of the CFLAGS field, as is customary.
      Reported-by: default avatarAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      a5330eb3
    • Xi Ruoyao's avatar
      selftests: vDSO: add --cflags for pkg-config command querying libsodium · 1e661b34
      Xi Ruoyao authored
      When libsodium is installed into its own prefix, the --cflags output is
      needed for the compiler to find libsodium headers.
      Signed-off-by: default avatarXi Ruoyao <xry111@xry111.site>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      1e661b34
    • Christophe Leroy's avatar
      selftests: vDSO: look for arch-specific function name in getrandom test · e1bbcab4
      Christophe Leroy authored
      Don't hard-code x86 specific names. Rather, use vdso_config definitions
      to find the correct function matching the architecture.
      
      Add random VDSO function names in names[][]. Remove the #ifdef
      CONFIG_VDSO32, as having the name there all the time is harmless and
      guaranties a steady index for following strings.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      [Jason: add [6] to variable declaration rather than each usage site.]
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      e1bbcab4
    • Christophe Leroy's avatar
      selftests: vDSO: fix include order in build of test_vdso_chacha · f8d92fc5
      Christophe Leroy authored
      Building test_vdso_chacha currently leads to following issue:
      
        In file included from /home/chleroy/linux-powerpc/include/linux/limits.h:7,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/local_lim.h:38,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/posix1_lim.h:161,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/limits.h:195,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/limits.h:203,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/syslimits.h:7,
                         from /opt/powerpc64-e5500--glibc--stable-2024.02-1/lib/gcc/powerpc64-buildroot-linux-gnu/12.3.0/include-fixed/limits.h:34,
                         from /tmp/sodium/usr/local/include/sodium/export.h:7,
                         from /tmp/sodium/usr/local/include/sodium/crypto_stream_chacha20.h:14,
                         from vdso_test_chacha.c:6:
        /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:99:6: error: missing binary operator before token "("
           99 | # if INT_MAX == 32767
              |      ^~~~~~~
        /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:102:7: error: missing binary operator before token "("
          102 | #  if INT_MAX == 2147483647
              |       ^~~~~~~
        /opt/powerpc64-e5500--glibc--stable-2024.02-1/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/xopen_lim.h:126:6: error: missing binary operator before token "("
          126 | # if LONG_MAX == 2147483647
              |      ^~~~~~~~
      
      This is due to kernel include/linux/limits.h being included instead of
      libc's limits.h.
      
      This is because directory include/ is added through option -isystem so
      it goes prior to glibc's include directory.
      
      Replace -isystem by -idirafter.
      
      But this implies that now tools/include/linux/linkage.h is included
      instead of include/linux/linkage.h, so define a stub for
      SYM_FUNC_START() and SYM_FUNC_END().
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      f8d92fc5
    • Christophe Leroy's avatar
      selftests: vDSO: don't hard-code location of vDSO sources · 20a9af05
      Christophe Leroy authored
      Architectures use different location for vDSO sources:
      
      	arch/mips/vdso
      	arch/sparc/vdso
      	arch/arm64/kernel/vdso
      	arch/riscv/kernel/vdso
      	arch/csky/kernel/vdso
      	arch/x86/um/vdso
      	arch/x86/entry/vdso
      	arch/powerpc/kernel/vdso
      	arch/arm/vdso
      	arch/loongarch/vdso
      
      Don't hard-code vdso sources location in selftest Makefile. Instead
      create a vdso/ symbolic link in tools/arch/$arch/ and update Makefile
      accordingly.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      20a9af05
    • Jason A. Donenfeld's avatar
      selftests: vDSO: simplify getrandom thread local storage and structs · 01b52f01
      Jason A. Donenfeld authored
      Rather than using pthread_get/set_specific, just use gcc's __thread
      annotation, which is noticeably faster and makes the code more obvious.
      
      Also, just have one simplified struct called vgrnd, instead of trying to
      split things up semantically. Those divisions were useful when this code
      was split across several commit *messages*, but doesn't make as much
      sense within a single file. This should make the code more clear and
      provide a better example for implementers.
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      01b52f01
  3. 29 Aug, 2024 1 commit
    • Linus Torvalds's avatar
      Merge tag 'random-6.11-rc6-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random · d5d547aa
      Linus Torvalds authored
      Pull random number generator fix from Jason Donenfeld:
       "Reject invalid flags passed to vgetrandom() in the same way that
        getrandom() does, so that the behavior is the same, from Yann.
      
        The flags argument to getrandom() only has a behavioral effect on the
        function if the RNG isn't initialized yet, so vgetrandom() falls back
        to the syscall in that case. But if the RNG is initialized, all of the
        flags behave the same way, so vgetrandom() didn't bother checking
        them, and just ignored them entirely.
      
        But that doesn't account for invalid flags passed in, which need to be
        rejected so we can use them later"
      
      * tag 'random-6.11-rc6-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random:
        random: vDSO: reject unknown getrandom() flags
      d5d547aa
  4. 28 Aug, 2024 6 commits
  5. 27 Aug, 2024 6 commits
    • Linus Torvalds's avatar
      Merge tag 'livepatching-for-6.11-rc6' of... · 3ec3f5fc
      Linus Torvalds authored
      Merge tag 'livepatching-for-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
      
      Pull livepatching fix from Petr Mladek:
       "Selftest regression fix"
      
      * tag 'livepatching-for-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
        selftests/livepatch: wait for atomic replace to occur
      3ec3f5fc
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 41594663
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
      
       - Fix the hwirq map and pin offsets in the Qualcomm X1E80100 driver
      
       - Fix the pin range handling in the AT91 driver so it works again
      
       - Fix a NULL-dereference risk in pinctrl single
      
       - Fix a serious biasing bug in the Mediatek driver
      
       - Fix the level trigged IRQ in the StarFive JH7110
      
       - Fix the iomux width in the Rockchip GPIO2-B pin handling
      
      * tag 'pinctrl-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: rockchip: correct RK3328 iomux width flag for GPIO2-B pins
        pinctrl: starfive: jh7110: Correct the level trigger configuration of iev register
        pinctrl: qcom: x1e80100: Fix special pin offsets
        pinctrl: mediatek: common-v2: Fix broken bias-disable for PULL_PU_PD_RSEL_TYPE
        pinctrl: single: fix potential NULL dereference in pcs_get_function()
        pinctrl: at91: make it work with current gpiolib
        pinctrl: qcom: x1e80100: Update PDC hwirq map
      41594663
    • Linus Torvalds's avatar
      Merge tag 'sound-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 6ace1c7e
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "It became a bit larger collection of fixes than wished at this time,
        but all changes are small and mostly device-specific fixes that should
        be fairly safe to apply.
      
        Majority of fixes are about ASoC for AMD SOF, Cirrus codecs, lpass,
        etc, in addition to the usual HD-audio quirks / fixes"
      
      * tag 'sound-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (22 commits)
        ALSA: hda: hda_component: Fix mutex crash if nothing ever binds
        ALSA: hda/realtek: support HP Pavilion Aero 13-bg0xxx Mute LED
        ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book3 Ultra
        ASoC: cs-amp-lib: Ignore empty UEFI calibration entries
        ASoC: cs-amp-lib-test: Force test calibration blob entries to be valid
        ALSA: hda/realtek - FIxed ALC285 headphone no sound
        ALSA: hda/realtek - Fixed ALC256 headphone no sound
        ASoC: allow module autoloading for table board_ids
        ASoC: allow module autoloading for table db1200_pids
        ALSA: hda: cs35l56: Don't use the device index as a calibration index
        ALSA: seq: Skip event type filtering for UMP events
        ALSA: hda/realtek: Enable mute/micmute LEDs on HP Laptop 14-ey0xxx
        ASoC: SOF: amd: Fix for acp init sequence
        ASoC: amd: acp: fix module autoloading
        ASoC: mediatek: mt8188: Mark AFE_DAC_CON0 register as volatile
        ASoC: codecs: wcd937x: Fix missing de-assert of reset GPIO
        ASoC: SOF: mediatek: Add missing board compatible
        ASoC: MAINTAINERS: Drop Banajit Goswami from Qualcomm sound drivers
        ASoC: SOF: amd: Fix for incorrect acp error register offsets
        ASoC: SOF: amd: move iram-dram fence register programming sequence
        ...
      6ace1c7e
    • Stefan Berger's avatar
      tpm: ibmvtpm: Call tpm2_sessions_init() to initialize session support · 08d08e2e
      Stefan Berger authored
      Commit d2add27c ("tpm: Add NULL primary creation") introduced
      CONFIG_TCG_TPM2_HMAC. When this option is enabled on ppc64 then the
      following message appears in the kernel log due to a missing call to
      tpm2_sessions_init().
      
      [    2.654549] tpm tpm0: auth session is not active
      
      Add the missing call to tpm2_session_init() to the ibmvtpm driver to
      resolve this issue.
      
      Cc: stable@vger.kernel.org # v6.10+
      Fixes: d2add27c ("tpm: Add NULL primary creation")
      Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
      Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
      Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
      08d08e2e
    • Filipe Manana's avatar
      btrfs: fix uninitialized return value from btrfs_reclaim_sweep() · ecb54277
      Filipe Manana authored
      The return variable 'ret' at btrfs_reclaim_sweep() is never assigned if
      none of the space infos is reclaimable (for example if periodic reclaim
      is disabled, which is the default), so we return an undefined value.
      
      This can be fixed my making btrfs_reclaim_sweep() not return any value
      as well as do_reclaim_sweep() because:
      
      1) do_reclaim_sweep() always returns 0, so we can make it return void;
      
      2) The only caller of btrfs_reclaim_sweep() (btrfs_reclaim_bgs()) doesn't
         care about its return value, and in its context there's nothing to do
         about any errors anyway.
      
      Therefore remove the return value from btrfs_reclaim_sweep() and
      do_reclaim_sweep().
      
      Fixes: e4ca3932 ("btrfs: periodic block_group reclaim")
      Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
      Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
      Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
      Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
      ecb54277
    • Linus Torvalds's avatar
      Merge tag 'vfs-6.11-rc6.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs · 3e9bff3b
      Linus Torvalds authored
      Pull vfs fixes from Christian Brauner:
       "VFS:
      
         - Ensure that backing files uses file->f_ops->splice_write() for
           splice
      
        netfs:
      
         - Revert the removal of PG_private_2 from netfs_release_folio() as
           cephfs still relies on this
      
         - When AS_RELEASE_ALWAYS is set on a mapping the folio needs to
           always be invalidated during truncation
      
         - Fix losing untruncated data in a folio by making letting
           netfs_release_folio() return false if the folio is dirty
      
         - Fix trimming of streaming-write folios in netfs_inval_folio()
      
         - Reset iterator before retrying a short read
      
         - Fix interaction of streaming writes with zero-point tracker
      
        afs:
      
         - During truncation afs currently calls truncate_setsize() which sets
           i_size, expands the pagecache and truncates it. The first two
           operations aren't needed because they will have already been done.
           So call truncate_pagecache() instead and skip the redundant parts
      
        overlayfs:
      
         - Fix checking of the number of allowed lower layers so 500 layers
           can actually be used instead of just 499
      
         - Add missing '\n' to pr_err() output
      
         - Pass string to ovl_parse_layer() and thus allow it to be used for
           Opt_lowerdir as well
      
        pidfd:
      
         - Revert blocking the creation of pidfds for kthread as apparently
           userspace relies on this. Specifically, it breaks systemd during
           shutdown
      
        romfs:
      
         - Fix romfs_read_folio() to use the correct offset with
           folio_zero_tail()"
      
      * tag 'vfs-6.11-rc6.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs:
        netfs: Fix interaction of streaming writes with zero-point tracker
        netfs: Fix missing iterator reset on retry of short read
        netfs: Fix trimming of streaming-write folios in netfs_inval_folio()
        netfs: Fix netfs_release_folio() to say no if folio dirty
        afs: Fix post-setattr file edit to do truncation correctly
        mm: Fix missing folio invalidation calls during truncation
        ovl: ovl_parse_param_lowerdir: Add missed '\n' for pr_err
        ovl: fix wrong lowerdir number check for parameter Opt_lowerdir
        ovl: pass string to ovl_parse_layer()
        backing-file: convert to using fops->splice_write
        Revert "pidfd: prevent creation of pidfds for kthreads"
        romfs: fix romfs_read_folio()
        netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty"
      3e9bff3b
  6. 26 Aug, 2024 3 commits
    • Qu Wenruo's avatar
      btrfs: fix a use-after-free when hitting errors inside btrfs_submit_chunk() · 10d9d8c3
      Qu Wenruo authored
      [BUG]
      There is an internal report that KASAN is reporting use-after-free, with
      the following backtrace:
      
        BUG: KASAN: slab-use-after-free in btrfs_check_read_bio+0xa68/0xb70 [btrfs]
        Read of size 4 at addr ffff8881117cec28 by task kworker/u16:2/45
        CPU: 1 UID: 0 PID: 45 Comm: kworker/u16:2 Not tainted 6.11.0-rc2-next-20240805-default+ #76
        Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014
        Workqueue: btrfs-endio btrfs_end_bio_work [btrfs]
        Call Trace:
         dump_stack_lvl+0x61/0x80
         print_address_description.constprop.0+0x5e/0x2f0
         print_report+0x118/0x216
         kasan_report+0x11d/0x1f0
         btrfs_check_read_bio+0xa68/0xb70 [btrfs]
         process_one_work+0xce0/0x12a0
         worker_thread+0x717/0x1250
         kthread+0x2e3/0x3c0
         ret_from_fork+0x2d/0x70
         ret_from_fork_asm+0x11/0x20
      
        Allocated by task 20917:
         kasan_save_stack+0x37/0x60
         kasan_save_track+0x10/0x30
         __kasan_slab_alloc+0x7d/0x80
         kmem_cache_alloc_noprof+0x16e/0x3e0
         mempool_alloc_noprof+0x12e/0x310
         bio_alloc_bioset+0x3f0/0x7a0
         btrfs_bio_alloc+0x2e/0x50 [btrfs]
         submit_extent_page+0x4d1/0xdb0 [btrfs]
         btrfs_do_readpage+0x8b4/0x12a0 [btrfs]
         btrfs_readahead+0x29a/0x430 [btrfs]
         read_pages+0x1a7/0xc60
         page_cache_ra_unbounded+0x2ad/0x560
         filemap_get_pages+0x629/0xa20
         filemap_read+0x335/0xbf0
         vfs_read+0x790/0xcb0
         ksys_read+0xfd/0x1d0
         do_syscall_64+0x6d/0x140
         entry_SYSCALL_64_after_hwframe+0x4b/0x53
      
        Freed by task 20917:
         kasan_save_stack+0x37/0x60
         kasan_save_track+0x10/0x30
         kasan_save_free_info+0x37/0x50
         __kasan_slab_free+0x4b/0x60
         kmem_cache_free+0x214/0x5d0
         bio_free+0xed/0x180
         end_bbio_data_read+0x1cc/0x580 [btrfs]
         btrfs_submit_chunk+0x98d/0x1880 [btrfs]
         btrfs_submit_bio+0x33/0x70 [btrfs]
         submit_one_bio+0xd4/0x130 [btrfs]
         submit_extent_page+0x3ea/0xdb0 [btrfs]
         btrfs_do_readpage+0x8b4/0x12a0 [btrfs]
         btrfs_readahead+0x29a/0x430 [btrfs]
         read_pages+0x1a7/0xc60
         page_cache_ra_unbounded+0x2ad/0x560
         filemap_get_pages+0x629/0xa20
         filemap_read+0x335/0xbf0
         vfs_read+0x790/0xcb0
         ksys_read+0xfd/0x1d0
         do_syscall_64+0x6d/0x140
         entry_SYSCALL_64_after_hwframe+0x4b/0x53
      
      [CAUSE]
      Although I cannot reproduce the error, the report itself is good enough
      to pin down the cause.
      
      The call trace is the regular endio workqueue context, but the
      free-by-task trace is showing that during btrfs_submit_chunk() we
      already hit a critical error, and is calling btrfs_bio_end_io() to error
      out.  And the original endio function called bio_put() to free the whole
      bio.
      
      This means a double freeing thus causing use-after-free, e.g.:
      
      1. Enter btrfs_submit_bio() with a read bio
         The read bio length is 128K, crossing two 64K stripes.
      
      2. The first run of btrfs_submit_chunk()
      
      2.1 Call btrfs_map_block(), which returns 64K
      2.2 Call btrfs_split_bio()
          Now there are two bios, one referring to the first 64K, the other
          referring to the second 64K.
      2.3 The first half is submitted.
      
      3. The second run of btrfs_submit_chunk()
      
      3.1 Call btrfs_map_block(), which by somehow failed
          Now we call btrfs_bio_end_io() to handle the error
      
      3.2 btrfs_bio_end_io() calls the original endio function
          Which is end_bbio_data_read(), and it calls bio_put() for the
          original bio.
      
          Now the original bio is freed.
      
      4. The submitted first 64K bio finished
         Now we call into btrfs_check_read_bio() and tries to advance the bio
         iter.
         But since the original bio (thus its iter) is already freed, we
         trigger the above use-after free.
      
         And even if the memory is not poisoned/corrupted, we will later call
         the original endio function, causing a double freeing.
      
      [FIX]
      Instead of calling btrfs_bio_end_io(), call btrfs_orig_bbio_end_io(),
      which has the extra check on split bios and do the proper refcounting
      for cloned bios.
      
      Furthermore there is already one extra btrfs_cleanup_bio() call, but
      that is duplicated to btrfs_orig_bbio_end_io() call, so remove that
      label completely.
      Reported-by: default avatarDavid Sterba <dsterba@suse.com>
      Fixes: 852eee62 ("btrfs: allow btrfs_submit_bio to split bios")
      CC: stable@vger.kernel.org # 6.6+
      Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
      Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
      Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
      Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
      10d9d8c3
    • Jeff Layton's avatar
      fs/nfsd: fix update of inode attrs in CB_GETATTR · 7e8ae848
      Jeff Layton authored
      Currently, we copy the mtime and ctime to the in-core inode and then
      mark the inode dirty. This is fine for certain types of filesystems, but
      not all. Some require a real setattr to properly change these values
      (e.g. ceph or reexported NFS).
      
      Fix this code to call notify_change() instead, which is the proper way
      to effect a setattr. There is one problem though:
      
      In this case, the client is holding a write delegation and has sent us
      attributes to update our cache. We don't want to break the delegation
      for this since that would defeat the purpose. Add a new ATTR_DELEG flag
      that makes notify_change bypass the try_break_deleg call.
      
      Fixes: c5967721 ("NFSD: handle GETATTR conflict with write delegation")
      Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
      Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      7e8ae848
    • Jeff Layton's avatar
      nfsd: fix potential UAF in nfsd4_cb_getattr_release · 1116e0e3
      Jeff Layton authored
      Once we drop the delegation reference, the fields embedded in it are no
      longer safe to access. Do that last.
      
      Fixes: c5967721 ("NFSD: handle GETATTR conflict with write delegation")
      Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      1116e0e3