parent
243e865488
commit
e320a71094
@ -0,0 +1,3 @@
|
||||
# Calculate format=kernel name=.config
|
||||
!CONFIG_RESET_BRCMSTB_RESCAL=
|
||||
!CONFIG_XILINX_ZYNQMP_DPDMA=
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=skip merge(sys-kernel/calculate-sources)=>5.12,5.13
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,226 +0,0 @@
|
||||
# Calculate format=kernel name=.config
|
||||
CONFIG_ACPI_I2C_OPREGION=y
|
||||
CONFIG_GENERIC_PINCONF=y
|
||||
# CONFIG_HTC_I2CPLD is not set
|
||||
CONFIG_I2C=y
|
||||
# CONFIG_MFD_88PM860X is not set
|
||||
# CONFIG_MFD_AAT2870_CORE is not set
|
||||
# CONFIG_MFD_AS3711 is not set
|
||||
# CONFIG_MFD_DA9052_I2C is not set
|
||||
# CONFIG_MFD_DA9055 is not set
|
||||
# CONFIG_MFD_LP8788 is not set
|
||||
# CONFIG_MFD_MAX77843 is not set
|
||||
# CONFIG_MFD_MAX8925 is not set
|
||||
# CONFIG_MFD_MAX8997 is not set
|
||||
# CONFIG_MFD_MAX8998 is not set
|
||||
# CONFIG_MFD_PALMAS is not set
|
||||
# CONFIG_MFD_RC5T583 is not set
|
||||
# CONFIG_MFD_SEC_CORE is not set
|
||||
# CONFIG_MFD_TPS65090 is not set
|
||||
# CONFIG_MFD_TPS6586X is not set
|
||||
# CONFIG_MFD_TPS65910 is not set
|
||||
# CONFIG_MFD_TPS80031 is not set
|
||||
# CONFIG_MFD_WM831X_I2C is not set
|
||||
# CONFIG_MFD_WM8350_I2C is not set
|
||||
# CONFIG_MFD_WM8400 is not set
|
||||
CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
|
||||
CONFIG_MOUSE_PS2_SMBUS=y
|
||||
CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
|
||||
CONFIG_PINCONF=y
|
||||
CONFIG_PINCTRL_ALDERLAKE=m
|
||||
CONFIG_PINCTRL_AMD=m
|
||||
CONFIG_PINCTRL_BAYTRAIL=y
|
||||
CONFIG_PINCTRL_BROXTON=m
|
||||
CONFIG_PINCTRL_CANNONLAKE=m
|
||||
CONFIG_PINCTRL_CEDARFORK=m
|
||||
CONFIG_PINCTRL_CHERRYVIEW=m
|
||||
CONFIG_PINCTRL_DA9062=m
|
||||
CONFIG_PINCTRL_DENVERTON=m
|
||||
CONFIG_PINCTRL_ELKHARTLAKE=m
|
||||
CONFIG_PINCTRL_EMMITSBURG=m
|
||||
CONFIG_PINCTRL_GEMINILAKE=m
|
||||
CONFIG_PINCTRL_ICELAKE=m
|
||||
CONFIG_PINCTRL_INTEL=y
|
||||
CONFIG_PINCTRL_JASPERLAKE=m
|
||||
CONFIG_PINCTRL_LAKEFIELD=m
|
||||
CONFIG_PINCTRL_LEWISBURG=m
|
||||
CONFIG_PINCTRL_LYNXPOINT=m
|
||||
CONFIG_PINCTRL_MCP23S08_I2C=m
|
||||
CONFIG_PINCTRL_MCP23S08=m
|
||||
CONFIG_PINCTRL_SUNRISEPOINT=m
|
||||
# CONFIG_PINCTRL_SX150X is not set
|
||||
CONFIG_PINCTRL_TIGERLAKE=m
|
||||
CONFIG_PINMUX=y
|
||||
# CONFIG_PMIC_ADP5520 is not set
|
||||
# CONFIG_PMIC_DA903X is not set
|
||||
CONFIG_RTC_I2C_AND_SPI=y
|
||||
# CONFIG_TOUCHSCREEN_DMI is not set
|
||||
# CONFIG_TWL4030_CORE is not set
|
||||
# CONFIG_TWL6040_CORE is not set
|
||||
CONFIG_X86_AMD_PLATFORM_DEVICE=y
|
||||
CONFIG_ACPI_AC=y
|
||||
CONFIG_ACPI_BATTERY=y
|
||||
# CONFIG_SND_ATMEL_SOC is not set
|
||||
# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
# CONFIG_SND_I2S_HI6210_I2S is not set
|
||||
CONFIG_SND_PCM_ELD=y
|
||||
CONFIG_SND_PCM_IEC958=y
|
||||
# CONFIG_SND_SIMPLE_CARD is not set
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_ADAU1372_I2C is not set
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_ADAU7118_HW is not set
|
||||
# CONFIG_SND_SOC_ADAU7118_I2C is not set
|
||||
# CONFIG_SND_SOC_ADI is not set
|
||||
# CONFIG_SND_SOC_AK4118 is not set
|
||||
# CONFIG_SND_SOC_AK4458 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_AK5558 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_AMD_ACP3x is not set
|
||||
# CONFIG_SND_SOC_AMD_ACP is not set
|
||||
CONFIG_SND_SOC_AMD_RENOIR=m
|
||||
CONFIG_SND_SOC_AMD_RENOIR_MACH=m
|
||||
# CONFIG_SND_SOC_BD28623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS35L34 is not set
|
||||
# CONFIG_SND_SOC_CS35L35 is not set
|
||||
# CONFIG_SND_SOC_CS35L36 is not set
|
||||
# CONFIG_SND_SOC_CS4234 is not set
|
||||
# CONFIG_SND_SOC_CS4265 is not set
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L42 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
# CONFIG_SND_SOC_CS42L73 is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS43130 is not set
|
||||
# CONFIG_SND_SOC_CS4341 is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_CX2072X is not set
|
||||
# CONFIG_SND_SOC_DA7213 is not set
|
||||
CONFIG_SND_SOC_DMIC=m
|
||||
# CONFIG_SND_SOC_ES7134 is not set
|
||||
# CONFIG_SND_SOC_ES7241 is not set
|
||||
# CONFIG_SND_SOC_ES8316 is not set
|
||||
# CONFIG_SND_SOC_ES8328_I2C is not set
|
||||
# CONFIG_SND_SOC_FSL_ASRC is not set
|
||||
# CONFIG_SND_SOC_FSL_AUDMIX is not set
|
||||
# CONFIG_SND_SOC_FSL_ESAI is not set
|
||||
# CONFIG_SND_SOC_FSL_MICFIL is not set
|
||||
# CONFIG_SND_SOC_FSL_SAI is not set
|
||||
# CONFIG_SND_SOC_FSL_SPDIF is not set
|
||||
# CONFIG_SND_SOC_FSL_SSI is not set
|
||||
# CONFIG_SND_SOC_FSL_XCVR is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
CONFIG_SND_SOC_HDMI_CODEC=m
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
# CONFIG_SND_SOC_IMG is not set
|
||||
# CONFIG_SND_SOC_IMX_AUDMUX is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_INTEL_SST_TOPLEVEL is not set
|
||||
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
|
||||
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
|
||||
CONFIG_SND_SOC=m
|
||||
# CONFIG_SND_SOC_MAX9759 is not set
|
||||
# CONFIG_SND_SOC_MAX98088 is not set
|
||||
# CONFIG_SND_SOC_MAX98357A is not set
|
||||
# CONFIG_SND_SOC_MAX98373_I2C is not set
|
||||
# CONFIG_SND_SOC_MAX98390 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_MAX9867 is not set
|
||||
# CONFIG_SND_SOC_MAX98927 is not set
|
||||
# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
|
||||
# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
|
||||
# CONFIG_SND_SOC_MT6351 is not set
|
||||
# CONFIG_SND_SOC_MT6358 is not set
|
||||
# CONFIG_SND_SOC_MT6660 is not set
|
||||
# CONFIG_SND_SOC_MTK_BTCVSD is not set
|
||||
# CONFIG_SND_SOC_NAU8315 is not set
|
||||
# CONFIG_SND_SOC_NAU8540 is not set
|
||||
# CONFIG_SND_SOC_NAU8810 is not set
|
||||
# CONFIG_SND_SOC_NAU8822 is not set
|
||||
# CONFIG_SND_SOC_NAU8824 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM1789_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM186X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3060_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM5102A is not set
|
||||
# CONFIG_SND_SOC_PCM512x_I2C is not set
|
||||
# CONFIG_SND_SOC_RK3328 is not set
|
||||
# CONFIG_SND_SOC_RT5616 is not set
|
||||
# CONFIG_SND_SOC_RT5631 is not set
|
||||
# CONFIG_SND_SOC_SGTL5000 is not set
|
||||
# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
|
||||
# CONFIG_SND_SOC_SIMPLE_MUX is not set
|
||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||
# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
|
||||
# CONFIG_SND_SOC_SPDIF is not set
|
||||
# CONFIG_SND_SOC_SSM2305 is not set
|
||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||
# CONFIG_SND_SOC_SSM4567 is not set
|
||||
# CONFIG_SND_SOC_STA32X is not set
|
||||
# CONFIG_SND_SOC_STA350 is not set
|
||||
# CONFIG_SND_SOC_STI_SAS is not set
|
||||
# CONFIG_SND_SOC_TAS2552 is not set
|
||||
# CONFIG_SND_SOC_TAS2562 is not set
|
||||
# CONFIG_SND_SOC_TAS2764 is not set
|
||||
# CONFIG_SND_SOC_TAS2770 is not set
|
||||
# CONFIG_SND_SOC_TAS5086 is not set
|
||||
# CONFIG_SND_SOC_TAS571X is not set
|
||||
# CONFIG_SND_SOC_TAS5720 is not set
|
||||
# CONFIG_SND_SOC_TAS6424 is not set
|
||||
# CONFIG_SND_SOC_TDA7419 is not set
|
||||
# CONFIG_SND_SOC_TFA9879 is not set
|
||||
# CONFIG_SND_SOC_TLV320ADCX140 is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC31XX is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
|
||||
# CONFIG_SND_SOC_TLV320AIC3X is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
# CONFIG_SND_SOC_TS3A227E is not set
|
||||
# CONFIG_SND_SOC_TSCS42XX is not set
|
||||
# CONFIG_SND_SOC_TSCS454 is not set
|
||||
# CONFIG_SND_SOC_UDA1334 is not set
|
||||
# CONFIG_SND_SOC_WM8510 is not set
|
||||
# CONFIG_SND_SOC_WM8523 is not set
|
||||
# CONFIG_SND_SOC_WM8524 is not set
|
||||
# CONFIG_SND_SOC_WM8580 is not set
|
||||
# CONFIG_SND_SOC_WM8711 is not set
|
||||
# CONFIG_SND_SOC_WM8728 is not set
|
||||
# CONFIG_SND_SOC_WM8731 is not set
|
||||
# CONFIG_SND_SOC_WM8737 is not set
|
||||
# CONFIG_SND_SOC_WM8741 is not set
|
||||
# CONFIG_SND_SOC_WM8750 is not set
|
||||
# CONFIG_SND_SOC_WM8753 is not set
|
||||
# CONFIG_SND_SOC_WM8776 is not set
|
||||
# CONFIG_SND_SOC_WM8782 is not set
|
||||
# CONFIG_SND_SOC_WM8804_I2C is not set
|
||||
# CONFIG_SND_SOC_WM8903 is not set
|
||||
# CONFIG_SND_SOC_WM8904 is not set
|
||||
# CONFIG_SND_SOC_WM8960 is not set
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
|
||||
# CONFIG_SND_SOC_XILINX_I2S is not set
|
||||
# CONFIG_SND_SOC_XILINX_SPDIF is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
# CONFIG_SND_SOC_ZX_AUD96P22 is not set
|
||||
# CONFIG_VIDEO_TDA1997X is not set
|
||||
# CONFIG_ZX_TDM is not set
|
||||
@ -1,10 +0,0 @@
|
||||
# Calculate format=kernel name=.config
|
||||
CONFIG_KERNEL_ZSTD_LEVEL=19
|
||||
# CONFIG_KERNEL_ZSTD_LEVEL_ULTRA is not set
|
||||
# CONFIG_MODULE_COMPRESS_GZIP is not set
|
||||
CONFIG_MODULE_COMPRESS_ZSTD_LEVEL=9
|
||||
# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
|
||||
# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
|
||||
# CONFIG_SND_SOC_RT5659 is not set
|
||||
!CONFIG_SND_SOC_SIRF_AUDIO_CODEC=
|
||||
!CONFIG_ZX_TDM=
|
||||
@ -1,14 +0,0 @@
|
||||
# Calculate format=kernel name=.config merge(sys-kernel/calculate-sources[-desktop])!=
|
||||
# CONFIG_BT is not set
|
||||
# CONFIG_GAMEPORT is not set
|
||||
# CONFIG_HZ_1000 is not set
|
||||
# CONFIG_INPUT_JOYSTICK is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_INPUT_TABLET is not set
|
||||
# CONFIG_INPUT_TOUCHSCREEN is not set
|
||||
# CONFIG_MACINTOSH_DRIVERS is not set
|
||||
# CONFIG_MEDIA_SUPPORT is not set
|
||||
# CONFIG_PREEMPT is not set
|
||||
# CONFIG_RC_CORE is not set
|
||||
# CONFIG_SOUND is not set
|
||||
# CONFIG_USB_GADGET is not set
|
||||
@ -1,3 +0,0 @@
|
||||
# Calculate format=kernel name=.config
|
||||
CONFIG_MODULE_COMPRESS_ZSTD=y
|
||||
# CONFIG_MODULE_COMPRESS_XZ is not set
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,502 +0,0 @@
|
||||
# Calculate format=diff merge(sys-kernel/calculate-sources[fsync])!=
|
||||
From 7229895c1a6432219d05b02c8702189ab65570b3 Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
Date: Tue, 13 Apr 2021 16:06:05 +0200
|
||||
Subject: [PATCH] futex: resync from gitlab.collabora.com
|
||||
|
||||
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
---
|
||||
include/uapi/linux/futex.h | 20 +++
|
||||
kernel/futex.c | 357 ++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 373 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
|
||||
index a89eb0acc..a3e760886 100644
|
||||
--- a/include/uapi/linux/futex.h
|
||||
+++ b/include/uapi/linux/futex.h
|
||||
@@ -21,6 +21,7 @@
|
||||
#define FUTEX_WAKE_BITSET 10
|
||||
#define FUTEX_WAIT_REQUEUE_PI 11
|
||||
#define FUTEX_CMP_REQUEUE_PI 12
|
||||
+#define FUTEX_WAIT_MULTIPLE 31
|
||||
|
||||
#define FUTEX_PRIVATE_FLAG 128
|
||||
#define FUTEX_CLOCK_REALTIME 256
|
||||
@@ -40,6 +41,8 @@
|
||||
FUTEX_PRIVATE_FLAG)
|
||||
#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \
|
||||
FUTEX_PRIVATE_FLAG)
|
||||
+#define FUTEX_WAIT_MULTIPLE_PRIVATE (FUTEX_WAIT_MULTIPLE | \
|
||||
+ FUTEX_PRIVATE_FLAG)
|
||||
|
||||
/*
|
||||
* Support for robust futexes: the kernel cleans up held futexes at
|
||||
@@ -150,4 +153,21 @@ struct robust_list_head {
|
||||
(((op & 0xf) << 28) | ((cmp & 0xf) << 24) \
|
||||
| ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
|
||||
|
||||
+/*
|
||||
+ * Maximum number of multiple futexes to wait for
|
||||
+ */
|
||||
+#define FUTEX_MULTIPLE_MAX_COUNT 128
|
||||
+
|
||||
+/**
|
||||
+ * struct futex_wait_block - Block of futexes to be waited for
|
||||
+ * @uaddr: User address of the futex
|
||||
+ * @val: Futex value expected by userspace
|
||||
+ * @bitset: Bitset for the optional bitmasked wakeup
|
||||
+ */
|
||||
+struct futex_wait_block {
|
||||
+ __u32 __user *uaddr;
|
||||
+ __u32 val;
|
||||
+ __u32 bitset;
|
||||
+};
|
||||
+
|
||||
#endif /* _UAPI_LINUX_FUTEX_H */
|
||||
diff --git a/kernel/futex.c b/kernel/futex.c
|
||||
index 00febd6de..6859dd7ca 100644
|
||||
--- a/kernel/futex.c
|
||||
+++ b/kernel/futex.c
|
||||
@@ -198,6 +198,8 @@ struct futex_pi_state {
|
||||
* @rt_waiter: rt_waiter storage for use with requeue_pi
|
||||
* @requeue_pi_key: the requeue_pi target futex key
|
||||
* @bitset: bitset for the optional bitmasked wakeup
|
||||
+ * @uaddr: userspace address of futex
|
||||
+ * @uval: expected futex's value
|
||||
*
|
||||
* We use this hashed waitqueue, instead of a normal wait_queue_entry_t, so
|
||||
* we can wake only the relevant ones (hashed queues may be shared).
|
||||
@@ -220,6 +222,8 @@ struct futex_q {
|
||||
struct rt_mutex_waiter *rt_waiter;
|
||||
union futex_key *requeue_pi_key;
|
||||
u32 bitset;
|
||||
+ u32 __user *uaddr;
|
||||
+ u32 uval;
|
||||
} __randomize_layout;
|
||||
|
||||
static const struct futex_q futex_q_init = {
|
||||
@@ -2313,6 +2317,29 @@ static int unqueue_me(struct futex_q *q)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * unqueue_multiple() - Remove several futexes from their futex_hash_bucket
|
||||
+ * @q: The list of futexes to unqueue
|
||||
+ * @count: Number of futexes in the list
|
||||
+ *
|
||||
+ * Helper to unqueue a list of futexes. This can't fail.
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * - >=0 - Index of the last futex that was awoken;
|
||||
+ * - -1 - If no futex was awoken
|
||||
+ */
|
||||
+static int unqueue_multiple(struct futex_q *q, int count)
|
||||
+{
|
||||
+ int ret = -1;
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ if (!unqueue_me(&q[i]))
|
||||
+ ret = i;
|
||||
+ }
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* PI futexes can not be requeued and must remove themself from the
|
||||
* hash bucket. The hash bucket lock (i.e. lock_ptr) is held on entry
|
||||
@@ -2680,6 +2707,205 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * futex_wait_multiple_setup() - Prepare to wait and enqueue multiple futexes
|
||||
+ * @qs: The corresponding futex list
|
||||
+ * @count: The size of the lists
|
||||
+ * @flags: Futex flags (FLAGS_SHARED, etc.)
|
||||
+ * @awaken: Index of the last awoken futex
|
||||
+ *
|
||||
+ * Prepare multiple futexes in a single step and enqueue them. This may fail if
|
||||
+ * the futex list is invalid or if any futex was already awoken. On success the
|
||||
+ * task is ready to interruptible sleep.
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * - 1 - One of the futexes was awaken by another thread
|
||||
+ * - 0 - Success
|
||||
+ * - <0 - -EFAULT, -EWOULDBLOCK or -EINVAL
|
||||
+ */
|
||||
+static int futex_wait_multiple_setup(struct futex_q *qs, int count,
|
||||
+ unsigned int flags, int *awaken)
|
||||
+{
|
||||
+ struct futex_hash_bucket *hb;
|
||||
+ int ret, i;
|
||||
+ u32 uval;
|
||||
+
|
||||
+ /*
|
||||
+ * Enqueuing multiple futexes is tricky, because we need to
|
||||
+ * enqueue each futex in the list before dealing with the next
|
||||
+ * one to avoid deadlocking on the hash bucket. But, before
|
||||
+ * enqueuing, we need to make sure that current->state is
|
||||
+ * TASK_INTERRUPTIBLE, so we don't absorb any awake events, which
|
||||
+ * cannot be done before the get_futex_key of the next key,
|
||||
+ * because it calls get_user_pages, which can sleep. Thus, we
|
||||
+ * fetch the list of futexes keys in two steps, by first pinning
|
||||
+ * all the memory keys in the futex key, and only then we read
|
||||
+ * each key and queue the corresponding futex.
|
||||
+ */
|
||||
+retry:
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ qs[i].key = FUTEX_KEY_INIT;
|
||||
+ ret = get_futex_key(qs[i].uaddr, flags & FLAGS_SHARED,
|
||||
+ &qs[i].key, FUTEX_READ);
|
||||
+ if (unlikely(ret)) {
|
||||
+ return ret;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ set_current_state(TASK_INTERRUPTIBLE);
|
||||
+
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ struct futex_q *q = &qs[i];
|
||||
+
|
||||
+ hb = queue_lock(q);
|
||||
+
|
||||
+ ret = get_futex_value_locked(&uval, q->uaddr);
|
||||
+ if (ret) {
|
||||
+ /*
|
||||
+ * We need to try to handle the fault, which
|
||||
+ * cannot be done without sleep, so we need to
|
||||
+ * undo all the work already done, to make sure
|
||||
+ * we don't miss any wake ups. Therefore, clean
|
||||
+ * up, handle the fault and retry from the
|
||||
+ * beginning.
|
||||
+ */
|
||||
+ queue_unlock(hb);
|
||||
+
|
||||
+ /*
|
||||
+ * Keys 0..(i-1) are implicitly put
|
||||
+ * on unqueue_multiple.
|
||||
+ */
|
||||
+ *awaken = unqueue_multiple(qs, i);
|
||||
+
|
||||
+ __set_current_state(TASK_RUNNING);
|
||||
+
|
||||
+ /*
|
||||
+ * On a real fault, prioritize the error even if
|
||||
+ * some other futex was awoken. Userspace gave
|
||||
+ * us a bad address, -EFAULT them.
|
||||
+ */
|
||||
+ ret = get_user(uval, q->uaddr);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ /*
|
||||
+ * Even if the page fault was handled, If
|
||||
+ * something was already awaken, we can safely
|
||||
+ * give up and succeed to give a hint for userspace to
|
||||
+ * acquire the right futex faster.
|
||||
+ */
|
||||
+ if (*awaken >= 0)
|
||||
+ return 1;
|
||||
+
|
||||
+ goto retry;
|
||||
+ }
|
||||
+
|
||||
+ if (uval != q->uval) {
|
||||
+ queue_unlock(hb);
|
||||
+
|
||||
+ /*
|
||||
+ * If something was already awaken, we can
|
||||
+ * safely ignore the error and succeed.
|
||||
+ */
|
||||
+ *awaken = unqueue_multiple(qs, i);
|
||||
+ __set_current_state(TASK_RUNNING);
|
||||
+ if (*awaken >= 0)
|
||||
+ return 1;
|
||||
+
|
||||
+ return -EWOULDBLOCK;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * The bucket lock can't be held while dealing with the
|
||||
+ * next futex. Queue each futex at this moment so hb can
|
||||
+ * be unlocked.
|
||||
+ */
|
||||
+ queue_me(&qs[i], hb);
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * futex_wait_multiple() - Prepare to wait on and enqueue several futexes
|
||||
+ * @qs: The list of futexes to wait on
|
||||
+ * @op: Operation code from futex's syscall
|
||||
+ * @count: The number of objects
|
||||
+ * @abs_time: Timeout before giving up and returning to userspace
|
||||
+ *
|
||||
+ * Entry point for the FUTEX_WAIT_MULTIPLE futex operation, this function
|
||||
+ * sleeps on a group of futexes and returns on the first futex that
|
||||
+ * triggered, or after the timeout has elapsed.
|
||||
+ *
|
||||
+ * Return:
|
||||
+ * - >=0 - Hint to the futex that was awoken
|
||||
+ * - <0 - On error
|
||||
+ */
|
||||
+static int futex_wait_multiple(struct futex_q *qs, int op,
|
||||
+ u32 count, ktime_t *abs_time)
|
||||
+{
|
||||
+ struct hrtimer_sleeper timeout, *to;
|
||||
+ int ret, flags = 0, hint = 0;
|
||||
+ unsigned int i;
|
||||
+
|
||||
+ if (!(op & FUTEX_PRIVATE_FLAG))
|
||||
+ flags |= FLAGS_SHARED;
|
||||
+
|
||||
+ if (op & FUTEX_CLOCK_REALTIME)
|
||||
+ flags |= FLAGS_CLOCKRT;
|
||||
+
|
||||
+ to = futex_setup_timer(abs_time, &timeout, flags, 0);
|
||||
+ while (1) {
|
||||
+ ret = futex_wait_multiple_setup(qs, count, flags, &hint);
|
||||
+ if (ret) {
|
||||
+ if (ret > 0) {
|
||||
+ /* A futex was awaken during setup */
|
||||
+ ret = hint;
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ if (to)
|
||||
+ hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
|
||||
+
|
||||
+ /*
|
||||
+ * Avoid sleeping if another thread already tried to
|
||||
+ * wake us.
|
||||
+ */
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ if (plist_node_empty(&qs[i].list))
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ if (i == count && (!to || to->task))
|
||||
+ freezable_schedule();
|
||||
+
|
||||
+ ret = unqueue_multiple(qs, count);
|
||||
+
|
||||
+ __set_current_state(TASK_RUNNING);
|
||||
+
|
||||
+ if (ret >= 0)
|
||||
+ break;
|
||||
+ if (to && !to->task) {
|
||||
+ ret = -ETIMEDOUT;
|
||||
+ break;
|
||||
+ } else if (signal_pending(current)) {
|
||||
+ ret = -ERESTARTSYS;
|
||||
+ break;
|
||||
+ }
|
||||
+ /*
|
||||
+ * The final case is a spurious wakeup, for
|
||||
+ * which just retry.
|
||||
+ */
|
||||
+ }
|
||||
+
|
||||
+ if (to) {
|
||||
+ hrtimer_cancel(&to->timer);
|
||||
+ destroy_hrtimer_on_stack(&to->timer);
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val,
|
||||
ktime_t *abs_time, u32 bitset)
|
||||
{
|
||||
@@ -3759,6 +3985,43 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * futex_read_wait_block - Read an array of futex_wait_block from userspace
|
||||
+ * @uaddr: Userspace address of the block
|
||||
+ * @count: Number of blocks to be read
|
||||
+ *
|
||||
+ * This function creates and allocate an array of futex_q (we zero it to
|
||||
+ * initialize the fields) and then, for each futex_wait_block element from
|
||||
+ * userspace, fill a futex_q element with proper values.
|
||||
+ */
|
||||
+inline struct futex_q *futex_read_wait_block(u32 __user *uaddr, u32 count)
|
||||
+{
|
||||
+ unsigned int i;
|
||||
+ struct futex_q *qs;
|
||||
+ struct futex_wait_block fwb;
|
||||
+ struct futex_wait_block __user *entry =
|
||||
+ (struct futex_wait_block __user *)uaddr;
|
||||
+
|
||||
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
||||
+ return ERR_PTR(-EINVAL);
|
||||
+
|
||||
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
||||
+ if (!qs)
|
||||
+ return ERR_PTR(-ENOMEM);
|
||||
+
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
||||
+ kfree(qs);
|
||||
+ return ERR_PTR(-EFAULT);
|
||||
+ }
|
||||
+
|
||||
+ qs[i].uaddr = fwb.uaddr;
|
||||
+ qs[i].uval = fwb.val;
|
||||
+ qs[i].bitset = fwb.bitset;
|
||||
+ }
|
||||
+
|
||||
+ return qs;
|
||||
+}
|
||||
|
||||
SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
||||
const struct __kernel_timespec __user *, utime,
|
||||
@@ -3771,7 +4034,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
||||
|
||||
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
|
||||
cmd == FUTEX_WAIT_BITSET ||
|
||||
- cmd == FUTEX_WAIT_REQUEUE_PI)) {
|
||||
+ cmd == FUTEX_WAIT_REQUEUE_PI ||
|
||||
+ cmd == FUTEX_WAIT_MULTIPLE)) {
|
||||
if (unlikely(should_fail_futex(!(op & FUTEX_PRIVATE_FLAG))))
|
||||
return -EFAULT;
|
||||
if (get_timespec64(&ts, utime))
|
||||
@@ -3780,7 +4044,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
||||
return -EINVAL;
|
||||
|
||||
t = timespec64_to_ktime(ts);
|
||||
- if (cmd == FUTEX_WAIT)
|
||||
+ if (cmd == FUTEX_WAIT || cmd == FUTEX_WAIT_MULTIPLE)
|
||||
t = ktime_add_safe(ktime_get(), t);
|
||||
else if (!(op & FUTEX_CLOCK_REALTIME))
|
||||
t = timens_ktime_to_host(CLOCK_MONOTONIC, t);
|
||||
@@ -3794,6 +4058,25 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
||||
cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
|
||||
val2 = (u32) (unsigned long) utime;
|
||||
|
||||
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
||||
+ int ret;
|
||||
+ struct futex_q *qs;
|
||||
+
|
||||
+#ifdef CONFIG_X86_X32
|
||||
+ if (unlikely(in_x32_syscall()))
|
||||
+ return -ENOSYS;
|
||||
+#endif
|
||||
+ qs = futex_read_wait_block(uaddr, val);
|
||||
+
|
||||
+ if (IS_ERR(qs))
|
||||
+ return PTR_ERR(qs);
|
||||
+
|
||||
+ ret = futex_wait_multiple(qs, op, val, tp);
|
||||
+ kfree(qs);
|
||||
+
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
||||
}
|
||||
|
||||
@@ -3956,6 +4239,58 @@ COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
|
||||
#endif /* CONFIG_COMPAT */
|
||||
|
||||
#ifdef CONFIG_COMPAT_32BIT_TIME
|
||||
+/**
|
||||
+ * struct compat_futex_wait_block - Block of futexes to be waited for
|
||||
+ * @uaddr: User address of the futex (compatible pointer)
|
||||
+ * @val: Futex value expected by userspace
|
||||
+ * @bitset: Bitset for the optional bitmasked wakeup
|
||||
+ */
|
||||
+struct compat_futex_wait_block {
|
||||
+ compat_uptr_t uaddr;
|
||||
+ __u32 pad;
|
||||
+ __u32 val;
|
||||
+ __u32 bitset;
|
||||
+};
|
||||
+
|
||||
+/**
|
||||
+ * compat_futex_read_wait_block - Read an array of futex_wait_block from
|
||||
+ * userspace
|
||||
+ * @uaddr: Userspace address of the block
|
||||
+ * @count: Number of blocks to be read
|
||||
+ *
|
||||
+ * This function does the same as futex_read_wait_block(), except that it
|
||||
+ * converts the pointer to the futex from the compat version to the regular one.
|
||||
+ */
|
||||
+inline struct futex_q *compat_futex_read_wait_block(u32 __user *uaddr,
|
||||
+ u32 count)
|
||||
+{
|
||||
+ unsigned int i;
|
||||
+ struct futex_q *qs;
|
||||
+ struct compat_futex_wait_block fwb;
|
||||
+ struct compat_futex_wait_block __user *entry =
|
||||
+ (struct compat_futex_wait_block __user *)uaddr;
|
||||
+
|
||||
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
||||
+ return ERR_PTR(-EINVAL);
|
||||
+
|
||||
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
||||
+ if (!qs)
|
||||
+ return ERR_PTR(-ENOMEM);
|
||||
+
|
||||
+ for (i = 0; i < count; i++) {
|
||||
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
||||
+ kfree(qs);
|
||||
+ return ERR_PTR(-EFAULT);
|
||||
+ }
|
||||
+
|
||||
+ qs[i].uaddr = compat_ptr(fwb.uaddr);
|
||||
+ qs[i].uval = fwb.val;
|
||||
+ qs[i].bitset = fwb.bitset;
|
||||
+ }
|
||||
+
|
||||
+ return qs;
|
||||
+}
|
||||
+
|
||||
SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
||||
const struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
|
||||
u32, val3)
|
||||
@@ -3967,14 +4302,15 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
||||
|
||||
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
|
||||
cmd == FUTEX_WAIT_BITSET ||
|
||||
- cmd == FUTEX_WAIT_REQUEUE_PI)) {
|
||||
+ cmd == FUTEX_WAIT_REQUEUE_PI ||
|
||||
+ cmd == FUTEX_WAIT_MULTIPLE)) {
|
||||
if (get_old_timespec32(&ts, utime))
|
||||
return -EFAULT;
|
||||
if (!timespec64_valid(&ts))
|
||||
return -EINVAL;
|
||||
|
||||
t = timespec64_to_ktime(ts);
|
||||
- if (cmd == FUTEX_WAIT)
|
||||
+ if (cmd == FUTEX_WAIT || cmd == FUTEX_WAIT_MULTIPLE)
|
||||
t = ktime_add_safe(ktime_get(), t);
|
||||
else if (!(op & FUTEX_CLOCK_REALTIME))
|
||||
t = timens_ktime_to_host(CLOCK_MONOTONIC, t);
|
||||
@@ -3984,6 +4320,19 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
||||
cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
|
||||
val2 = (int) (unsigned long) utime;
|
||||
|
||||
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
||||
+ int ret;
|
||||
+ struct futex_q *qs = compat_futex_read_wait_block(uaddr, val);
|
||||
+
|
||||
+ if (IS_ERR(qs))
|
||||
+ return PTR_ERR(qs);
|
||||
+
|
||||
+ ret = futex_wait_multiple(qs, op, val, tp);
|
||||
+ kfree(qs);
|
||||
+
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
||||
}
|
||||
#endif /* CONFIG_COMPAT_32BIT_TIME */
|
||||
--
|
||||
2.31.1.305.gd1b10fc6d8
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
# Calculate format=diff
|
||||
From a930025e03b8cf4f245f01eaa0ba7700b0c8f374 Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
Date: Tue, 30 Mar 2021 12:08:53 +0100
|
||||
Subject: [PATCH 1/4] init: add support for zstd compressed modules
|
||||
|
||||
kmod 28 supports modules compressed in zstd format so let's add this possibility to kernel.
|
||||
|
||||
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
---
|
||||
Makefile | 7 +++++--
|
||||
init/Kconfig | 9 ++++++---
|
||||
2 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3a10a8e08..e5536960a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1066,8 +1066,8 @@ endif # INSTALL_MOD_STRIP
|
||||
export mod_strip_cmd
|
||||
|
||||
# CONFIG_MODULE_COMPRESS, if defined, will cause module to be compressed
|
||||
-# after they are installed in agreement with CONFIG_MODULE_COMPRESS_GZIP
|
||||
-# or CONFIG_MODULE_COMPRESS_XZ.
|
||||
+# after they are installed in agreement with CONFIG_MODULE_COMPRESS_GZIP,
|
||||
+# CONFIG_MODULE_COMPRESS_XZ, or CONFIG_MODULE_COMPRESS_ZSTD.
|
||||
|
||||
mod_compress_cmd = true
|
||||
ifdef CONFIG_MODULE_COMPRESS
|
||||
@@ -1077,6 +1077,9 @@ ifdef CONFIG_MODULE_COMPRESS
|
||||
ifdef CONFIG_MODULE_COMPRESS_XZ
|
||||
mod_compress_cmd = $(XZ) --lzma2=dict=2MiB -f
|
||||
endif # CONFIG_MODULE_COMPRESS_XZ
|
||||
+ ifdef CONFIG_MODULE_COMPRESS_ZSTD
|
||||
+ mod_compress_cmd = $(ZSTD) -T0 --rm -f -q
|
||||
+ endif # CONFIG_MODULE_COMPRESS_ZSTD
|
||||
endif # CONFIG_MODULE_COMPRESS
|
||||
export mod_compress_cmd
|
||||
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 6cc9c1c70..ecaccccd0 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -2229,8 +2229,8 @@ config MODULE_COMPRESS
|
||||
bool "Compress modules on installation"
|
||||
help
|
||||
|
||||
- Compresses kernel modules when 'make modules_install' is run; gzip or
|
||||
- xz depending on "Compression algorithm" below.
|
||||
+ Compresses kernel modules when 'make modules_install' is run; gzip,
|
||||
+ xz, or zstd depending on "Compression algorithm" below.
|
||||
|
||||
module-init-tools MAY support gzip, and kmod MAY support gzip and xz.
|
||||
|
||||
@@ -2252,7 +2252,7 @@ choice
|
||||
This determines which sort of compression will be used during
|
||||
'make modules_install'.
|
||||
|
||||
- GZIP (default) and XZ are supported.
|
||||
+ GZIP (default), XZ, and ZSTD are supported.
|
||||
|
||||
config MODULE_COMPRESS_GZIP
|
||||
bool "GZIP"
|
||||
@@ -2260,6 +2260,9 @@ config MODULE_COMPRESS_GZIP
|
||||
config MODULE_COMPRESS_XZ
|
||||
bool "XZ"
|
||||
|
||||
+config MODULE_COMPRESS_ZSTD
|
||||
+ bool "ZSTD"
|
||||
+
|
||||
endchoice
|
||||
|
||||
config MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS
|
||||
--
|
||||
2.31.1.305.gd1b10fc6d8
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
# Calculate format=diff
|
||||
From 22dd6599c5d261925175a2f8a661c1c5d8755211 Mon Sep 17 00:00:00 2001
|
||||
From: torvic9 <torvic9@mailbox.org>
|
||||
Date: Fri, 2 Apr 2021 15:56:36 +0200
|
||||
Subject: [PATCH 2/4] allow setting zstd compression level for kernel
|
||||
|
||||
Signed-off-by: torvic9 <torvic9@mailbox.org>
|
||||
---
|
||||
arch/x86/boot/compressed/Makefile | 5 +++++
|
||||
init/Kconfig | 19 +++++++++++++++++++
|
||||
scripts/Makefile.lib | 4 ++--
|
||||
3 files changed, 26 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
|
||||
index e0bc3988c..59ed10c61 100644
|
||||
--- a/arch/x86/boot/compressed/Makefile
|
||||
+++ b/arch/x86/boot/compressed/Makefile
|
||||
@@ -130,8 +130,13 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
||||
$(call if_changed,lzo)
|
||||
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
|
||||
$(call if_changed,lz4)
|
||||
+ifdef CONFIG_KERNEL_ZSTD_ULTRA
|
||||
$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
|
||||
$(call if_changed,zstd22)
|
||||
+else
|
||||
+$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
|
||||
+ $(call if_changed,zstd)
|
||||
+endif
|
||||
|
||||
suffix-$(CONFIG_KERNEL_GZIP) := gz
|
||||
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index ecaccccd0..34384e4a1 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -309,6 +309,25 @@ config KERNEL_UNCOMPRESSED
|
||||
|
||||
endchoice
|
||||
|
||||
+menu "ZSTD compression options"
|
||||
+ depends on KERNEL_ZSTD
|
||||
+
|
||||
+config KERNEL_ZSTD_LEVEL
|
||||
+ int "Compression level (1-19)"
|
||||
+ range 1 19
|
||||
+ default 19
|
||||
+ help
|
||||
+ Choose a compression level for zstd kernel compression.
|
||||
+ Default is 19.
|
||||
+
|
||||
+config KERNEL_ZSTD_LEVEL_ULTRA
|
||||
+ bool "Ultra compression"
|
||||
+ help
|
||||
+ Selecting this overrides the chosen compression level and enables
|
||||
+ the highest possible compression level for zstd (ultra-22).
|
||||
+
|
||||
+endmenu
|
||||
+
|
||||
config DEFAULT_INIT
|
||||
string "Default init path"
|
||||
default ""
|
||||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
||||
index 8cd67b1b6..f2dfaa5a0 100644
|
||||
--- a/scripts/Makefile.lib
|
||||
+++ b/scripts/Makefile.lib
|
||||
@@ -455,10 +455,10 @@ quiet_cmd_xzmisc = XZMISC $@
|
||||
# be used because it would require zstd to allocate a 128 MB buffer.
|
||||
|
||||
quiet_cmd_zstd = ZSTD $@
|
||||
- cmd_zstd = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
|
||||
+ cmd_zstd = { cat $(real-prereqs) | $(ZSTD) -$(CONFIG_KERNEL_ZSTD_LEVEL) -T0; $(size_append); } > $@
|
||||
|
||||
quiet_cmd_zstd22 = ZSTD22 $@
|
||||
- cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
|
||||
+ cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -22 --ultra -T0; $(size_append); } > $@
|
||||
|
||||
# ASM offsets
|
||||
# ---------------------------------------------------------------------------
|
||||
--
|
||||
2.31.1.305.gd1b10fc6d8
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
# Calculate format=diff
|
||||
From 6e4686daf7ef33cc8b3d4934e4585cfd4e79a8be Mon Sep 17 00:00:00 2001
|
||||
From: torvic9 <torvic9@mailbox.org>
|
||||
Date: Fri, 2 Apr 2021 16:00:26 +0200
|
||||
Subject: [PATCH 3/4] allow setting zstd compression level for modules
|
||||
|
||||
Signed-off-by: torvic9 <torvic9@mailbox.org>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
init/Kconfig | 8 ++++++++
|
||||
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e5536960a..7c4c6f602 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1078,7 +1078,7 @@ ifdef CONFIG_MODULE_COMPRESS
|
||||
mod_compress_cmd = $(XZ) --lzma2=dict=2MiB -f
|
||||
endif # CONFIG_MODULE_COMPRESS_XZ
|
||||
ifdef CONFIG_MODULE_COMPRESS_ZSTD
|
||||
- mod_compress_cmd = $(ZSTD) -T0 --rm -f -q
|
||||
+ mod_compress_cmd = $(ZSTD) -T0 -$(CONFIG_MODULE_COMPRESS_ZSTD_LEVEL) --rm -f -q
|
||||
endif # CONFIG_MODULE_COMPRESS_ZSTD
|
||||
endif # CONFIG_MODULE_COMPRESS
|
||||
export mod_compress_cmd
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 34384e4a1..98197e83f 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -2284,6 +2284,14 @@ config MODULE_COMPRESS_ZSTD
|
||||
|
||||
endchoice
|
||||
|
||||
+config MODULE_COMPRESS_ZSTD_LEVEL
|
||||
+ int "Compression level (1-19)"
|
||||
+ depends on MODULE_COMPRESS_ZSTD
|
||||
+ range 1 19
|
||||
+ default 3
|
||||
+ help
|
||||
+ Compression level used by zstd for compressing modules.
|
||||
+
|
||||
config MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS
|
||||
bool "Allow loading of modules with missing namespace imports"
|
||||
help
|
||||
--
|
||||
2.31.1.305.gd1b10fc6d8
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Calculate format=diff
|
||||
From 12e3e44bb0d9c0115eba4e759436939f1d4e4629 Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
Date: Sat, 10 Apr 2021 02:06:47 +0200
|
||||
Subject: [PATCH 4/4] init: optimize zstd compression settings
|
||||
|
||||
The --zstd=wlog=21 option is equivalent to --lzma2=dict=2MiB used in XZ compression.
|
||||
So let's unify the various compression options.
|
||||
|
||||
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
init/Kconfig | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7c4c6f602..51d28efd8 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1078,7 +1078,7 @@ ifdef CONFIG_MODULE_COMPRESS
|
||||
mod_compress_cmd = $(XZ) --lzma2=dict=2MiB -f
|
||||
endif # CONFIG_MODULE_COMPRESS_XZ
|
||||
ifdef CONFIG_MODULE_COMPRESS_ZSTD
|
||||
- mod_compress_cmd = $(ZSTD) -T0 -$(CONFIG_MODULE_COMPRESS_ZSTD_LEVEL) --rm -f -q
|
||||
+ mod_compress_cmd = $(ZSTD) -T0 -$(CONFIG_MODULE_COMPRESS_ZSTD_LEVEL) --zstd=wlog=21 --rm -f -q
|
||||
endif # CONFIG_MODULE_COMPRESS_ZSTD
|
||||
endif # CONFIG_MODULE_COMPRESS
|
||||
export mod_compress_cmd
|
||||
diff --git a/init/Kconfig b/init/Kconfig
|
||||
index 98197e83f..1bae85dc4 100644
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -2288,7 +2288,7 @@ config MODULE_COMPRESS_ZSTD_LEVEL
|
||||
int "Compression level (1-19)"
|
||||
depends on MODULE_COMPRESS_ZSTD
|
||||
range 1 19
|
||||
- default 3
|
||||
+ default 9
|
||||
help
|
||||
Compression level used by zstd for compressing modules.
|
||||
|
||||
--
|
||||
2.31.1.305.gd1b10fc6d8
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
|
||||
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
|
||||
DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
|
||||
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
|
||||
DIST patch-5.10.42.xz 1439320 BLAKE2B c7c2b7ea7b2c5e71135142f15d8a4a7958f11cc6b44bfa157fb0791b453479285ec800bc2a20c6d9fb1748e2f92a4927933e43b6bb5a1d815f5c16e39be10eae SHA512 ce17a528f5cad21f1221529c259529dd044b5d1d05a386a53945dbbfe3d6dd79ccbc93c8534c5a6456e1984fd911d34b7a81a9c15e0ca869bb6853ee0e6b4734
|
||||
DIST patch-5.10.53.xz 1821644 BLAKE2B af0e6aa0eb611e5ea81c6fb72525449e5619a519ab435d7d11b7ccc1253cbd63528a3dc314135aba0421e1fd48c5814a53aeaf5dda82bb2231b2e979f9c2211f SHA512 e0ab035f34ec7bfaec547c123efa6aa80ca3147b864cfd0bb46bdce95356dd076a75d22128cc0f78818ac5db24f2e64a2fe15c0ff1df4b040ac4d068354f10d9
|
||||
DIST patch-5.12.19.xz 1047912 BLAKE2B ce5ca85ab6c24c8ac8bd55368916a865f919fbfaefc1e096f83bcf3e807f823a9f23f64df59b642d2f30d27ae042e7fc0341fc97ce5b35f8be74a04a100882f4 SHA512 edf390a025b39777a418e6b66d240af6f6128f5175b3b7d3ca49742d0720546b79b8c30b544e8c79ff56485ca41021a489b7765d59e18839aeb649fb44e81a15
|
||||
DIST patch-5.13.5.xz 473120 BLAKE2B a0dd9f3f972a16de87f0d2d8daa7f5d35b27314d22597a28f471cdbe6cedfa7d4bf69e41504d6a9b9d4c1f085146604394747771185dd0a09276cfd92820b4a8 SHA512 1e4eb575775ccbc2e88b34b902a75562e49d6dfb4699dadd5b41fff9db8c2bc994d946d1e60f6320f48ef233aa721d3725582d4ec57458f2293da9a85806c7b1
|
||||
DIST patch-5.4.124.xz 3006220 BLAKE2B 394645f0cf7898c98d416e93858b3effe171d5bdbc968bccd876c41de527ce0221331a06744cc081a05407d3b539d7ab83ae526ff1cc99e9e17629af7b968932 SHA512 9a8a5388d921c55a6f620f2da0528c4d0ed4487cfa58ac876b7b9625247860e3b25bbfcd39b4ae73f34c2d2b8a45b155a149613a650a1306bdab4bad57f8f9e9
|
||||
DIST patch-5.4.135.xz 3191160 BLAKE2B 133b744868a7473438108d138b032c680257a9e34932f7a8180e021b27a93152ae4d07adf57ef224d2c8c21098e39620223aa4f82c73cf823c4ad7df7699f2b8 SHA512 a2a1417ba6a21ab416fe34d9af417b1e2c81a50398bfaebde62a3e6920331c0a028b01d6584ade146510e4e32e79c5300a827c6db743c4b9f7c76981a17d4e2f
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=7
|
||||
ETYPE="sources"
|
||||
|
||||
inherit calculate-kernel-8 eutils
|
||||
|
||||
DESCRIPTION="Calculate Linux kernel image"
|
||||
KEYWORDS="amd64"
|
||||
HOMEPAGE="http://www.calculate-linux.org"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${ARCH_URI}"
|
||||
|
||||
IUSE="fsync muqss uksm"
|
||||
|
||||
src_unpack() {
|
||||
calculate-kernel-8_src_unpack
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
calculate-kernel-8_pkg_postinst
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=7
|
||||
ETYPE="sources"
|
||||
|
||||
inherit calculate-kernel-8 eutils
|
||||
|
||||
DESCRIPTION="Calculate Linux kernel image"
|
||||
KEYWORDS="~amd64"
|
||||
HOMEPAGE="http://www.calculate-linux.org"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${ARCH_URI}"
|
||||
|
||||
IUSE="fsync muqss uksm"
|
||||
|
||||
src_unpack() {
|
||||
calculate-kernel-8_src_unpack
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
calculate-kernel-8_pkg_postinst
|
||||
}
|
||||
Loading…
Reference in new issue