From e4abcdea9223b8ed2d1529730c536cdfaeaf4af4 Mon Sep 17 00:00:00 2001 From: zhongjiawei Date: Tue, 11 Mar 2025 10:57:38 +0800 Subject: [PATCH] kata_integration:Add kernel command line support to switch IEE off --- kata-integration.spec | 8 +++- ...command-line-support-to-switch-IEE-o.patch | 45 +++++++++++++++++++ series.conf | 1 + 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 patches/0006-kata_integration-HAOC-Add-kernel-command-line-support-to-switch-IEE-o.patch diff --git a/kata-integration.spec b/kata-integration.spec index fb35f55..d660115 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 11 +%define RELEASE 12 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Tue Mar 11 2025 zhongjiawei - v1.0.0-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Add kernel command line support to switch IEE off + * Thu Jun 20 2024 zhangbowei - 1.0.0-11 - Type:bugfix - ID:NA diff --git a/patches/0006-kata_integration-HAOC-Add-kernel-command-line-support-to-switch-IEE-o.patch b/patches/0006-kata_integration-HAOC-Add-kernel-command-line-support-to-switch-IEE-o.patch new file mode 100644 index 0000000..32eb0b3 --- /dev/null +++ b/patches/0006-kata_integration-HAOC-Add-kernel-command-line-support-to-switch-IEE-o.patch @@ -0,0 +1,45 @@ +From 1040d860266a5e4f14646e298770c6d502affa3d Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Tue, 11 Mar 2025 10:49:42 +0800 +Subject: [PATCH] HAOC: Add kernel command line support to switch IEE off. + +--- + hack/config-kata-arm64 | 5 +++++ + hack/config-kata-x86_64 | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64 +index 65ce304..746fab7 100644 +--- a/hack/config-kata-arm64 ++++ b/hack/config-kata-arm64 +@@ -1228,6 +1228,11 @@ CONFIG_LLC=y + # CONFIG_IEEE802154 is not set + CONFIG_NET_SCHED=y + ++# Hardware Assisted OS Compartmentalization(HAOC) ++# ++CONFIG_IEE=n ++# end of Hardware Assisted OS Compartmentalization(HAOC) ++ + # + # Queueing/Scheduling + # +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index 6a8120c..6f17619 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -1179,6 +1179,11 @@ CONFIG_LLC=y + # CONFIG_IEEE802154 is not set + CONFIG_NET_SCHED=y + ++# Hardware Assisted OS Compartmentalization(HAOC) ++# ++CONFIG_IEE=n ++# end of Hardware Assisted OS Compartmentalization(HAOC) ++ + # + # Queueing/Scheduling + # +-- +2.33.0 + diff --git a/series.conf b/series.conf index 4a7316e..144bd23 100644 --- a/series.conf +++ b/series.conf @@ -3,3 +3,4 @@ 0003-kata_integration-modify-kernel-config-for-kata.patch 0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch 0005-kata_integration-modify-kernel-config-for-virtio-fs.patch +0006-kata_integration-HAOC-Add-kernel-command-line-support-to-switch-IEE-o.patch -- Gitee