Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdcebf6f authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

s390/config: Enable config options for Docker 



The following config options are required/recommended for running Docker:

 Networking:

 - CONFIG_NF_NAT_MASQUERADE_IPV4=m
 - CONFIG_NF_NAT_MASQUERADE_IPV6=m
 - CONFIG_IPVLAN=m
 - CGROUP_NET_PRIO=y

 Storage drivers:

 - CONFIG_DM_THIN_PROVISIONING=m
 - CONFIG_OVERLAY_FS=m

 Scheduling:

 - CONFIG_FAIR_GROUP_SCHED=y
 - CONFIG_CFS_BANDWIDTH=y

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f50af850

arch/s390/configs/default_defconfig

+8 −3
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ CONFIG_NF_CONNTRACK_IPV4=m 
CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_NAT_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m
@@ -269,6 +268,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m 
CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m
@@ -281,7 +282,6 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_TABLES_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NF_NAT_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m
@@ -299,6 +299,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m 
CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NET_SCTPPROBE=m

CONFIG_RDS=m
@@ -359,6 +361,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m
@@ -409,6 +412,7 @@ CONFIG_MD_FAULTY=m 
CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m
@@ -428,6 +432,7 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -453,7 +458,6 @@ CONFIG_PPP_SYNC_TTY=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_LEGACY_PTY_COUNT=0

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_RAW_DRIVER=m
@@ -495,6 +499,7 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_OVERLAY_FS=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=y

arch/s390/configs/gcov_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_HUGETLB=y
@@ -255,7 +257,6 @@ CONFIG_NF_CONNTRACK_IPV4=m 
CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_NAT_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m
@@ -264,6 +265,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m 
CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m
@@ -276,7 +279,6 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_TABLES_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NF_NAT_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m
@@ -294,6 +296,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m 
CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NET_SCTPPROBE=m

CONFIG_RDS=m
@@ -353,6 +357,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m
@@ -403,6 +408,7 @@ CONFIG_MD_FAULTY=m 
CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m
@@ -422,6 +428,7 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -447,7 +454,6 @@ CONFIG_PPP_SYNC_TTY=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_LEGACY_PTY_COUNT=0

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_RAW_DRIVER=m
@@ -487,6 +493,7 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_OVERLAY_FS=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=y

arch/s390/configs/performance_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_HUGETLB=y
@@ -255,7 +257,6 @@ CONFIG_NF_CONNTRACK_IPV4=m 
CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_NAT_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m
@@ -264,6 +265,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m 
CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m
@@ -276,7 +279,6 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_TABLES_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NF_NAT_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m
@@ -294,6 +296,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m 
CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_SECURITY=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NET_SCTPPROBE=m

CONFIG_RDS=m
@@ -353,6 +357,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m
@@ -403,6 +408,7 @@ CONFIG_MD_FAULTY=m 
CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m
@@ -422,6 +428,7 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -447,7 +454,6 @@ CONFIG_PPP_SYNC_TTY=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

CONFIG_LEGACY_PTY_COUNT=0

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_RAW_DRIVER=m
@@ -488,6 +494,7 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_OVERLAY_FS=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=y