Unverified Commit 378177d2 authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

linux kernel: prefer zstd where possible 

Closes #302291
Closes #301536

The following things have changed:

* For 5.7+: ZSWAP compressor uses zstd now.
* For 5.11+: ZRAM compressor uses zstd now.
* For 5.13+: kernel modules are compressed with zstd instead of xz.
* For 5.19+: support zstd-compressed firmware.

The modules-closure functionality needed explicit support for copying
over `.zst` files. Also, the VM image builder used busybox's `insmod`
before which doesn't support zstd. Switched to `kmod` and added xz/zstd
as dependencies for it, similar to how it's done for the actual stage1
in d33e52b2. The use of `kmod` here
doesn't seem to be such a big deal since it's only a build-time
dependency.
parent 1a2d905c

pkgs/build-support/kernel/modules-closure.sh

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ for module in $(< ~-/closure); do 
    # of its output.

    modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:' | while read -r i; do

        echo "firmware for $module: $i"

        for name in "$i" "$i.xz" ""; do

        for name in "$i" "$i.xz" "$i.zst" ""; do

            [ -z "$name" ] && echo "WARNING: missing firmware $i for module $module"

            if cp -v --parents --no-preserve=mode lib/firmware/$name "$out" 2>/dev/null; then

                break

pkgs/build-support/vm/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -40,10 +40,14 @@ rec { 
        ${pkgs.stdenv.cc.libc}/lib/libc.so.* \

        ${pkgs.stdenv.cc.libc}/lib/libm.so.* \

        ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \

        ${pkgs.stdenv.cc.libc}/lib/libpthread.so.* \

        ${pkgs.zstd.out}/lib/libzstd.so.* \

        ${pkgs.xz.out}/lib/liblzma.so.* \

        $out/lib



      # Copy BusyBox.

      cp -pd ${pkgs.busybox}/bin/* $out/bin

      cp -pd ${pkgs.kmod}/bin/* $out/bin



      # Run patchelf to make the programs refer to the copied libraries.

      for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
@@ -54,6 +58,11 @@ rec { 
              patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true

          fi

      done



      find $out/lib -type f \! -name 'ld*.so.?' | while read i; do

        echo "patching $i..."

        patchelf --set-rpath $out/lib $i

      done

    ''; # */

pkgs/os-specific/linux/kernel/common-config.nix

+12 −8
Original line number Diff line number Diff line
@@ -874,9 +874,11 @@ let 
      ZRAM                          = module;

      ZRAM_WRITEBACK                = option yes;

      ZRAM_MULTI_COMP               = whenAtLeast "6.2" yes;

      ZRAM_DEF_COMP_ZSTD            = whenAtLeast "5.11" yes;

      ZSWAP                         = option yes;

      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" yes;

      ZPOOL                         = yes;

      ZBUD            = option yes;

      ZSMALLOC                      = option yes;

    };



    brcmfmac = {
@@ -949,7 +951,8 @@ let 
      ZEROPLUS_FF        = yes;



      MODULE_COMPRESS      = whenOlder "5.13" yes;

      MODULE_COMPRESS_XZ = yes;

      MODULE_COMPRESS_XZ   = whenOlder "5.13" yes;

      MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes;



      SYSVIPC            = yes;  # System-V IPC
@@ -1124,6 +1127,7 @@ let 
      FW_LOADER_USER_HELPER_FALLBACK = option no;



      FW_LOADER_COMPRESS = whenAtLeast "5.3" yes;

      FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes;



      HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI

      HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support