diff --git a/src/runtime-rs/arch/aarch64-options.mk b/src/runtime-rs/arch/aarch64-options.mk index 2a4e97befe..dc1f4ad4c4 100644 --- a/src/runtime-rs/arch/aarch64-options.mk +++ b/src/runtime-rs/arch/aarch64-options.mk @@ -5,7 +5,7 @@ # MACHINETYPE := -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := pmu=off diff --git a/src/runtime-rs/arch/powerpc64le-options.mk b/src/runtime-rs/arch/powerpc64le-options.mk index 0a974680e0..457b0a900e 100644 --- a/src/runtime-rs/arch/powerpc64le-options.mk +++ b/src/runtime-rs/arch/powerpc64le-options.mk @@ -5,7 +5,7 @@ # MACHINETYPE := pseries -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := "cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,cap-large-decr=off,cap-ccf-assist=off" CPUFEATURES := pmu=off diff --git a/src/runtime-rs/arch/s390x-options.mk b/src/runtime-rs/arch/s390x-options.mk index 8cda86cc7d..495cd44c1d 100644 --- a/src/runtime-rs/arch/s390x-options.mk +++ b/src/runtime-rs/arch/s390x-options.mk @@ -5,7 +5,7 @@ # MACHINETYPE := s390-ccw-virtio -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := diff --git a/src/runtime-rs/arch/x86_64-options.mk b/src/runtime-rs/arch/x86_64-options.mk index 7ed1192ad5..fc398e4dfa 100644 --- a/src/runtime-rs/arch/x86_64-options.mk +++ b/src/runtime-rs/arch/x86_64-options.mk @@ -5,7 +5,8 @@ # MACHINETYPE := q35 -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 +KERNELTDXPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := pmu=off diff --git a/src/runtime/arch/amd64-options.mk b/src/runtime/arch/amd64-options.mk index 649e5f56e7..968b319517 100644 --- a/src/runtime/arch/amd64-options.mk +++ b/src/runtime/arch/amd64-options.mk @@ -6,7 +6,8 @@ # Intel x86-64 settings MACHINETYPE := q35 -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 +KERNELTDXPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := pmu=off diff --git a/src/runtime/arch/arm64-options.mk b/src/runtime/arch/arm64-options.mk index 895c93f82e..ca19c8c7a6 100644 --- a/src/runtime/arch/arm64-options.mk +++ b/src/runtime/arch/arm64-options.mk @@ -6,7 +6,7 @@ # ARM 64 settings MACHINETYPE := virt -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := pmu=off diff --git a/src/runtime/arch/ppc64le-options.mk b/src/runtime/arch/ppc64le-options.mk index f5b63f85d6..a038b85b37 100644 --- a/src/runtime/arch/ppc64le-options.mk +++ b/src/runtime/arch/ppc64le-options.mk @@ -6,7 +6,7 @@ # Power ppc64le settings MACHINETYPE := pseries -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := "cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,cap-large-decr=off,cap-ccf-assist=off" CPUFEATURES := KERNELTYPE := uncompressed #This architecture must use an uncompressed kernel. diff --git a/src/runtime/arch/s390x-options.mk b/src/runtime/arch/s390x-options.mk index b53fc32800..91464c1e56 100644 --- a/src/runtime/arch/s390x-options.mk +++ b/src/runtime/arch/s390x-options.mk @@ -6,7 +6,7 @@ # s390x settings MACHINETYPE := s390-ccw-virtio -KERNELPARAMS := +KERNELPARAMS := cgroup_no_v1=all systemd.unified_cgroup_hierarchy=1 MACHINEACCELERATORS := CPUFEATURES := diff --git a/tools/packaging/kernel/configs/fragments/common/cgroup.conf b/tools/packaging/kernel/configs/fragments/common/cgroup.conf index 6b734156a7..1976f440d2 100644 --- a/tools/packaging/kernel/configs/fragments/common/cgroup.conf +++ b/tools/packaging/kernel/configs/fragments/common/cgroup.conf @@ -2,7 +2,6 @@ # also used/looked for by systemd rootfs. CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_V1=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y @@ -11,7 +10,6 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y -CONFIG_CPUSETS_V1=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_HUGETLB=y diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index b23363c828..94e922df68 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -38,5 +38,3 @@ CONFIG_PAGE_TABLE_ISOLATION CONFIG_MITIGATION_PAGE_TABLE_ISOLATION CONFIG_VFIO_AP CONFIG_VFIO_MDEV -CONFIG_CPUSETS_V1 -CONFIG_MEMCG_V1 diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index a29644e57e..13c09a007e 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -144 +145