443773aaa9
This commit upgrades the Linux kernel to 6.12.18 from 6.6.x, which comes
from the linux-yocto upstream.
The following changes we made to support the kernel upgrade.
For linux debian package deb_patches folder.
We adapt the kernel related patch for 6.12.18, and cherry pick the
following 8 commits to support to build the kernel 6.12.x.
1) commit f77deecbb5d4 "d/rules.real: Unset KBUILD_HOSTCFLAGS etc.
instead of overriding to be empty"
https://salsa.debian.org/kernel-team/linux/-/commit/f77deecbb5d4
2) commit 0d0d62b7d1cc "d/rules.d/Makefile.inc: Add scripts/include to
header include path"
https://salsa.debian.org/kernel-team/linux/-/commit/0d0d62b7d1cc
3) commit 4ad01663251d "[x86] linux-cpupower: Update turbostat Makefile
to define BUILD_BUG_HEADER"
https://salsa.debian.org/kernel-team/linux/-/commit/4ad01663251d
4) commit fced95b415be "hyperv-daemons: Update for upstream removal of
hv_fcopy_daemon"
https://salsa.debian.org/kernel-team/linux/-/commit/fced95b415be
5) commit 3a17dcbfe0be "d/rules.d/certs: Add newly required include
directory to CPPFLAGS"
https://salsa.debian.org/kernel-team/linux/-/commit/3a17dcbfe0be
6) commit 15b6859742d4 "Disable building rtla, since bullseye's
libtraceevent and libtracefs are too old"
https://salsa.debian.org/kernel-team/linux/-/commit/15b6859742d4
7) commit b4b93560d441 "[ia64] Drop all ia64 configs due to upstream
dropping IA64 arch"
https://salsa.debian.org/kernel-team/linux/-/commit/b4b93560d441
8) commit b93faa99519d "linux-kbuild: Add scripts/module-common.c
(Closes: #1087495)"
https://salsa.debian.org/kernel-team/linux/-/commit/b93faa99519d
For the Linux source code patches folder.
1) We adapt the patch 0001, 0003, 0005, 0006, 0010, 0014 and 0017 based
on kernel-6.12.18.
2) Remove all the ice port back patches because that has been included
in our source code.
For the kernel config.
We enable CONFIG_CPUSETS_V1 and CONFIG_MEMCG_V1 to fix install issue.
Verification:
- Build kernel and out of tree modules success for rt and std.
- Build iso success for rt and std.
- Install success onto a All-in-One lab with rt kernel, and can
switch to std kernel.
- Boot up successfully in the lab.
- The sanity testing was run and the test results PASS.
- The cyclictest benchmark was also run on the starlingx lab, the result
is "samples: 43199996 avg: 1656.295 std_dev: 67.617 max: 8827
99.9999th percentile: 8652“，It is worse than linux-6.6.x.
- The network performance test had been done. For TCP, better than
kernel-6.6.x, for UDP, a little worse than kernel-6.6.x, for STCP,
can not do the test that is same with kernel-6.6.x.
Story: 2011384
Task: 51856
Change-Id: I06ff2f3ab3620fe887f1e5e72ea9022a0cea6102
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From b40833737594a50e69a505f0da82168c5d998ca6 Mon Sep 17 00:00:00 2001
|
|
From: Chris Friesen <chris.friesen@windriver.com>
|
|
Date: Thu, 12 May 2016 18:00:00 -0400
|
|
Subject: [PATCH 05/16] Make kernel start eth devices at offset
|
|
|
|
In order to avoid naming collisions, we want to make the kernel
|
|
start naming its "ethX" devices at eth1000 instead of eth0. This
|
|
will let us rename to a range starting at eth0.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Signed-off-by: Zhang Zhiguo <zhangzhg@neusoft.com>
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
[lz: Adapted the patch for context changes.]
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
[jm: Adapted the patch for context changes.]
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
net/core/dev.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
|
index c761f862bc5a..d91ad9228b19 100644
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -1203,6 +1203,12 @@ static int __dev_alloc_name(struct net *net, const char *name, char *res)
|
|
__set_bit(i, inuse);
|
|
}
|
|
|
|
+ /* STX extension, want kernel to start at eth1000 */
|
|
+ if (strcmp(name, "eth%d") == 0) {
|
|
+ for (i=0; i < 1000; i++)
|
|
+ set_bit(i, inuse);
|
|
+ }
|
|
+
|
|
i = find_first_zero_bit(inuse, max_netdevices);
|
|
bitmap_free(inuse);
|
|
if (i == max_netdevices)
|
|
--
|
|
2.47.1
|
|
|