From 2c1512fd54f656042a81edd8a9a493171dd04f05 Mon Sep 17 00:00:00 2001 From: Simon Croome Date: Thu, 5 Dec 2019 20:08:22 +0000 Subject: [PATCH 1/2] Add loadable module for TCMU-based storage devices --- images/kernel/generated/config-amd64-4.14.166 | 2 +- images/kernel/generated/config-amd64-4.19.97 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/kernel/generated/config-amd64-4.14.166 b/images/kernel/generated/config-amd64-4.14.166 index 186cada96..e237eae60 100644 --- a/images/kernel/generated/config-amd64-4.14.166 +++ b/images/kernel/generated/config-amd64-4.14.166 @@ -1603,7 +1603,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m diff --git a/images/kernel/generated/config-amd64-4.19.97 b/images/kernel/generated/config-amd64-4.19.97 index 09fd32db9..33745797d 100644 --- a/images/kernel/generated/config-amd64-4.19.97 +++ b/images/kernel/generated/config-amd64-4.19.97 @@ -1636,7 +1636,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m From 38221f3a85eeeebf8e95af346166c1179d610066 Mon Sep 17 00:00:00 2001 From: Sunny Date: Sat, 25 Apr 2020 22:39:22 +0530 Subject: [PATCH 2/2] Add TCM_USER2 in config-patches and run patch-config --- images/kernel/config-patches | 3 +++ images/kernel/generated/config-amd64-4.14.166 | 3 ++- images/kernel/generated/config-amd64-4.19.97 | 7 ++++--- images/kernel/generated/config-amd64-5.4.13 | 10 ++++++---- images/kernel/generated/config-arm64-4.14.166 | 7 ++++--- images/kernel/generated/config-arm64-4.19.97 | 10 ++++++---- images/kernel/generated/config-arm64-5.4.13 | 10 ++++++---- images/kernel/versioned/config-amd64-4.19.97 | 4 ++-- images/kernel/versioned/config-amd64-5.4.13 | 5 +++-- images/kernel/versioned/config-arm64-4.19.97 | 4 ++-- images/kernel/versioned/config-arm64-5.4.13 | 5 +++-- 11 files changed, 41 insertions(+), 27 deletions(-) diff --git a/images/kernel/config-patches b/images/kernel/config-patches index 748ee8a36..186771669 100644 --- a/images/kernel/config-patches +++ b/images/kernel/config-patches @@ -25,3 +25,6 @@ CONFIG_IP_VS_MH=m # https://superuser.com/questions/287371/obtain-kernel-config-from-currently-running-linux-system CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y + +# Enable support for TCMU, required by most of the storage systems. +CONFIG_TCM_USER2=m diff --git a/images/kernel/generated/config-amd64-4.14.166 b/images/kernel/generated/config-amd64-4.14.166 index e237eae60..d921cd6f8 100644 --- a/images/kernel/generated/config-amd64-4.14.166 +++ b/images/kernel/generated/config-amd64-4.14.166 @@ -139,7 +139,8 @@ CONFIG_TREE_SRCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/images/kernel/generated/config-amd64-4.19.97 b/images/kernel/generated/config-amd64-4.19.97 index 33745797d..3a94e7bb4 100644 --- a/images/kernel/generated/config-amd64-4.19.97 +++ b/images/kernel/generated/config-amd64-4.19.97 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -111,7 +111,8 @@ CONFIG_TREE_SRCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/images/kernel/generated/config-amd64-5.4.13 b/images/kernel/generated/config-amd64-5.4.13 index 01b3c7966..4aef70c03 100644 --- a/images/kernel/generated/config-amd64-5.4.13 +++ b/images/kernel/generated/config-amd64-5.4.13 @@ -4,13 +4,14 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -122,7 +123,8 @@ CONFIG_RCU_NEED_SEGCBLIST=y # end of RCU Subsystem CONFIG_BUILD_BIN2C=y -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y # CONFIG_IKHEADERS is not set CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 @@ -1767,7 +1769,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m diff --git a/images/kernel/generated/config-arm64-4.14.166 b/images/kernel/generated/config-arm64-4.14.166 index 6fb2e3255..7ca05bcde 100644 --- a/images/kernel/generated/config-arm64-4.14.166 +++ b/images/kernel/generated/config-arm64-4.14.166 @@ -120,8 +120,9 @@ CONFIG_TREE_SRCU=y # CONFIG_TASKS_RCU is not set CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y -# CONFIG_BUILD_BIN2C is not set -# CONFIG_IKCONFIG is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 @@ -1544,7 +1545,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m diff --git a/images/kernel/generated/config-arm64-4.19.97 b/images/kernel/generated/config-arm64-4.19.97 index c31bc2dea..768c88db4 100644 --- a/images/kernel/generated/config-arm64-4.19.97 +++ b/images/kernel/generated/config-arm64-4.19.97 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -98,7 +98,9 @@ CONFIG_SRCU=y CONFIG_TREE_SRCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y -# CONFIG_IKCONFIG is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 @@ -1636,7 +1638,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m diff --git a/images/kernel/generated/config-arm64-5.4.13 b/images/kernel/generated/config-arm64-5.4.13 index 78cd7d23e..5c62f0adf 100644 --- a/images/kernel/generated/config-arm64-5.4.13 +++ b/images/kernel/generated/config-arm64-5.4.13 @@ -4,13 +4,14 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -109,7 +110,8 @@ CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y # end of RCU Subsystem -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y # CONFIG_IKHEADERS is not set CONFIG_LOG_BUF_SHIFT=21 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 @@ -1740,7 +1742,7 @@ CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m # CONFIG_TCM_PSCSI is not set -# CONFIG_TCM_USER2 is not set +CONFIG_TCM_USER2=m CONFIG_LOOPBACK_TARGET=m # CONFIG_TCM_FC is not set CONFIG_ISCSI_TARGET=m diff --git a/images/kernel/versioned/config-amd64-4.19.97 b/images/kernel/versioned/config-amd64-4.19.97 index fb947be3e..da0bc48ba 100644 --- a/images/kernel/versioned/config-amd64-4.19.97 +++ b/images/kernel/versioned/config-amd64-4.19.97 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y diff --git a/images/kernel/versioned/config-amd64-5.4.13 b/images/kernel/versioned/config-amd64-5.4.13 index 4e3d8045f..225bd6537 100644 --- a/images/kernel/versioned/config-amd64-5.4.13 +++ b/images/kernel/versioned/config-amd64-5.4.13 @@ -4,13 +4,14 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y diff --git a/images/kernel/versioned/config-arm64-4.19.97 b/images/kernel/versioned/config-arm64-4.19.97 index bd9a489e9..d6ac34e38 100644 --- a/images/kernel/versioned/config-arm64-4.19.97 +++ b/images/kernel/versioned/config-arm64-4.19.97 @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y diff --git a/images/kernel/versioned/config-arm64-5.4.13 b/images/kernel/versioned/config-arm64-5.4.13 index cf7f95619..838cca7e4 100644 --- a/images/kernel/versioned/config-arm64-5.4.13 +++ b/images/kernel/versioned/config-arm64-5.4.13 @@ -4,13 +4,14 @@ # # -# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 +# Compiler: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y