From bfd1fd5da35a420b0c63bc6b47237dd092651cd4 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 23 Mar 2024 20:34:40 +0100 Subject: [PATCH] uml: add 6.6 testing kernel config + patches apart from refreshes to both config and patches, nothing has changed. Signed-off-by: Christian Lamparter --- target/linux/uml/Makefile | 1 + target/linux/uml/{config-6.1 => config-6.6} | 20 +++++++++++++------ .../101-mconsole-exec.patch | 4 ++-- .../102-pseudo-random-mac.patch | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) rename target/linux/uml/{config-6.1 => config-6.6} (89%) rename target/linux/uml/{patches-6.1 => patches-6.6}/101-mconsole-exec.patch (98%) rename target/linux/uml/{patches-6.1 => patches-6.6}/102-pseudo-random-mac.patch (98%) diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index d9c2b924b5..307687ffda 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -14,6 +14,7 @@ BOARDNAME:=User Mode Linux FEATURES:=audio ext4 rootfs-part squashfs KERNEL_PATCHVER:=6.1 +KERNEL_TESTING_PATCHVER:=6.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/config-6.1 b/target/linux/uml/config-6.6 similarity index 89% rename from target/linux/uml/config-6.1 rename to target/linux/uml/config-6.6 index da4eaac3ac..60d1ce0713 100644 --- a/target/linux/uml/config-6.1 +++ b/target/linux/uml/config-6.6 @@ -1,7 +1,6 @@ CONFIG_3_LEVEL_PGTABLES=y CONFIG_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_EPHEMERAL_INODES=y CONFIG_ARCH_NO_PREEMPT=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_BLK_DEV_COW_COMMON=y @@ -9,6 +8,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_UBD_SYNC=y CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BUFFER_HEAD=y CONFIG_CDROM=y # CONFIG_COMMON_CLK is not set CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 @@ -24,10 +24,10 @@ CONFIG_CRC16=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_UTILS=y -CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA1=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DECOMPRESS_BZIP2=y @@ -40,9 +40,9 @@ CONFIG_F2FS_FS=y CONFIG_FAILOVER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y +CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y -CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_GENERIC_CLOCKEVENTS=y # CONFIG_GENERIC_CPU is not set CONFIG_GENERIC_CPU_DEVICES=y @@ -66,16 +66,19 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_MAY_HAVE_RUNTIME_DEPS=y CONFIG_MCONSOLE=y # CONFIG_MCORE2 is not set -CONFIG_MEMFD_CREATE=y CONFIG_MIGRATION=y CONFIG_MK8=y # CONFIG_MMAPPER is not set +CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_MODULES_USE_ELF_RELA=y # CONFIG_MPSC is not set CONFIG_NAMESPACES=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NET_EGRESS=y CONFIG_NET_FAILOVER=y +CONFIG_NET_INGRESS=y # CONFIG_NET_NS is not set +CONFIG_NET_XGRESS=y CONFIG_NLS=y CONFIG_NO_DMA=y CONFIG_NO_IOMEM=y @@ -83,6 +86,10 @@ CONFIG_NO_IOPORT_MAP=y CONFIG_NR_CPUS=1 CONFIG_NULL_CHAN=y # CONFIG_OF is not set +CONFIG_PAGE_POOL=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PORT_CHAN=y @@ -99,13 +106,14 @@ CONFIG_RD_GZIP=y CONFIG_RELAY=y CONFIG_SG_POOL=y CONFIG_SOFT_WATCHDOG=m -CONFIG_SRCU=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SSL=y CONFIG_SSL_CHAN="pty" CONFIG_STACKTRACE=y CONFIG_STDERR_CONSOLE=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_TTY_CHAN=y CONFIG_UML=y CONFIG_UML_NET=y @@ -122,7 +130,6 @@ CONFIG_UML_NET_TUNTAP=y CONFIG_UML_NET_VECTOR=y # CONFIG_UML_PCI_OVER_VIRTIO is not set CONFIG_UML_RANDOM=y -# CONFIG_UML_SOUND is not set CONFIG_UML_TIME_TRAVEL_SUPPORT=y # CONFIG_UML_WATCHDOG is not set CONFIG_UML_X86=y @@ -145,6 +152,7 @@ CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_TSC=y CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_VMX_FEATURE_NAMES=y CONFIG_XTERM_CHAN=y CONFIG_XTERM_CHAN_DEFAULT_EMULATOR="xterm" CONFIG_ZLIB_INFLATE=y diff --git a/target/linux/uml/patches-6.1/101-mconsole-exec.patch b/target/linux/uml/patches-6.6/101-mconsole-exec.patch similarity index 98% rename from target/linux/uml/patches-6.1/101-mconsole-exec.patch rename to target/linux/uml/patches-6.6/101-mconsole-exec.patch index 2ff9701eb9..0afd777836 100644 --- a/target/linux/uml/patches-6.1/101-mconsole-exec.patch +++ b/target/linux/uml/patches-6.6/101-mconsole-exec.patch @@ -161,7 +161,7 @@ #include -@@ -74,6 +75,28 @@ static int call_usermodehelper_exec_asyn +@@ -71,6 +72,28 @@ static int call_usermodehelper_exec_asyn flush_signal_handlers(current, 1); spin_unlock_irq(¤t->sighand->siglock); @@ -190,7 +190,7 @@ /* * Initial kernel threads share ther FS with init, in order to * get the init root directory. But we've now created a new -@@ -333,6 +356,20 @@ static void helper_unlock(void) +@@ -330,6 +353,20 @@ static void helper_unlock(void) wake_up(&running_helpers_waitq); } diff --git a/target/linux/uml/patches-6.1/102-pseudo-random-mac.patch b/target/linux/uml/patches-6.6/102-pseudo-random-mac.patch similarity index 98% rename from target/linux/uml/patches-6.1/102-pseudo-random-mac.patch rename to target/linux/uml/patches-6.6/102-pseudo-random-mac.patch index d2dc7516e6..2b42459fe8 100644 --- a/target/linux/uml/patches-6.1/102-pseudo-random-mac.patch +++ b/target/linux/uml/patches-6.6/102-pseudo-random-mac.patch @@ -134,7 +134,7 @@ Applies to vanilla kernel 3.9.4. static DEFINE_SPINLOCK(devices_lock); --- a/kernel/umh.c +++ b/kernel/umh.c -@@ -357,12 +357,12 @@ static void helper_unlock(void) +@@ -354,12 +354,12 @@ static void helper_unlock(void) } int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info, -- 2.30.2