starlingx
/
kernel
Code Issues Proposed changes

Update kernel to v5.10.205 

This commit updates kernel to v5.10.205 to fix following CVE issues:
1.CVE-2023-51782: https://nvd.nist.gov/vuln/detail/CVE-2023-51782
2.CVE-2023-51781:https://nvd.nist.gov/vuln/detail/CVE-2023-51781
3.CVE-2023-51780: https://nvd.nist.gov/vuln/detail/CVE-2023-51780
4.CVE-2023-6531: https://nvd.nist.gov/vuln/detail/CVE-2023-6531
5.CVE-2023-6121: https://nvd.nist.gov/vuln/detail/CVE-2023-6121
6.CVE-2023-6546: https://nvd.nist.gov/vuln/detail/CVE-2023-6546
7.CVE-2023-6931: https://nvd.nist.gov/vuln/detail/CVE-2023-6931
8.CVE-2023-6932: https://nvd.nist.gov/vuln/detail/CVE-2023-6932
9.CVE-2023-6817: https://nvd.nist.gov/vuln/detail/CVE-2023-6817
10.CVE-2023-46862: https://nvd.nist.gov/vuln/detail/CVE-2023-46862
11.CVE-2023-39197: https://nvd.nist.gov/vuln/detail/CVE-2023-39197
12.CVE-2023-6176: https://nvd.nist.gov/vuln/detail/CVE-2023-6176
13.CVE-2023-4881: https://nvd.nist.gov/vuln/detail/CVE-2023-4881
14.CVE-2023-34324:  https://nvd.nist.gov/vuln/detail/CVE-2023-34324
15.CVE-2023-5717: https://nvd.nist.gov/vuln/detail/CVE-2023-5717
16.CVE-2023-5178: https://nvd.nist.gov/vuln/detail/CVE-2023-5178
17.CVE-2023-46813: https://nvd.nist.gov/vuln/detail/CVE-2023-46813
18.CVE-2023-35827: https://nvd.nist.gov/vuln/detail/CVE-2023-35827

