aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2016-09-26 13:13:04 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-09-27 02:54:41 -0400
commitfdcebf6f18ee87c6da69327c9972d57b8ce58166 (patch)
treea1ee183cc070f1989bb97ba319388c2eb57be1f3
parentf50af850f407df7b548802461bc248c7683c6dd3 (diff)
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: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat
-rw-r--r--arch/s390/configs/default_defconfig11
-rw-r--r--arch/s390/configs/gcov_defconfig13
-rw-r--r--arch/s390/configs/performance_defconfig13
3 files changed, 28 insertions, 9 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 26e0c7f08814..ced7e7ae627c 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -260,7 +260,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
260CONFIG_NF_TABLES_IPV4=m 260CONFIG_NF_TABLES_IPV4=m
261CONFIG_NFT_CHAIN_ROUTE_IPV4=m 261CONFIG_NFT_CHAIN_ROUTE_IPV4=m
262CONFIG_NF_TABLES_ARP=m 262CONFIG_NF_TABLES_ARP=m
263CONFIG_NF_NAT_IPV4=m
264CONFIG_NFT_CHAIN_NAT_IPV4=m 263CONFIG_NFT_CHAIN_NAT_IPV4=m
265CONFIG_IP_NF_IPTABLES=m 264CONFIG_IP_NF_IPTABLES=m
266CONFIG_IP_NF_MATCH_AH=m 265CONFIG_IP_NF_MATCH_AH=m
@@ -269,6 +268,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
269CONFIG_IP_NF_MATCH_TTL=m 268CONFIG_IP_NF_MATCH_TTL=m
270CONFIG_IP_NF_FILTER=m 269CONFIG_IP_NF_FILTER=m
271CONFIG_IP_NF_TARGET_REJECT=m 270CONFIG_IP_NF_TARGET_REJECT=m
271CONFIG_IP_NF_NAT=m
272CONFIG_IP_NF_TARGET_MASQUERADE=m
272CONFIG_IP_NF_MANGLE=m 273CONFIG_IP_NF_MANGLE=m
273CONFIG_IP_NF_TARGET_CLUSTERIP=m 274CONFIG_IP_NF_TARGET_CLUSTERIP=m
274CONFIG_IP_NF_TARGET_ECN=m 275CONFIG_IP_NF_TARGET_ECN=m
@@ -281,7 +282,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
281CONFIG_NF_CONNTRACK_IPV6=m 282CONFIG_NF_CONNTRACK_IPV6=m
282CONFIG_NF_TABLES_IPV6=m 283CONFIG_NF_TABLES_IPV6=m
283CONFIG_NFT_CHAIN_ROUTE_IPV6=m 284CONFIG_NFT_CHAIN_ROUTE_IPV6=m
284CONFIG_NF_NAT_IPV6=m
285CONFIG_NFT_CHAIN_NAT_IPV6=m 285CONFIG_NFT_CHAIN_NAT_IPV6=m
286CONFIG_IP6_NF_IPTABLES=m 286CONFIG_IP6_NF_IPTABLES=m
287CONFIG_IP6_NF_MATCH_AH=m 287CONFIG_IP6_NF_MATCH_AH=m
@@ -299,6 +299,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m
299CONFIG_IP6_NF_MANGLE=m 299CONFIG_IP6_NF_MANGLE=m
300CONFIG_IP6_NF_RAW=m 300CONFIG_IP6_NF_RAW=m
301CONFIG_IP6_NF_SECURITY=m 301CONFIG_IP6_NF_SECURITY=m
302CONFIG_IP6_NF_NAT=m
303CONFIG_IP6_NF_TARGET_MASQUERADE=m
302CONFIG_NF_TABLES_BRIDGE=m 304CONFIG_NF_TABLES_BRIDGE=m
303CONFIG_NET_SCTPPROBE=m 305CONFIG_NET_SCTPPROBE=m
304CONFIG_RDS=m 306CONFIG_RDS=m
@@ -359,6 +361,7 @@ CONFIG_NET_ACT_SIMP=m
359CONFIG_NET_ACT_SKBEDIT=m 361CONFIG_NET_ACT_SKBEDIT=m
360CONFIG_NET_ACT_CSUM=m 362CONFIG_NET_ACT_CSUM=m
361CONFIG_DNS_RESOLVER=y 363CONFIG_DNS_RESOLVER=y
364CONFIG_CGROUP_NET_PRIO=y
362CONFIG_BPF_JIT=y 365CONFIG_BPF_JIT=y
363CONFIG_NET_PKTGEN=m 366CONFIG_NET_PKTGEN=m
364CONFIG_NET_TCPPROBE=m 367CONFIG_NET_TCPPROBE=m
@@ -409,6 +412,7 @@ CONFIG_MD_FAULTY=m
409CONFIG_BLK_DEV_DM=m 412CONFIG_BLK_DEV_DM=m
410CONFIG_DM_CRYPT=m 413CONFIG_DM_CRYPT=m
411CONFIG_DM_SNAPSHOT=m 414CONFIG_DM_SNAPSHOT=m
415CONFIG_DM_THIN_PROVISIONING=m
412CONFIG_DM_MIRROR=m 416CONFIG_DM_MIRROR=m
413CONFIG_DM_LOG_USERSPACE=m 417CONFIG_DM_LOG_USERSPACE=m
414CONFIG_DM_RAID=m 418CONFIG_DM_RAID=m
@@ -428,6 +432,7 @@ CONFIG_EQUALIZER=m
428CONFIG_IFB=m 432CONFIG_IFB=m
429CONFIG_MACVLAN=m 433CONFIG_MACVLAN=m
430CONFIG_MACVTAP=m 434CONFIG_MACVTAP=m
435CONFIG_IPVLAN=m
431CONFIG_VXLAN=m 436CONFIG_VXLAN=m
432CONFIG_TUN=m 437CONFIG_TUN=m
433CONFIG_VETH=m 438CONFIG_VETH=m
@@ -453,7 +458,6 @@ CONFIG_PPP_SYNC_TTY=m
453# CONFIG_INPUT_KEYBOARD is not set 458# CONFIG_INPUT_KEYBOARD is not set
454# CONFIG_INPUT_MOUSE is not set 459# CONFIG_INPUT_MOUSE is not set
455# CONFIG_SERIO is not set 460# CONFIG_SERIO is not set
456CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
457CONFIG_LEGACY_PTY_COUNT=0 461CONFIG_LEGACY_PTY_COUNT=0
458CONFIG_HW_RANDOM_VIRTIO=m 462CONFIG_HW_RANDOM_VIRTIO=m
459CONFIG_RAW_DRIVER=m 463CONFIG_RAW_DRIVER=m
@@ -495,6 +499,7 @@ CONFIG_QFMT_V2=m
495CONFIG_AUTOFS4_FS=m 499CONFIG_AUTOFS4_FS=m
496CONFIG_FUSE_FS=y 500CONFIG_FUSE_FS=y
497CONFIG_CUSE=m 501CONFIG_CUSE=m
502CONFIG_OVERLAY_FS=m
498CONFIG_FSCACHE=m 503CONFIG_FSCACHE=m
499CONFIG_CACHEFILES=m 504CONFIG_CACHEFILES=m
500CONFIG_ISO9660_FS=y 505CONFIG_ISO9660_FS=y
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig
index 24879dab47bc..d72500603551 100644
--- a/arch/s390/configs/gcov_defconfig
+++ b/arch/s390/configs/gcov_defconfig
@@ -15,6 +15,8 @@ CONFIG_NUMA_BALANCING=y
15CONFIG_MEMCG=y 15CONFIG_MEMCG=y
16CONFIG_MEMCG_SWAP=y 16CONFIG_MEMCG_SWAP=y
17CONFIG_BLK_CGROUP=y 17CONFIG_BLK_CGROUP=y
18CONFIG_CFS_BANDWIDTH=y
19CONFIG_RT_GROUP_SCHED=y
18CONFIG_CGROUP_PIDS=y 20CONFIG_CGROUP_PIDS=y
19CONFIG_CGROUP_FREEZER=y 21CONFIG_CGROUP_FREEZER=y
20CONFIG_CGROUP_HUGETLB=y 22CONFIG_CGROUP_HUGETLB=y
@@ -255,7 +257,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
255CONFIG_NF_TABLES_IPV4=m 257CONFIG_NF_TABLES_IPV4=m
256CONFIG_NFT_CHAIN_ROUTE_IPV4=m 258CONFIG_NFT_CHAIN_ROUTE_IPV4=m
257CONFIG_NF_TABLES_ARP=m 259CONFIG_NF_TABLES_ARP=m
258CONFIG_NF_NAT_IPV4=m
259CONFIG_NFT_CHAIN_NAT_IPV4=m 260CONFIG_NFT_CHAIN_NAT_IPV4=m
260CONFIG_IP_NF_IPTABLES=m 261CONFIG_IP_NF_IPTABLES=m
261CONFIG_IP_NF_MATCH_AH=m 262CONFIG_IP_NF_MATCH_AH=m
@@ -264,6 +265,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
264CONFIG_IP_NF_MATCH_TTL=m 265CONFIG_IP_NF_MATCH_TTL=m
265CONFIG_IP_NF_FILTER=m 266CONFIG_IP_NF_FILTER=m
266CONFIG_IP_NF_TARGET_REJECT=m 267CONFIG_IP_NF_TARGET_REJECT=m
268CONFIG_IP_NF_NAT=m
269CONFIG_IP_NF_TARGET_MASQUERADE=m
267CONFIG_IP_NF_MANGLE=m 270CONFIG_IP_NF_MANGLE=m
268CONFIG_IP_NF_TARGET_CLUSTERIP=m 271CONFIG_IP_NF_TARGET_CLUSTERIP=m
269CONFIG_IP_NF_TARGET_ECN=m 272CONFIG_IP_NF_TARGET_ECN=m
@@ -276,7 +279,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
276CONFIG_NF_CONNTRACK_IPV6=m 279CONFIG_NF_CONNTRACK_IPV6=m
277CONFIG_NF_TABLES_IPV6=m 280CONFIG_NF_TABLES_IPV6=m
278CONFIG_NFT_CHAIN_ROUTE_IPV6=m 281CONFIG_NFT_CHAIN_ROUTE_IPV6=m
279CONFIG_NF_NAT_IPV6=m
280CONFIG_NFT_CHAIN_NAT_IPV6=m 282CONFIG_NFT_CHAIN_NAT_IPV6=m
281CONFIG_IP6_NF_IPTABLES=m 283CONFIG_IP6_NF_IPTABLES=m
282CONFIG_IP6_NF_MATCH_AH=m 284CONFIG_IP6_NF_MATCH_AH=m
@@ -294,6 +296,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m
294CONFIG_IP6_NF_MANGLE=m 296CONFIG_IP6_NF_MANGLE=m
295CONFIG_IP6_NF_RAW=m 297CONFIG_IP6_NF_RAW=m
296CONFIG_IP6_NF_SECURITY=m 298CONFIG_IP6_NF_SECURITY=m
299CONFIG_IP6_NF_NAT=m
300CONFIG_IP6_NF_TARGET_MASQUERADE=m
297CONFIG_NF_TABLES_BRIDGE=m 301CONFIG_NF_TABLES_BRIDGE=m
298CONFIG_NET_SCTPPROBE=m 302CONFIG_NET_SCTPPROBE=m
299CONFIG_RDS=m 303CONFIG_RDS=m
@@ -353,6 +357,7 @@ CONFIG_NET_ACT_SIMP=m
353CONFIG_NET_ACT_SKBEDIT=m 357CONFIG_NET_ACT_SKBEDIT=m
354CONFIG_NET_ACT_CSUM=m 358CONFIG_NET_ACT_CSUM=m
355CONFIG_DNS_RESOLVER=y 359CONFIG_DNS_RESOLVER=y
360CONFIG_CGROUP_NET_PRIO=y
356CONFIG_BPF_JIT=y 361CONFIG_BPF_JIT=y
357CONFIG_NET_PKTGEN=m 362CONFIG_NET_PKTGEN=m
358CONFIG_NET_TCPPROBE=m 363CONFIG_NET_TCPPROBE=m
@@ -403,6 +408,7 @@ CONFIG_MD_FAULTY=m
403CONFIG_BLK_DEV_DM=m 408CONFIG_BLK_DEV_DM=m
404CONFIG_DM_CRYPT=m 409CONFIG_DM_CRYPT=m
405CONFIG_DM_SNAPSHOT=m 410CONFIG_DM_SNAPSHOT=m
411CONFIG_DM_THIN_PROVISIONING=m
406CONFIG_DM_MIRROR=m 412CONFIG_DM_MIRROR=m
407CONFIG_DM_LOG_USERSPACE=m 413CONFIG_DM_LOG_USERSPACE=m
408CONFIG_DM_RAID=m 414CONFIG_DM_RAID=m
@@ -422,6 +428,7 @@ CONFIG_EQUALIZER=m
422CONFIG_IFB=m 428CONFIG_IFB=m
423CONFIG_MACVLAN=m 429CONFIG_MACVLAN=m
424CONFIG_MACVTAP=m 430CONFIG_MACVTAP=m
431CONFIG_IPVLAN=m
425CONFIG_VXLAN=m 432CONFIG_VXLAN=m
426CONFIG_TUN=m 433CONFIG_TUN=m
427CONFIG_VETH=m 434CONFIG_VETH=m
@@ -447,7 +454,6 @@ CONFIG_PPP_SYNC_TTY=m
447# CONFIG_INPUT_KEYBOARD is not set 454# CONFIG_INPUT_KEYBOARD is not set
448# CONFIG_INPUT_MOUSE is not set 455# CONFIG_INPUT_MOUSE is not set
449# CONFIG_SERIO is not set 456# CONFIG_SERIO is not set
450CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
451CONFIG_LEGACY_PTY_COUNT=0 457CONFIG_LEGACY_PTY_COUNT=0
452CONFIG_HW_RANDOM_VIRTIO=m 458CONFIG_HW_RANDOM_VIRTIO=m
453CONFIG_RAW_DRIVER=m 459CONFIG_RAW_DRIVER=m
@@ -487,6 +493,7 @@ CONFIG_QFMT_V2=m
487CONFIG_AUTOFS4_FS=m 493CONFIG_AUTOFS4_FS=m
488CONFIG_FUSE_FS=y 494CONFIG_FUSE_FS=y
489CONFIG_CUSE=m 495CONFIG_CUSE=m
496CONFIG_OVERLAY_FS=m
490CONFIG_FSCACHE=m 497CONFIG_FSCACHE=m
491CONFIG_CACHEFILES=m 498CONFIG_CACHEFILES=m
492CONFIG_ISO9660_FS=y 499CONFIG_ISO9660_FS=y
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig
index a5c1e5f2a0ca..bf99c386d5c3 100644
--- a/arch/s390/configs/performance_defconfig
+++ b/arch/s390/configs/performance_defconfig
@@ -16,6 +16,8 @@ CONFIG_NUMA_BALANCING=y
16CONFIG_MEMCG=y 16CONFIG_MEMCG=y
17CONFIG_MEMCG_SWAP=y 17CONFIG_MEMCG_SWAP=y
18CONFIG_BLK_CGROUP=y 18CONFIG_BLK_CGROUP=y
19CONFIG_CFS_BANDWIDTH=y
20CONFIG_RT_GROUP_SCHED=y
19CONFIG_CGROUP_PIDS=y 21CONFIG_CGROUP_PIDS=y
20CONFIG_CGROUP_FREEZER=y 22CONFIG_CGROUP_FREEZER=y
21CONFIG_CGROUP_HUGETLB=y 23CONFIG_CGROUP_HUGETLB=y
@@ -255,7 +257,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
255CONFIG_NF_TABLES_IPV4=m 257CONFIG_NF_TABLES_IPV4=m
256CONFIG_NFT_CHAIN_ROUTE_IPV4=m 258CONFIG_NFT_CHAIN_ROUTE_IPV4=m
257CONFIG_NF_TABLES_ARP=m 259CONFIG_NF_TABLES_ARP=m
258CONFIG_NF_NAT_IPV4=m
259CONFIG_NFT_CHAIN_NAT_IPV4=m 260CONFIG_NFT_CHAIN_NAT_IPV4=m
260CONFIG_IP_NF_IPTABLES=m 261CONFIG_IP_NF_IPTABLES=m
261CONFIG_IP_NF_MATCH_AH=m 262CONFIG_IP_NF_MATCH_AH=m
@@ -264,6 +265,8 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
264CONFIG_IP_NF_MATCH_TTL=m 265CONFIG_IP_NF_MATCH_TTL=m
265CONFIG_IP_NF_FILTER=m 266CONFIG_IP_NF_FILTER=m
266CONFIG_IP_NF_TARGET_REJECT=m 267CONFIG_IP_NF_TARGET_REJECT=m
268CONFIG_IP_NF_NAT=m
269CONFIG_IP_NF_TARGET_MASQUERADE=m
267CONFIG_IP_NF_MANGLE=m 270CONFIG_IP_NF_MANGLE=m
268CONFIG_IP_NF_TARGET_CLUSTERIP=m 271CONFIG_IP_NF_TARGET_CLUSTERIP=m
269CONFIG_IP_NF_TARGET_ECN=m 272CONFIG_IP_NF_TARGET_ECN=m
@@ -276,7 +279,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
276CONFIG_NF_CONNTRACK_IPV6=m 279CONFIG_NF_CONNTRACK_IPV6=m
277CONFIG_NF_TABLES_IPV6=m 280CONFIG_NF_TABLES_IPV6=m
278CONFIG_NFT_CHAIN_ROUTE_IPV6=m 281CONFIG_NFT_CHAIN_ROUTE_IPV6=m
279CONFIG_NF_NAT_IPV6=m
280CONFIG_NFT_CHAIN_NAT_IPV6=m 282CONFIG_NFT_CHAIN_NAT_IPV6=m
281CONFIG_IP6_NF_IPTABLES=m 283CONFIG_IP6_NF_IPTABLES=m
282CONFIG_IP6_NF_MATCH_AH=m 284CONFIG_IP6_NF_MATCH_AH=m
@@ -294,6 +296,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m
294CONFIG_IP6_NF_MANGLE=m 296CONFIG_IP6_NF_MANGLE=m
295CONFIG_IP6_NF_RAW=m 297CONFIG_IP6_NF_RAW=m
296CONFIG_IP6_NF_SECURITY=m 298CONFIG_IP6_NF_SECURITY=m
299CONFIG_IP6_NF_NAT=m
300CONFIG_IP6_NF_TARGET_MASQUERADE=m
297CONFIG_NF_TABLES_BRIDGE=m 301CONFIG_NF_TABLES_BRIDGE=m
298CONFIG_NET_SCTPPROBE=m 302CONFIG_NET_SCTPPROBE=m
299CONFIG_RDS=m 303CONFIG_RDS=m
@@ -353,6 +357,7 @@ CONFIG_NET_ACT_SIMP=m
353CONFIG_NET_ACT_SKBEDIT=m 357CONFIG_NET_ACT_SKBEDIT=m
354CONFIG_NET_ACT_CSUM=m 358CONFIG_NET_ACT_CSUM=m
355CONFIG_DNS_RESOLVER=y 359CONFIG_DNS_RESOLVER=y
360CONFIG_CGROUP_NET_PRIO=y
356CONFIG_BPF_JIT=y 361CONFIG_BPF_JIT=y
357CONFIG_NET_PKTGEN=m 362CONFIG_NET_PKTGEN=m
358CONFIG_NET_TCPPROBE=m 363CONFIG_NET_TCPPROBE=m
@@ -403,6 +408,7 @@ CONFIG_MD_FAULTY=m
403CONFIG_BLK_DEV_DM=m 408CONFIG_BLK_DEV_DM=m
404CONFIG_DM_CRYPT=m 409CONFIG_DM_CRYPT=m
405CONFIG_DM_SNAPSHOT=m 410CONFIG_DM_SNAPSHOT=m
411CONFIG_DM_THIN_PROVISIONING=m
406CONFIG_DM_MIRROR=m 412CONFIG_DM_MIRROR=m
407CONFIG_DM_LOG_USERSPACE=m 413CONFIG_DM_LOG_USERSPACE=m
408CONFIG_DM_RAID=m 414CONFIG_DM_RAID=m
@@ -422,6 +428,7 @@ CONFIG_EQUALIZER=m
422CONFIG_IFB=m 428CONFIG_IFB=m
423CONFIG_MACVLAN=m 429CONFIG_MACVLAN=m
424CONFIG_MACVTAP=m 430CONFIG_MACVTAP=m
431CONFIG_IPVLAN=m
425CONFIG_VXLAN=m 432CONFIG_VXLAN=m
426CONFIG_TUN=m 433CONFIG_TUN=m
427CONFIG_VETH=m 434CONFIG_VETH=m
@@ -447,7 +454,6 @@ CONFIG_PPP_SYNC_TTY=m
447# CONFIG_INPUT_KEYBOARD is not set 454# CONFIG_INPUT_KEYBOARD is not set
448# CONFIG_INPUT_MOUSE is not set 455# CONFIG_INPUT_MOUSE is not set
449# CONFIG_SERIO is not set 456# CONFIG_SERIO is not set
450CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
451CONFIG_LEGACY_PTY_COUNT=0 457CONFIG_LEGACY_PTY_COUNT=0
452CONFIG_HW_RANDOM_VIRTIO=m 458CONFIG_HW_RANDOM_VIRTIO=m
453CONFIG_RAW_DRIVER=m 459CONFIG_RAW_DRIVER=m
@@ -488,6 +494,7 @@ CONFIG_QFMT_V2=m
488CONFIG_AUTOFS4_FS=m 494CONFIG_AUTOFS4_FS=m
489CONFIG_FUSE_FS=y 495CONFIG_FUSE_FS=y
490CONFIG_CUSE=m 496CONFIG_CUSE=m
497CONFIG_OVERLAY_FS=m
491CONFIG_FSCACHE=m 498CONFIG_FSCACHE=m
492CONFIG_CACHEFILES=m 499CONFIG_CACHEFILES=m
493CONFIG_ISO9660_FS=y 500CONFIG_ISO9660_FS=y
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-11 07:02:19 -0400