busybox: update to 1.36.0

[openwrt/staging/hauke.git] / package / utils / busybox / config / libbb / Config.in

diff --git a/package/utils/busybox/config/libbb/Config.in b/package/utils/busybox/config/libbb/Config.in
index e050c4a9150a3889c6eba73c1822b43bded40861..b3a83b9b0852790b8c8385d989f9976093bea2c4 100644 (file)
--- a/package/utils/busybox/config/libbb/Config.in
+++ b/package/utils/busybox/config/libbb/Config.in
@@ -98,21 +98,47 @@ config BUSYBOX_CONFIG_MD5_SMALL
        default BUSYBOX_DEFAULT_MD5_SMALL  # all "fast or small" options default to small
        range 0 3
        help
-       Trade binary size versus speed for the md5sum algorithm.
+       Trade binary size versus speed for the md5 algorithm.
        Approximate values running uClibc and hashing
        linux-2.4.4.tar.bz2 were:
-       value               user times (sec)  text size (386)
-       0 (fastest)         1.1                6144
-       1                   1.4                5392
-       2                   3.0                5088
-       3 (smallest)        5.1                4912
+       value           user times (sec)  text size (386)
+       0 (fastest)     1.1               6144
+       1               1.4               5392
+       2               3.0               5088
+       3 (smallest)    5.1               4912
+
+config BUSYBOX_CONFIG_SHA1_SMALL
+       int "SHA1: Trade bytes for speed (0:fast, 3:slow)"
+       default BUSYBOX_DEFAULT_SHA1_SMALL  # all "fast or small" options default to small
+       range 0 3
+       help
+       Trade binary size versus speed for the sha1 algorithm.
+       With FEATURE_COPYBUF_KB=64:
+                       throughput MB/s   size of sha1_process_block64
+       value           486  x86-64       486   x86-64
+       0               440  485          3481  3502
+       1               265  265           641   696
+       2,3             220  210           342   364
+
+config BUSYBOX_CONFIG_SHA1_HWACCEL
+       bool "SHA1: Use hardware accelerated instructions if possible"
+       default BUSYBOX_DEFAULT_SHA1_HWACCEL
+       help
+       On x86, this adds ~590 bytes of code. Throughput
+       is about twice as fast as fully-unrolled generic code.
+
+config BUSYBOX_CONFIG_SHA256_HWACCEL
+       bool "SHA256: Use hardware accelerated instructions if possible"
+       default BUSYBOX_DEFAULT_SHA256_HWACCEL
+       help
+       On x86, this adds ~1k bytes of code.
 
 config BUSYBOX_CONFIG_SHA3_SMALL
        int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
        default BUSYBOX_DEFAULT_SHA3_SMALL  # all "fast or small" options default to small
        range 0 1
        help
-       Trade binary size versus speed for the sha3sum algorithm.
+       Trade binary size versus speed for the sha3 algorithm.
        SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
        64-bit x86: +270 bytes of code, 45% faster
        32-bit x86: +450 bytes of code, 75% faster
@@ -399,3 +425,25 @@ config BUSYBOX_CONFIG_UNICODE_PRESERVE_BROKEN
        For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
        at shell prompt will list file named 0xff (single char name
        with char value 255), not file named '?'.
+
+choice
+       prompt "Use LOOP_CONFIGURE for losetup and loop mounts"
+       default BUSYBOX_CONFIG_TRY_LOOP_CONFIGURE
+       help
+       LOOP_CONFIGURE is added to Linux 5.8
+       https://lwn.net/Articles/820408/
+       This allows userspace to completely setup a loop device with a single
+       ioctl, removing the in-between state where the device can be partially
+       configured - eg the loop device has a backing file associated with it,
+       but is reading from the wrong offset.
+
+config BUSYBOX_CONFIG_LOOP_CONFIGURE
+       bool "use LOOP_CONFIGURE, needs kernel >= 5.8"
+
+config BUSYBOX_CONFIG_NO_LOOP_CONFIGURE
+       bool "use LOOP_SET_FD + LOOP_SET_STATUS"
+
+config BUSYBOX_CONFIG_TRY_LOOP_CONFIGURE
+       bool "try LOOP_CONFIGURE, fall back to LOOP_SET_FD + LOOP_SET_STATUS"
+
+endchoice