A local StarlingX kernel patch had already been integrated into the
linux-yocto repository's v5.10/standard/preempt-rt/base branch after
v5.10.198 as commit 2dccf008aa65 ("net: replace
raw_write_seqcount_t_begin by do_raw_write_seqcount_begin").
Hence, we drop the following now-redundant local patch:
  0083-net-replace-raw_write_seqcount_t_begin-by-do_raw_wri.patch.

Verification:
- Build kernel and out of tree modules success for rt and std.
- Build iso success for rt and std.
- Install success onto a AIO-DX lab with rt kernel.
- Boot up successfully in the lab.
- The sanity testing was done by our test team and no regression
  defect was found.
- The cyclictest benchmark was also run on the starlingx lab, the
  result is "samples: 259200000 avg: 1602 max: 4460 99.9999th
  percentile: 2737 overflows: 0".
  Given that the maximum and 99.9999 percentile latency values are
  well below 5 microseconds, the results are acceptable, and they are
  not significantly different than the ones acquired with kernel
  v5.10.198.

Closes-Bug: 2043947

Change-Id: I558e40c4398428d73444bd4f50928c5248da0899
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
This commit is contained in:
Peng Zhang 2024-01-18 11:20:58 +00:00
parent 8e6c846e06
commit 706581da39
11 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel-rt/debian/deb_patches/0034-Upgrade-5.10-kernel-to-5.10.205.patch Normal file
View File

@ -0,0 +1,30 @@
From e68f10053ad869a56b206ab851d8db0d0565ce4d Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Wed, 3 Jan 2024 01:49:13 +0000
Subject: [PATCH] Upgrade 5.10 kernel to 5.10.205
Update debian/changelog.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9647c7d4c..8f636f071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-rt (5.10.205-1) unstable; urgency=medium
+
+ * New upstream update:
+ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fpreempt-rt%2Fbase&qt=range&q=26e9b120876a03baa8fed8bf2932be84720ac0a4
+
+ -- Peng Zhang <Peng.Zhang2@windriver.com> Wed, 03 Jan 2024 01:20:32 +0000
+
linux-rt (5.10.198-1) unstable; urgency=medium
* New upstream update:
--
2.30.2

1
kernel-rt/debian/deb_patches/series
View File

@ -31,3 +31,4 @@
0031-kernel-rt-Add-pkgs-without-abiname-for-image-headers.patch
0032-Upgrade-5.10-kernel-to-5.10.192.patch
0033-Upgrade-5.10-kernel-to-5.10.198.patch
0034-Upgrade-5.10-kernel-to-5.10.205.patch

2
kernel-rt/debian/dl_hook
View File

@ -24,7 +24,7 @@
# building.
# Tools needed: tar/sed
KERNEL_HEAD_COMMIT=2da7024055c1fb827608ef2529c22356612f6ddd
KERNEL_HEAD_COMMIT=26e9b120876a03baa8fed8bf2932be84720ac0a4
DEBIAN_FILE=linux_5.10.28-1.debian.tar.xz
tar xvf linux-yocto-${KERNEL_HEAD_COMMIT}.tar.gz

8
kernel-rt/debian/meta_data.yaml
View File

@ -1,14 +1,14 @@
---
debver: 5.10.198
debver: 5.10.205
debname: linux-rt
dl_hook: dl_hook
dl_files:
linux-yocto-2da7024055c1fb827608ef2529c22356612f6ddd.tar.gz:
linux-yocto-26e9b120876a03baa8fed8bf2932be84720ac0a4.tar.gz:
topdir: null
url:
"https://git.yoctoproject.org/linux-yocto/snapshot/\
linux-yocto-2da7024055c1fb827608ef2529c22356612f6ddd.tar.gz"
sha256sum: d2557d9bae9e89adf3f0bd0a23d878a915c593a8e6a3e536fbe87b2efee51915
linux-yocto-26e9b120876a03baa8fed8bf2932be84720ac0a4.tar.gz"
sha256sum: 53024b9e3153c36a99c3489a2da16dbdb58a06f607e3ec999ff657e65f53ca39
linux_5.10.28-1.debian.tar.xz:
topdir: null
url:

40
kernel-rt/debian/patches/0083-net-replace-raw_write_seqcount_t_begin-by-do_raw_wri.patch
View File

@ -1,40 +0,0 @@
From 2dccf008aa6513cfd0c437e844bc8c854165cc9f Mon Sep 17 00:00:00 2001
From: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
Date: Thu, 26 Oct 2023 16:28:30 +0800
Subject: [PATCH] net: replace raw_write_seqcount_t_begin by
do_raw_write_seqcount_begin
commit 3b5b679fc12ca9aa310862d5f0a6e23d6151c6a4 linux-stable-rt v5.10-rt-next
Commit a8dd21118b0fa ("seqlock: Prefix internal seqcount_t-only macros with a
"do_""), among other changes, renames the function raw_write_seqcount_t_begin
to do_raw_write_seqcount_begin. That commit did not cover the changes from
the RT-only commit 81ce24cd24a9e ("net: Properly annotate the try-lock for the
seqlock"), which are fixed here.
Fixes: 81ce24cd24a9e ("net: Properly annotate the try-lock for the seqlock")
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
(cherry picked from commit 2dccf008aa6513cfd0c437e844bc8c854165cc9f)
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
include/net/sch_generic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 72be68652bb8..eee11a1c9321 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -195,7 +195,7 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
* Variant of write_seqcount_t_begin() telling lockdep that a
* trylock was attempted.
*/
- raw_write_seqcount_t_begin(s);
+ do_raw_write_seqcount_begin(s);
seqcount_acquire(&s->dep_map, 0, 1, _RET_IP_);
return true;
}
--
2.34.1

0
kernel-rt/debian/patches/0084-sched-rt-Fix-bad-task-migration-for-rt-tasks.patch → kernel-rt/debian/patches/0083-sched-rt-Fix-bad-task-migration-for-rt-tasks.patch
View File

3
kernel-rt/debian/patches/series
View File

@ -76,5 +76,4 @@
0080-perf-core-Fix-perf_cgroup_switch.patch
0081-perf-core-Always-set-cpuctx-cgrp-when-enable-cgroup-.patch
0082-Add-the-pci-reboot-quirk-in-DMI-table-for-Dell-Power.patch
0083-net-replace-raw_write_seqcount_t_begin-by-do_raw_wri.patch
0084-sched-rt-Fix-bad-task-migration-for-rt-tasks.patch
0083-sched-rt-Fix-bad-task-migration-for-rt-tasks.patch

30
kernel-std/debian/deb_patches/0033-Upgrade-5.10-kernel-to-5.10.205.patch Normal file
View File

@ -0,0 +1,30 @@
From d62a1ac6ec0f1ac87fb53e9153a7c89a16c9f137 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Tue, 16 Jan 2024 07:00:47 +0000
Subject: [PATCH] Upgrade 5.10 kernel to 5.10.205
Update debian/changelog.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ab68b1363..85928079d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (5.10.205-1) unstable; urgency=medium
+
+ * New upstream update:
+ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fbase&qt=range&q=0e1dfe1d29013deb4cfa75170fa414e75a14c530
+
+ -- Peng Zhang <Peng.Zhang2@windriver.com> Tue, 16 Jan 2024 06:57:16 +0000
+
linux (5.10.198-1) unstable; urgency=medium
* New upstream update:
--
2.30.2

1
kernel-std/debian/deb_patches/series
View File

@ -30,3 +30,4 @@
0030-kernel-std-Add-pkgs-without-abiname-for-image-header.patch
0031-Upgrade-5.10-kernel-to-5.10.192.patch
0032-Upgrade-5.10-kernel-to-5.10.198.patch
0033-Upgrade-5.10-kernel-to-5.10.205.patch

2
kernel-std/debian/dl_hook
View File

@ -5,7 +5,7 @@
# be put at the same path where this script is located.
# Tools needed: tar
KERNEL_HEAD_COMMIT=5601201f60a8abb5bbb54da99da2a38bfb7a46dd
KERNEL_HEAD_COMMIT=0e1dfe1d29013deb4cfa75170fa414e75a14c530
DEBIAN_FILE=linux_5.10.28-1.debian.tar.xz
tar xvf linux-yocto-${KERNEL_HEAD_COMMIT}.tar.gz

8
kernel-std/debian/meta_data.yaml
View File

@ -1,14 +1,14 @@
---
debver: 5.10.198
debver: 5.10.205
debname: linux
dl_hook: dl_hook
dl_files:
linux-yocto-5601201f60a8abb5bbb54da99da2a38bfb7a46dd.tar.gz:
linux-yocto-0e1dfe1d29013deb4cfa75170fa414e75a14c530.tar.gz:
topdir: null
url:
"https://git.yoctoproject.org/linux-yocto/snapshot/\
linux-yocto-5601201f60a8abb5bbb54da99da2a38bfb7a46dd.tar.gz"
sha256sum: 52bab1d9080ca0389388dd522f03a0572ff69f8acee6ecf7f739386c4e2eddcd
linux-yocto-0e1dfe1d29013deb4cfa75170fa414e75a14c530.tar.gz"
sha256sum: 94d1336d5a1419f8c706132a08b43a4dae59e48bb90832b1c91df4e0a50f34ec
linux_5.10.28-1.debian.tar.xz:
topdir: null
url: