246 lines
7.0 KiB
Diff
246 lines
7.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Fang <peter.fang@intel.com>
|
|
Date: Wed, 22 Apr 2020 16:31:30 -0700
|
|
Subject: [PATCH] config: add SOS kernel config required by OpenStack
|
|
|
|
Add kernel config required to bring up OpenStack in SOS.
|
|
|
|
This config also enables LXC in Ubuntu 16.04/18.04.
|
|
|
|
Tracked-On: projectacrn/acrn-hypervisor#4699
|
|
Signed-off-by: Peter Fang <peter.fang@intel.com>
|
|
---
|
|
kernel_config_sos | 41 +++++++++++++++++++++++++++++++----------
|
|
kernel_config_uefi_sos | 41 +++++++++++++++++++++++++++++++----------
|
|
2 files changed, 62 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/kernel_config_sos b/kernel_config_sos
|
|
index c46c0c1db190..9d2c857650b9 100644
|
|
--- a/kernel_config_sos
|
|
+++ b/kernel_config_sos
|
|
@@ -153,7 +153,7 @@ CONFIG_IPC_NS=y
|
|
CONFIG_USER_NS=y
|
|
CONFIG_PID_NS=y
|
|
CONFIG_NET_NS=y
|
|
-# CONFIG_CHECKPOINT_RESTORE is not set
|
|
+CONFIG_CHECKPOINT_RESTORE=y
|
|
CONFIG_SCHED_AUTOGROUP=y
|
|
# CONFIG_SYSFS_DEPRECATED is not set
|
|
CONFIG_RELAY=y
|
|
@@ -782,7 +782,7 @@ CONFIG_MODULES_TREE_LOOKUP=y
|
|
CONFIG_BLOCK=y
|
|
CONFIG_BLK_SCSI_REQUEST=y
|
|
CONFIG_BLK_DEV_BSG=y
|
|
-# CONFIG_BLK_DEV_BSGLIB is not set
|
|
+CONFIG_BLK_DEV_BSGLIB=y
|
|
# CONFIG_BLK_DEV_INTEGRITY is not set
|
|
# CONFIG_BLK_DEV_ZONED is not set
|
|
CONFIG_BLK_DEV_THROTTLING=y
|
|
@@ -897,6 +897,7 @@ CONFIG_CMA=y
|
|
# CONFIG_CMA_DEBUG is not set
|
|
# CONFIG_CMA_DEBUGFS is not set
|
|
CONFIG_CMA_AREAS=7
|
|
+# CONFIG_MEM_SOFT_DIRTY is not set
|
|
# CONFIG_ZPOOL is not set
|
|
# CONFIG_ZBUD is not set
|
|
CONFIG_ZSMALLOC=y
|
|
@@ -920,9 +921,9 @@ CONFIG_NET_INGRESS=y
|
|
# Networking options
|
|
#
|
|
CONFIG_PACKET=y
|
|
-# CONFIG_PACKET_DIAG is not set
|
|
+CONFIG_PACKET_DIAG=y
|
|
CONFIG_UNIX=y
|
|
-# CONFIG_UNIX_DIAG is not set
|
|
+CONFIG_UNIX_DIAG=y
|
|
# CONFIG_TLS is not set
|
|
CONFIG_XFRM=y
|
|
CONFIG_XFRM_ALGO=y
|
|
@@ -1082,7 +1083,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y
|
|
# Xtables targets
|
|
#
|
|
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
|
|
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
|
|
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
|
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
|
|
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
|
|
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
|
|
@@ -1275,7 +1276,27 @@ CONFIG_IP6_NF_NAT=y
|
|
CONFIG_IP6_NF_TARGET_MASQUERADE=y
|
|
# CONFIG_IP6_NF_TARGET_NPT is not set
|
|
CONFIG_NF_DEFRAG_IPV6=y
|
|
-# CONFIG_BRIDGE_NF_EBTABLES is not set
|
|
+CONFIG_BRIDGE_NF_EBTABLES=y
|
|
+CONFIG_BRIDGE_EBT_BROUTE=m
|
|
+CONFIG_BRIDGE_EBT_T_FILTER=m
|
|
+CONFIG_BRIDGE_EBT_T_NAT=m
|
|
+CONFIG_BRIDGE_EBT_802_3=m
|
|
+CONFIG_BRIDGE_EBT_AMONG=m
|
|
+CONFIG_BRIDGE_EBT_ARP=m
|
|
+CONFIG_BRIDGE_EBT_IP=m
|
|
+CONFIG_BRIDGE_EBT_IP6=m
|
|
+CONFIG_BRIDGE_EBT_LIMIT=m
|
|
+CONFIG_BRIDGE_EBT_MARK=m
|
|
+CONFIG_BRIDGE_EBT_PKTTYPE=m
|
|
+CONFIG_BRIDGE_EBT_STP=m
|
|
+CONFIG_BRIDGE_EBT_VLAN=m
|
|
+CONFIG_BRIDGE_EBT_ARPREPLY=m
|
|
+CONFIG_BRIDGE_EBT_DNAT=m
|
|
+CONFIG_BRIDGE_EBT_MARK_T=m
|
|
+CONFIG_BRIDGE_EBT_REDIRECT=m
|
|
+CONFIG_BRIDGE_EBT_SNAT=m
|
|
+CONFIG_BRIDGE_EBT_LOG=m
|
|
+CONFIG_BRIDGE_EBT_NFLOG=m
|
|
# CONFIG_BPFILTER is not set
|
|
# CONFIG_IP_DCCP is not set
|
|
# CONFIG_IP_SCTP is not set
|
|
@@ -1390,7 +1411,7 @@ CONFIG_DNS_RESOLVER=y
|
|
# CONFIG_BATMAN_ADV is not set
|
|
CONFIG_OPENVSWITCH=m
|
|
# CONFIG_VSOCKETS is not set
|
|
-# CONFIG_NETLINK_DIAG is not set
|
|
+CONFIG_NETLINK_DIAG=y
|
|
CONFIG_MPLS=y
|
|
CONFIG_NET_MPLS_GSO=m
|
|
# CONFIG_MPLS_ROUTING is not set
|
|
@@ -1773,12 +1794,12 @@ CONFIG_SCSI_CONSTANTS=y
|
|
#
|
|
CONFIG_SCSI_SPI_ATTRS=y
|
|
# CONFIG_SCSI_FC_ATTRS is not set
|
|
-# CONFIG_SCSI_ISCSI_ATTRS is not set
|
|
+CONFIG_SCSI_ISCSI_ATTRS=m
|
|
# CONFIG_SCSI_SAS_ATTRS is not set
|
|
# CONFIG_SCSI_SAS_LIBSAS is not set
|
|
# CONFIG_SCSI_SRP_ATTRS is not set
|
|
CONFIG_SCSI_LOWLEVEL=y
|
|
-# CONFIG_ISCSI_TCP is not set
|
|
+CONFIG_ISCSI_TCP=m
|
|
# CONFIG_ISCSI_BOOT_SYSFS is not set
|
|
# CONFIG_SCSI_CXGB3_ISCSI is not set
|
|
# CONFIG_SCSI_CXGB4_ISCSI is not set
|
|
@@ -5722,7 +5743,7 @@ CONFIG_PROC_FS=y
|
|
CONFIG_PROC_KCORE=y
|
|
CONFIG_PROC_SYSCTL=y
|
|
CONFIG_PROC_PAGE_MONITOR=y
|
|
-# CONFIG_PROC_CHILDREN is not set
|
|
+CONFIG_PROC_CHILDREN=y
|
|
CONFIG_KERNFS=y
|
|
CONFIG_SYSFS=y
|
|
CONFIG_TMPFS=y
|
|
diff --git a/kernel_config_uefi_sos b/kernel_config_uefi_sos
|
|
index fb3f70f1c56e..a3ac9be9ab69 100644
|
|
--- a/kernel_config_uefi_sos
|
|
+++ b/kernel_config_uefi_sos
|
|
@@ -153,7 +153,7 @@ CONFIG_IPC_NS=y
|
|
CONFIG_USER_NS=y
|
|
CONFIG_PID_NS=y
|
|
CONFIG_NET_NS=y
|
|
-# CONFIG_CHECKPOINT_RESTORE is not set
|
|
+CONFIG_CHECKPOINT_RESTORE=y
|
|
CONFIG_SCHED_AUTOGROUP=y
|
|
# CONFIG_SYSFS_DEPRECATED is not set
|
|
CONFIG_RELAY=y
|
|
@@ -782,7 +782,7 @@ CONFIG_MODULES_TREE_LOOKUP=y
|
|
CONFIG_BLOCK=y
|
|
CONFIG_BLK_SCSI_REQUEST=y
|
|
CONFIG_BLK_DEV_BSG=y
|
|
-# CONFIG_BLK_DEV_BSGLIB is not set
|
|
+CONFIG_BLK_DEV_BSGLIB=y
|
|
# CONFIG_BLK_DEV_INTEGRITY is not set
|
|
# CONFIG_BLK_DEV_ZONED is not set
|
|
CONFIG_BLK_DEV_THROTTLING=y
|
|
@@ -897,6 +897,7 @@ CONFIG_CMA=y
|
|
# CONFIG_CMA_DEBUG is not set
|
|
# CONFIG_CMA_DEBUGFS is not set
|
|
CONFIG_CMA_AREAS=7
|
|
+# CONFIG_MEM_SOFT_DIRTY is not set
|
|
# CONFIG_ZPOOL is not set
|
|
# CONFIG_ZBUD is not set
|
|
CONFIG_ZSMALLOC=y
|
|
@@ -920,9 +921,9 @@ CONFIG_NET_INGRESS=y
|
|
# Networking options
|
|
#
|
|
CONFIG_PACKET=y
|
|
-# CONFIG_PACKET_DIAG is not set
|
|
+CONFIG_PACKET_DIAG=y
|
|
CONFIG_UNIX=y
|
|
-# CONFIG_UNIX_DIAG is not set
|
|
+CONFIG_UNIX_DIAG=y
|
|
# CONFIG_TLS is not set
|
|
CONFIG_XFRM=y
|
|
CONFIG_XFRM_ALGO=y
|
|
@@ -1082,7 +1083,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y
|
|
# Xtables targets
|
|
#
|
|
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
|
|
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
|
|
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
|
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
|
|
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
|
|
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
|
|
@@ -1275,7 +1276,27 @@ CONFIG_IP6_NF_NAT=y
|
|
CONFIG_IP6_NF_TARGET_MASQUERADE=y
|
|
# CONFIG_IP6_NF_TARGET_NPT is not set
|
|
CONFIG_NF_DEFRAG_IPV6=y
|
|
-# CONFIG_BRIDGE_NF_EBTABLES is not set
|
|
+CONFIG_BRIDGE_NF_EBTABLES=y
|
|
+CONFIG_BRIDGE_EBT_BROUTE=m
|
|
+CONFIG_BRIDGE_EBT_T_FILTER=m
|
|
+CONFIG_BRIDGE_EBT_T_NAT=m
|
|
+CONFIG_BRIDGE_EBT_802_3=m
|
|
+CONFIG_BRIDGE_EBT_AMONG=m
|
|
+CONFIG_BRIDGE_EBT_ARP=m
|
|
+CONFIG_BRIDGE_EBT_IP=m
|
|
+CONFIG_BRIDGE_EBT_IP6=m
|
|
+CONFIG_BRIDGE_EBT_LIMIT=m
|
|
+CONFIG_BRIDGE_EBT_MARK=m
|
|
+CONFIG_BRIDGE_EBT_PKTTYPE=m
|
|
+CONFIG_BRIDGE_EBT_STP=m
|
|
+CONFIG_BRIDGE_EBT_VLAN=m
|
|
+CONFIG_BRIDGE_EBT_ARPREPLY=m
|
|
+CONFIG_BRIDGE_EBT_DNAT=m
|
|
+CONFIG_BRIDGE_EBT_MARK_T=m
|
|
+CONFIG_BRIDGE_EBT_REDIRECT=m
|
|
+CONFIG_BRIDGE_EBT_SNAT=m
|
|
+CONFIG_BRIDGE_EBT_LOG=m
|
|
+CONFIG_BRIDGE_EBT_NFLOG=m
|
|
# CONFIG_BPFILTER is not set
|
|
# CONFIG_IP_DCCP is not set
|
|
# CONFIG_IP_SCTP is not set
|
|
@@ -1390,7 +1411,7 @@ CONFIG_DNS_RESOLVER=y
|
|
# CONFIG_BATMAN_ADV is not set
|
|
CONFIG_OPENVSWITCH=m
|
|
# CONFIG_VSOCKETS is not set
|
|
-# CONFIG_NETLINK_DIAG is not set
|
|
+CONFIG_NETLINK_DIAG=y
|
|
CONFIG_MPLS=y
|
|
CONFIG_NET_MPLS_GSO=m
|
|
# CONFIG_MPLS_ROUTING is not set
|
|
@@ -1772,12 +1793,12 @@ CONFIG_SCSI_CONSTANTS=y
|
|
#
|
|
CONFIG_SCSI_SPI_ATTRS=y
|
|
# CONFIG_SCSI_FC_ATTRS is not set
|
|
-# CONFIG_SCSI_ISCSI_ATTRS is not set
|
|
+CONFIG_SCSI_ISCSI_ATTRS=m
|
|
# CONFIG_SCSI_SAS_ATTRS is not set
|
|
# CONFIG_SCSI_SAS_LIBSAS is not set
|
|
# CONFIG_SCSI_SRP_ATTRS is not set
|
|
CONFIG_SCSI_LOWLEVEL=y
|
|
-# CONFIG_ISCSI_TCP is not set
|
|
+CONFIG_ISCSI_TCP=m
|
|
# CONFIG_ISCSI_BOOT_SYSFS is not set
|
|
# CONFIG_SCSI_CXGB3_ISCSI is not set
|
|
# CONFIG_SCSI_CXGB4_ISCSI is not set
|
|
@@ -5727,7 +5748,7 @@ CONFIG_PROC_FS=y
|
|
CONFIG_PROC_KCORE=y
|
|
CONFIG_PROC_SYSCTL=y
|
|
CONFIG_PROC_PAGE_MONITOR=y
|
|
-# CONFIG_PROC_CHILDREN is not set
|
|
+CONFIG_PROC_CHILDREN=y
|
|
CONFIG_KERNFS=y
|
|
CONFIG_SYSFS=y
|
|
CONFIG_TMPFS=y
|
|
--
|
|
https://clearlinux.org
|
|
|