tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Michael Holzheu and committed by
Martin Schwidefsky fdcebf6f f50af850

+28 -9
+8 -3
arch/s390/configs/default_defconfig
··· 260 260 CONFIG_NF_TABLES_IPV4=m 261 261 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 262 262 CONFIG_NF_TABLES_ARP=m 263 - CONFIG_NF_NAT_IPV4=m 264 263 CONFIG_NFT_CHAIN_NAT_IPV4=m 265 264 CONFIG_IP_NF_IPTABLES=m 266 265 CONFIG_IP_NF_MATCH_AH=m ··· 268 269 CONFIG_IP_NF_MATCH_TTL=m 269 270 CONFIG_IP_NF_FILTER=m 270 271 CONFIG_IP_NF_TARGET_REJECT=m 272 + CONFIG_IP_NF_NAT=m 273 + CONFIG_IP_NF_TARGET_MASQUERADE=m 271 274 CONFIG_IP_NF_MANGLE=m 272 275 CONFIG_IP_NF_TARGET_CLUSTERIP=m 273 276 CONFIG_IP_NF_TARGET_ECN=m ··· 282 281 CONFIG_NF_CONNTRACK_IPV6=m 283 282 CONFIG_NF_TABLES_IPV6=m 284 283 CONFIG_NFT_CHAIN_ROUTE_IPV6=m 285 - CONFIG_NF_NAT_IPV6=m 286 284 CONFIG_NFT_CHAIN_NAT_IPV6=m 287 285 CONFIG_IP6_NF_IPTABLES=m 288 286 CONFIG_IP6_NF_MATCH_AH=m ··· 299 299 CONFIG_IP6_NF_MANGLE=m 300 300 CONFIG_IP6_NF_RAW=m 301 301 CONFIG_IP6_NF_SECURITY=m 302 + CONFIG_IP6_NF_NAT=m 303 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 302 304 CONFIG_NF_TABLES_BRIDGE=m 303 305 CONFIG_NET_SCTPPROBE=m 304 306 CONFIG_RDS=m ··· 361 359 CONFIG_NET_ACT_SKBEDIT=m 362 360 CONFIG_NET_ACT_CSUM=m 363 361 CONFIG_DNS_RESOLVER=y 362 + CONFIG_CGROUP_NET_PRIO=y 364 363 CONFIG_BPF_JIT=y 365 364 CONFIG_NET_PKTGEN=m 366 365 CONFIG_NET_TCPPROBE=m ··· 412 409 CONFIG_BLK_DEV_DM=m 413 410 CONFIG_DM_CRYPT=m 414 411 CONFIG_DM_SNAPSHOT=m 412 + CONFIG_DM_THIN_PROVISIONING=m 415 413 CONFIG_DM_MIRROR=m 416 414 CONFIG_DM_LOG_USERSPACE=m 417 415 CONFIG_DM_RAID=m ··· 432 428 CONFIG_IFB=m 433 429 CONFIG_MACVLAN=m 434 430 CONFIG_MACVTAP=m 431 + CONFIG_IPVLAN=m 435 432 CONFIG_VXLAN=m 436 433 CONFIG_TUN=m 437 434 CONFIG_VETH=m ··· 458 453 # CONFIG_INPUT_KEYBOARD is not set 459 454 # CONFIG_INPUT_MOUSE is not set 460 455 # CONFIG_SERIO is not set 461 - CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 462 456 CONFIG_LEGACY_PTY_COUNT=0 463 457 CONFIG_HW_RANDOM_VIRTIO=m 464 458 CONFIG_RAW_DRIVER=m ··· 499 495 CONFIG_AUTOFS4_FS=m 500 496 CONFIG_FUSE_FS=y 501 497 CONFIG_CUSE=m 498 + CONFIG_OVERLAY_FS=m 502 499 CONFIG_FSCACHE=m 503 500 CONFIG_CACHEFILES=m 504 501 CONFIG_ISO9660_FS=y
+10 -3
arch/s390/configs/gcov_defconfig
··· 15 15 CONFIG_MEMCG=y 16 16 CONFIG_MEMCG_SWAP=y 17 17 CONFIG_BLK_CGROUP=y 18 + CONFIG_CFS_BANDWIDTH=y 19 + CONFIG_RT_GROUP_SCHED=y 18 20 CONFIG_CGROUP_PIDS=y 19 21 CONFIG_CGROUP_FREEZER=y 20 22 CONFIG_CGROUP_HUGETLB=y ··· 257 255 CONFIG_NF_TABLES_IPV4=m 258 256 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 259 257 CONFIG_NF_TABLES_ARP=m 260 - CONFIG_NF_NAT_IPV4=m 261 258 CONFIG_NFT_CHAIN_NAT_IPV4=m 262 259 CONFIG_IP_NF_IPTABLES=m 263 260 CONFIG_IP_NF_MATCH_AH=m ··· 265 264 CONFIG_IP_NF_MATCH_TTL=m 266 265 CONFIG_IP_NF_FILTER=m 267 266 CONFIG_IP_NF_TARGET_REJECT=m 267 + CONFIG_IP_NF_NAT=m 268 + CONFIG_IP_NF_TARGET_MASQUERADE=m 268 269 CONFIG_IP_NF_MANGLE=m 269 270 CONFIG_IP_NF_TARGET_CLUSTERIP=m 270 271 CONFIG_IP_NF_TARGET_ECN=m ··· 279 276 CONFIG_NF_CONNTRACK_IPV6=m 280 277 CONFIG_NF_TABLES_IPV6=m 281 278 CONFIG_NFT_CHAIN_ROUTE_IPV6=m 282 - CONFIG_NF_NAT_IPV6=m 283 279 CONFIG_NFT_CHAIN_NAT_IPV6=m 284 280 CONFIG_IP6_NF_IPTABLES=m 285 281 CONFIG_IP6_NF_MATCH_AH=m ··· 296 294 CONFIG_IP6_NF_MANGLE=m 297 295 CONFIG_IP6_NF_RAW=m 298 296 CONFIG_IP6_NF_SECURITY=m 297 + CONFIG_IP6_NF_NAT=m 298 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 299 299 CONFIG_NF_TABLES_BRIDGE=m 300 300 CONFIG_NET_SCTPPROBE=m 301 301 CONFIG_RDS=m ··· 357 353 CONFIG_NET_ACT_SKBEDIT=m 358 354 CONFIG_NET_ACT_CSUM=m 359 355 CONFIG_DNS_RESOLVER=y 356 + CONFIG_CGROUP_NET_PRIO=y 360 357 CONFIG_BPF_JIT=y 361 358 CONFIG_NET_PKTGEN=m 362 359 CONFIG_NET_TCPPROBE=m ··· 408 403 CONFIG_BLK_DEV_DM=m 409 404 CONFIG_DM_CRYPT=m 410 405 CONFIG_DM_SNAPSHOT=m 406 + CONFIG_DM_THIN_PROVISIONING=m 411 407 CONFIG_DM_MIRROR=m 412 408 CONFIG_DM_LOG_USERSPACE=m 413 409 CONFIG_DM_RAID=m ··· 428 422 CONFIG_IFB=m 429 423 CONFIG_MACVLAN=m 430 424 CONFIG_MACVTAP=m 425 + CONFIG_IPVLAN=m 431 426 CONFIG_VXLAN=m 432 427 CONFIG_TUN=m 433 428 CONFIG_VETH=m ··· 454 447 # CONFIG_INPUT_KEYBOARD is not set 455 448 # CONFIG_INPUT_MOUSE is not set 456 449 # CONFIG_SERIO is not set 457 - CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 458 450 CONFIG_LEGACY_PTY_COUNT=0 459 451 CONFIG_HW_RANDOM_VIRTIO=m 460 452 CONFIG_RAW_DRIVER=m ··· 493 487 CONFIG_AUTOFS4_FS=m 494 488 CONFIG_FUSE_FS=y 495 489 CONFIG_CUSE=m 490 + CONFIG_OVERLAY_FS=m 496 491 CONFIG_FSCACHE=m 497 492 CONFIG_CACHEFILES=m 498 493 CONFIG_ISO9660_FS=y
+10 -3
arch/s390/configs/performance_defconfig
··· 16 16 CONFIG_MEMCG=y 17 17 CONFIG_MEMCG_SWAP=y 18 18 CONFIG_BLK_CGROUP=y 19 + CONFIG_CFS_BANDWIDTH=y 20 + CONFIG_RT_GROUP_SCHED=y 19 21 CONFIG_CGROUP_PIDS=y 20 22 CONFIG_CGROUP_FREEZER=y 21 23 CONFIG_CGROUP_HUGETLB=y ··· 257 255 CONFIG_NF_TABLES_IPV4=m 258 256 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 259 257 CONFIG_NF_TABLES_ARP=m 260 - CONFIG_NF_NAT_IPV4=m 261 258 CONFIG_NFT_CHAIN_NAT_IPV4=m 262 259 CONFIG_IP_NF_IPTABLES=m 263 260 CONFIG_IP_NF_MATCH_AH=m ··· 265 264 CONFIG_IP_NF_MATCH_TTL=m 266 265 CONFIG_IP_NF_FILTER=m 267 266 CONFIG_IP_NF_TARGET_REJECT=m 267 + CONFIG_IP_NF_NAT=m 268 + CONFIG_IP_NF_TARGET_MASQUERADE=m 268 269 CONFIG_IP_NF_MANGLE=m 269 270 CONFIG_IP_NF_TARGET_CLUSTERIP=m 270 271 CONFIG_IP_NF_TARGET_ECN=m ··· 279 276 CONFIG_NF_CONNTRACK_IPV6=m 280 277 CONFIG_NF_TABLES_IPV6=m 281 278 CONFIG_NFT_CHAIN_ROUTE_IPV6=m 282 - CONFIG_NF_NAT_IPV6=m 283 279 CONFIG_NFT_CHAIN_NAT_IPV6=m 284 280 CONFIG_IP6_NF_IPTABLES=m 285 281 CONFIG_IP6_NF_MATCH_AH=m ··· 296 294 CONFIG_IP6_NF_MANGLE=m 297 295 CONFIG_IP6_NF_RAW=m 298 296 CONFIG_IP6_NF_SECURITY=m 297 + CONFIG_IP6_NF_NAT=m 298 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 299 299 CONFIG_NF_TABLES_BRIDGE=m 300 300 CONFIG_NET_SCTPPROBE=m 301 301 CONFIG_RDS=m ··· 357 353 CONFIG_NET_ACT_SKBEDIT=m 358 354 CONFIG_NET_ACT_CSUM=m 359 355 CONFIG_DNS_RESOLVER=y 356 + CONFIG_CGROUP_NET_PRIO=y 360 357 CONFIG_BPF_JIT=y 361 358 CONFIG_NET_PKTGEN=m 362 359 CONFIG_NET_TCPPROBE=m ··· 408 403 CONFIG_BLK_DEV_DM=m 409 404 CONFIG_DM_CRYPT=m 410 405 CONFIG_DM_SNAPSHOT=m 406 + CONFIG_DM_THIN_PROVISIONING=m 411 407 CONFIG_DM_MIRROR=m 412 408 CONFIG_DM_LOG_USERSPACE=m 413 409 CONFIG_DM_RAID=m ··· 428 422 CONFIG_IFB=m 429 423 CONFIG_MACVLAN=m 430 424 CONFIG_MACVTAP=m 425 + CONFIG_IPVLAN=m 431 426 CONFIG_VXLAN=m 432 427 CONFIG_TUN=m 433 428 CONFIG_VETH=m ··· 454 447 # CONFIG_INPUT_KEYBOARD is not set 455 448 # CONFIG_INPUT_MOUSE is not set 456 449 # CONFIG_SERIO is not set 457 - CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 458 450 CONFIG_LEGACY_PTY_COUNT=0 459 451 CONFIG_HW_RANDOM_VIRTIO=m 460 452 CONFIG_RAW_DRIVER=m ··· 494 488 CONFIG_AUTOFS4_FS=m 495 489 CONFIG_FUSE_FS=y 496 490 CONFIG_CUSE=m 491 + CONFIG_OVERLAY_FS=m 497 492 CONFIG_FSCACHE=m 498 493 CONFIG_CACHEFILES=m 499 494 CONFIG_ISO9660_FS=y