79e7b8794c
Update kernel source to 6.6.7 from linux-yocto upstream. Update "debian" folder source to 6.1.27-1~bpo11+1 from debian upstream, because kernel 6.6.7 is ported to our bullseye platform now and the newest "debian" folder from debian upstream for bullseye platform is for 6.1. Add an optimization for the StarlingX debian kernel building framework: We used to always maintain kernel with patches on "debian" folder and they are put at kernel/kernel-std(rt)/debian/deb_patches dir. Most of these patches are about "changelog" (debian/changelog) and "config" (debian/config/amd64/none/config). The patches in "deb_patches" dir increased rapidly. Next We will put "changelog" and "config" at the dir kernel/kernel-std(rt)/debian/source and use them to replace debian/changelog and debian/config/amd64/none/config after the upstream "debian" folder is extracted. This can not only keep a clean "deb_patches" folder, but also avoid using a big patch to remove the "changelog" file in the upstream "debian" folder before any kernel build. Below are changes about "deb_patches"/"patches" for kernel-rt: (We use the patches' serial number in their name to represent them becuase so many patches are involved here.) (1)about "deb_patches" folder: (1.1)Because of the optimization, all the patches about changelog and config for 5.10 can be abandoned and they will be changed directly in the files under "source" dir for 6.6. Patches for 5.10 that are abandoned because they are about config: 0003/0005/0006/0007/0008/0010/0011/0016/0018/0022/0026/0028 Patches for 5.10 that are abandoned because they are about changelog: 0001/0002/0007/0013/0020/0023/0024/0025/0027/0029/0030/0032/0033/0034 The "changelog" and "config" under "source" dir for 6.6 are verified to be aligned with those for 5.10 build. CONFIG_FANOTIFY is enabled in "config" as a new request. (1.2)Patch 0017 for 5.10 is abandoned because the new commit <Use parallel XZ for source tar generation> is available in new version "debian" folder, which does the same work. Refer to: https://salsa.debian.org/kernel-team/linux/-/commit/ 50b61a14e6dbc50b19dfe938c4679ecda50b83ee (1.3)Below patches for 5.10 are ported to 6.6: 0004/0009/0015 (0009/0015 are merged into 0004) compose patch 0001 for 6.6; 0014 is ported to 0002 for 6.6; 0021 is ported to 0003 for 6.6; 0005/0019 (0005 is merged into 0019) compose patch 0004 for 6.6; 0012 is ported to 0005 for 6.6; 0031 is ported to 0006 for 6.6. List the new patches for 6.6: New patches 0001-0006 are ported from "deb_patches" for 5.10; New patches 0007-0010 are added for building kernel 6.6.7 with 6.1.27-1~bpo11+1 "debian" folder. (2)about "patches" folder: (2.1)Patches for 5.10 that are abandoned because they are already in 6.6.7 include: 0017-0027/0031-0038/0041-0056/0058-0071/0073-0081/0083 (2.2)Patch 0011 for 5.10 is abandoned for new upstream commit <scsi: smartpqi: Expose SAS address for SATA drives> in 6.6. Refer to: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/ linux.git/commit/?id=00598b056aa6d46c7a6819efa850ec9d0d690d76 The new upstream commit has done what 0011 does. (2.3)Patch 0039 for 5.10 is abandoned for new upstream commit <samples/bpf: replace broken overhead microbenchmark with fib_table_lookup> in 6.6. Refer to: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/ linux.git/commit/?id=58e975d014e1e31bd1586be7d2be6d61bd3e3ada 0038 isn't needed any more with the new commit merged. (2.4)Patch 0030 for 5.10 is abandoned because the related code has been changed in 6.6 and the issue was verified to disappear. (2.5)Patch 0010 for 5.10 is abandoned and the issue will be fixed by setting /config/target/iscsi/cpus_allowed_list to be same with kernel parameter "kthread_cpus". Because the new patch <scsi: target: Add iscsi/cpus_allowed_list in configfs> adds iscsi/cpus_allowed_list in configfs. The available CPU set of iSCSI connection RX/TX threads is allowed_cpus & online_cpus. This will do the same thing with patch 0010 so long as we set cpus_allowed_list properly. Refer to: <https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/ linux.git/commit/?id=d72d827f2f2636d8d72f0f3ebe5b661c9a24d343> This issue will be addressed by later patches on stx framework part. (2.6)Patch 0015-0016 are abandoned because the issue has been fixed from the user space side by using the stable /dev/disk/by-path/... symbolic links instead of names like /dev/sda that can change (confirmed by M. Vefa Bicakci). (2.7)Below patches for 5.10 are ported to 6.6: 0001-0009/0012/0028-0029/0040/0057/0082 (3)about kernel config: (3.1) Enable CONFIG_GNSS for the ice driver. Test plan: The out of tree kernel modules for 6.6 aren't ready by now. So many tests can't be done yet because the related test environments need those OOT drivers. Here list the tests which have been done with a test patch to remove the OOT drivers from the ISO temporarily. There are also 2 patches as workaround for solving 2 issues met when installing lab in jenkins job. PASS: Build linux/linux-rt OK. PASS: Build ISO OK. PASS: Install and boot up OK on a AIO-SX lab with std/rt kernel. PASS: The 12 hours cyclictest result for rt kernel is: samples: 259199998 avg: 1658 max: 5455 99.9999th percentile: 3725 overflows: 0 Story: 2011000 Task: 49365 Signed-off-by: Li Zhou <li.zhou@windriver.com> Change-Id: I6601fd2d7be4fc314ef2bc03b46f851eabebe3ea (cherry picked from commit 06f53ed8e2a11676d4c8fca745c34dcaa3d889be) Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
32 lines
886 B
Diff
32 lines
886 B
Diff
From bb33cdde8d36fcc3d10b2ebd1001b18347755a07 Mon Sep 17 00:00:00 2001
|
|
From: Li Zhou <li.zhou@windriver.com>
|
|
Date: Thu, 28 Apr 2022 10:16:20 +0800
|
|
Subject: [PATCH 5/5] kernel-rt: add '-rt' to abiname
|
|
|
|
Adding an extra '-rt' to abiname can change '6.6.0-1-amd64'
|
|
in file names/paths to '6.6.0-1-rt-amd64'.
|
|
In this way, the same names/paths in kernel-rt and kernel-std
|
|
packages can be avoided.
|
|
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
[lz: Adapted the patch for upgrading kernel from 5.10 to 6.6]
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
---
|
|
debian/config/defines | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/debian/config/defines b/debian/config/defines
|
|
index 37ee655..f1ca81b 100644
|
|
--- a/debian/config/defines
|
|
+++ b/debian/config/defines
|
|
@@ -1,5 +1,5 @@
|
|
[abi]
|
|
-abiname: 1
|
|
+abiname: 1-rt
|
|
ignore-changes:
|
|
__cpuhp_*
|
|
__udp_gso_segment
|
|
--
|
|
2.17.1
|
|
|