Skip to content

Commit ba6cfef

Browse files
xypronpalmer-dabbelt
authored andcommitted
riscv: enable Docker requirements in defconfig
The defconfig kernel should be able to run Docker. Enable the missing settings according to [1]. make savedefconfig eliminates CONFIG_STACKTRACE which is enabled by default. Many of the settings are also needed to run a defconfig kernel on default distro installations or to run snaps. [1] https://github.com/moby/moby/blob/master/contrib/check-config.sh Signed-off-by: Heinrich Schuchardt <[email protected]> Reviewed-by: Anup Patel <[email protected]> Acked-by: Guo Ren <[email protected]> Link: https://lore.kernel.org/r/[email protected] [Palmer: Drop BLK_CGROUP, as it's causing panics with KASAN] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent f436171 commit ba6cfef

File tree

1 file changed

+63
-1
lines changed

1 file changed

+63
-1
lines changed

arch/riscv/configs/defconfig

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,17 @@ CONFIG_BPF_SYSCALL=y
66
CONFIG_IKCONFIG=y
77
CONFIG_IKCONFIG_PROC=y
88
CONFIG_CGROUPS=y
9+
CONFIG_MEMCG=y
910
CONFIG_CGROUP_SCHED=y
1011
CONFIG_CFS_BANDWIDTH=y
12+
CONFIG_RT_GROUP_SCHED=y
13+
CONFIG_CGROUP_PIDS=y
14+
CONFIG_CGROUP_FREEZER=y
15+
CONFIG_CGROUP_HUGETLB=y
16+
CONFIG_CPUSETS=y
17+
CONFIG_CGROUP_DEVICE=y
18+
CONFIG_CGROUP_CPUACCT=y
19+
CONFIG_CGROUP_PERF=y
1120
CONFIG_CGROUP_BPF=y
1221
CONFIG_NAMESPACES=y
1322
CONFIG_USER_NS=y
@@ -29,17 +38,55 @@ CONFIG_KVM=m
2938
CONFIG_JUMP_LABEL=y
3039
CONFIG_MODULES=y
3140
CONFIG_MODULE_UNLOAD=y
41+
CONFIG_BLK_DEV_THROTTLING=y
3242
CONFIG_NET=y
3343
CONFIG_PACKET=y
3444
CONFIG_UNIX=y
45+
CONFIG_XFRM_USER=m
3546
CONFIG_INET=y
3647
CONFIG_IP_MULTICAST=y
3748
CONFIG_IP_ADVANCED_ROUTER=y
3849
CONFIG_IP_PNP=y
3950
CONFIG_IP_PNP_DHCP=y
4051
CONFIG_IP_PNP_BOOTP=y
4152
CONFIG_IP_PNP_RARP=y
53+
CONFIG_INET_ESP=m
54+
CONFIG_NETFILTER=y
55+
CONFIG_BRIDGE_NETFILTER=m
56+
CONFIG_NF_CONNTRACK=m
57+
CONFIG_NF_CONNTRACK_FTP=m
58+
CONFIG_NF_CONNTRACK_TFTP=m
59+
CONFIG_NETFILTER_XT_MARK=m
60+
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
61+
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
62+
CONFIG_NETFILTER_XT_MATCH_IPVS=m
63+
CONFIG_IP_VS=m
64+
CONFIG_IP_VS_PROTO_TCP=y
65+
CONFIG_IP_VS_PROTO_UDP=y
66+
CONFIG_IP_VS_RR=m
67+
CONFIG_IP_VS_NFCT=y
68+
CONFIG_NF_LOG_ARP=m
69+
CONFIG_NF_LOG_IPV4=m
70+
CONFIG_IP_NF_IPTABLES=m
71+
CONFIG_IP_NF_FILTER=m
72+
CONFIG_IP_NF_TARGET_REJECT=m
73+
CONFIG_IP_NF_NAT=m
74+
CONFIG_IP_NF_TARGET_MASQUERADE=m
75+
CONFIG_IP_NF_TARGET_REDIRECT=m
76+
CONFIG_IP_NF_MANGLE=m
77+
CONFIG_NF_LOG_IPV6=m
78+
CONFIG_IP6_NF_IPTABLES=m
79+
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
80+
CONFIG_IP6_NF_FILTER=m
81+
CONFIG_IP6_NF_TARGET_REJECT=m
82+
CONFIG_IP6_NF_MANGLE=m
83+
CONFIG_BRIDGE=m
84+
CONFIG_BRIDGE_VLAN_FILTERING=y
85+
CONFIG_VLAN_8021Q=m
86+
CONFIG_NET_SCHED=y
87+
CONFIG_NET_CLS_CGROUP=m
4288
CONFIG_NETLINK_DIAG=y
89+
CONFIG_CGROUP_NET_PRIO=y
4390
CONFIG_NET_9P=y
4491
CONFIG_NET_9P_VIRTIO=y
4592
CONFIG_PCI=y
@@ -58,7 +105,15 @@ CONFIG_SCSI_VIRTIO=y
58105
CONFIG_ATA=y
59106
CONFIG_SATA_AHCI=y
60107
CONFIG_SATA_AHCI_PLATFORM=y
108+
CONFIG_MD=y
109+
CONFIG_BLK_DEV_DM=m
110+
CONFIG_DM_THIN_PROVISIONING=m
61111
CONFIG_NETDEVICES=y
112+
CONFIG_DUMMY=m
113+
CONFIG_MACVLAN=m
114+
CONFIG_IPVLAN=m
115+
CONFIG_VXLAN=m
116+
CONFIG_VETH=m
62117
CONFIG_VIRTIO_NET=y
63118
CONFIG_MACB=y
64119
CONFIG_E1000E=y
@@ -106,7 +161,11 @@ CONFIG_RPMSG_CTRL=y
106161
CONFIG_RPMSG_VIRTIO=y
107162
CONFIG_EXT4_FS=y
108163
CONFIG_EXT4_FS_POSIX_ACL=y
164+
CONFIG_EXT4_FS_SECURITY=y
165+
CONFIG_BTRFS_FS=m
166+
CONFIG_BTRFS_FS_POSIX_ACL=y
109167
CONFIG_AUTOFS4_FS=y
168+
CONFIG_OVERLAY_FS=m
110169
CONFIG_MSDOS_FS=y
111170
CONFIG_VFAT_FS=y
112171
CONFIG_TMPFS=y
@@ -120,6 +179,10 @@ CONFIG_ROOT_NFS=y
120179
CONFIG_9P_FS=y
121180
CONFIG_NLS_CODEPAGE_437=y
122181
CONFIG_NLS_ISO8859_1=m
182+
CONFIG_SECURITY=y
183+
CONFIG_SECURITY_SELINUX=y
184+
CONFIG_SECURITY_APPARMOR=y
185+
CONFIG_DEFAULT_SECURITY_DAC=y
123186
CONFIG_CRYPTO_USER_API_HASH=y
124187
CONFIG_CRYPTO_DEV_VIRTIO=y
125188
CONFIG_PRINTK_TIME=y
@@ -138,7 +201,6 @@ CONFIG_DEBUG_SPINLOCK=y
138201
CONFIG_DEBUG_MUTEXES=y
139202
CONFIG_DEBUG_RWSEMS=y
140203
CONFIG_DEBUG_ATOMIC_SLEEP=y
141-
CONFIG_STACKTRACE=y
142204
CONFIG_DEBUG_LIST=y
143205
CONFIG_DEBUG_PLIST=y
144206
CONFIG_DEBUG_SG=y

0 commit comments

Comments
 (0)