Skip to content

Commit ba9558c

Browse files
author
maksymbelei95
authored
[net] Disable prio and cls cgroups to make working cgroup2 sock matching (#198)
* Unset CONFIG_CGROUP_NET_CLASSID, CONFIG_CGROUP_NET_PRIO and depended modules CONFIG_NET_CLS_CGROUP, CONFIG_NETFILTER_XT_MATCH_CGROUP in Kconfig to disable those v1 cgroups. The system contains programs, which use both groups v1 and v2, e.g. docker uses net_prio, net_cls and "ip vrf" uses cgroup2 socket matching. But, Linux kernel does not allow to work with net_prio, net_cls and socket matching from cgroup2 in the same time. Link to comment in source file: https://elixir.bootlin.com/linux/v4.19.156/source/include/linux/cgroup-defs.h#L745 The related warning, appearing on startup: "sonic INFO kernel: [ 14.057746] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation". Disabling of net_prio and net_cls will prevent this conflict and make programs, which uses cgroup2 socket matching, to be working correct. Signed-off-by: Maksym Belei <[email protected]>
1 parent 30b9a59 commit ba9558c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

patch/kconfig-exclusions

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[common]
22
# Unset STRICT_DEVMEM according to Broadcom's requirement and for CENTEC arm64 arch
33
CONFIG_STRICT_DEVMEM
4+
# Unset classid and priority network cgroups due to conflict between cgroups v1 and v2
5+
CONFIG_CGROUP_NET_CLASSID
6+
CONFIG_NET_CLS_CGROUP
7+
CONFIG_NETFILTER_XT_MATCH_CGROUP
8+
CONFIG_CGROUP_NET_PRIO
49

510
[amd64]
611
# Unset X86_PAT according to Broadcom's requirement

0 commit comments

Comments
 (0)