starlingx/kernel
Code Issues Proposed changes

Update kernel to v5.10.189

Browse Source 
This commit updates kernel to 5.10.189 to fix following CVE issue:
CVE-2023-4132: https://nvd.nist.gov/vuln/detail/CVE-2023-4132
CVE-2023-4004: https://nvd.nist.gov/vuln/detail/CVE-2023-4004
CVE-2023-20593: https://nvd.nist.gov/vuln/detail/CVE-2023-20593
CVE-2023-3863: https://nvd.nist.gov/vuln/detail/CVE-2023-3863
CVE-2023-31248: https://nvd.nist.gov/vuln/detail/CVE-2023-31248
CVE-2023-35001: https://nvd.nist.gov/vuln/detail/CVE-2023-35001
CVE-2023-3117: https://nvd.nist.gov/vuln/detail/CVE-2023-3117
CVE-2023-3611: https://nvd.nist.gov/vuln/detail/CVE-2023-3611
CVE-2023-3610: https://nvd.nist.gov/vuln/detail/CVE-2023-3610
CVE-2023-3776: https://nvd.nist.gov/vuln/detail/CVE-2023-3776
CVE-2023-3390: https://nvd.nist.gov/vuln/detail/CVE-2023-3390
CVE-2023-2898: https://nvd.nist.gov/vuln/detail/CVE-2023-2898

One of our source patches requires refresh against the new kernel
source. It was modified for missed parameter need be added in the
new kernel:
       Port-negative-dentries-limit-feature-from-3.10.patch.

After upgrading kernel, new function eth_hw_addr_set was added in
linux-headers-5.10.0-6-common. While it has already defined in the
following driver modules:
        i40e,i40e-cvl-4.10,iavf,iavf-cvl-4.10,ice,ice-cvl-4.10.
To avoid the redefinition conflict, we allow the out-of-tree drivers
to use the newly added in-tree version of the eth_hw_addr_set
function. This is achieved by undefining the NEED_ETH_HW_ADDR_SET
macro.

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: 259199999 avg: 1633 max: 8817 99.9999th
  percentile: 7612 overflows: 0", It is not big difference with
  5.10.185 for avg and max.

Closes-Bug: 2029211

Change-Id: I107a0c0285ad2de39d56863cc5fed6273ad7fbd4
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
This commit is contained in:
Peng Zhang 2023-09-23 01:17:16 +08:00
parent 1d2b5fc39a
commit 825266d5ac
22 changed files with 284 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/patches/I40E-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch Normal file
View File

@ -0,0 +1,32 @@
From d014e2cc3ba31b33da875d45b78dbae9b82ba97c Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 03:42:45 +0800
Subject: [PATCH] I40E: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
src/kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index 67aacab..ffa69fd 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -289,6 +289,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/patches/series
View File

@ -1,3 +1,4 @@
i40e-Enable-getting-link-status-from-VF.patch
i40e-add-more-debug-info-for-VFs-still-in-reset.patch
i40e_main-Use-irq_update_affinity_hint.patch
I40E-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch

32
kernel-modules/intel-i40e/debian/deb_folder/patches/I40E-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch Normal file
View File

@ -0,0 +1,32 @@
From 3e4fd1fe6ad31a76ae18597971404259961a4ea6 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 04:14:55 +0800
Subject: [PATCH] I40E: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
src/kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index 1d8d2c7..034c77a 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -252,6 +252,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-i40e/debian/deb_folder/patches/series
View File

@ -1,3 +1,4 @@
i40e-Enable-getting-link-status-from-VF.patch
i40e-add-more-debug-info-for-VFs-still-in-reset.patch
i40e_main-Use-irq_update_affinity_hint.patch
I40E-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch

32
kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/patches/0001-IAVF-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch Normal file
View File

@ -0,0 +1,32 @@
From db8131c59b55751d70e0eb3f7c31d600b31c5500 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 05:49:33 +0800
Subject: [PATCH] IAVF: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
src/kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index 19ad6ee..9fa061e 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -286,6 +286,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/patches/series
View File

@ -1,3 +1,4 @@
iavf_main-Use-irq_update_affinity_hint.patch
0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch
0001-Fix-the-invalid-check.patch
0001-IAVF-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch

32
kernel-modules/intel-iavf/debian/deb_folder/patches/0001-IAVF-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch Normal file
View File

@ -0,0 +1,32 @@
From 3a104f93982a7e2ab08556303c6417f8b416d36d Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 05:43:31 +0800
Subject: [PATCH] IAVF: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index a751779..6fb71dc 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -263,6 +263,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-iavf/debian/deb_folder/patches/series
View File

@ -1,3 +1,4 @@
iavf_main-Use-irq_update_affinity_hint.patch
0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch
0001-Fix-the-invalid-check.patch
0001-IAVF-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET.patch

32
kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/0005-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch Normal file
View File

@ -0,0 +1,32 @@
From 9085f5a0275352794aa24cf32c169bd6ba25ea34 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 05:57:38 +0800
Subject: [PATCH] ICE: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
src/kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index c426f1b..a72dd98 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -287,6 +287,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/patches/series
View File

@ -2,3 +2,4 @@
0002-intel-ice-pass-linux-common-header-to-check_aux_bus.patch
0003-rename-the-ddp-file-to-avoid-conflict.patch
0004-Disable-irq_msix_misc-before-ptp-release.patch
0005-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch

32
kernel-modules/intel-ice/debian/deb_folder/patches/0001-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch Normal file
View File

@ -0,0 +1,32 @@
From a740dac85681a93bb6c284869267e9a9b288fb79 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Thu, 21 Sep 2023 06:11:00 +0800
Subject: [PATCH] ICE: Add the condition of 'undef NEED_ETH_HW_ADDR_SET' to
avoid redefinition conflict
For function eth_hw_addr_set has already been defined in
linux-headers-5.10.0-6-common, add the condition of
'undef NEED_ETH_HW_ADDR_SET' to avoid redefinition conflict.
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
src/kcompat_std_defs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h
index 59356b8..aeb7e9e 100644
--- a/src/kcompat_std_defs.h
+++ b/src/kcompat_std_defs.h
@@ -255,6 +255,9 @@
#define NEED_DEVLINK_ALLOC_SETS_DEV
#define HAVE_DEVLINK_REGISTER_SETS_DEV
#define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,188))
+#undef NEED_ETH_HW_ADDR_SET
+#endif
#else /* >= 5.15.0 */
#define HAVE_ETHTOOL_COALESCE_EXTACK
#define HAVE_NDO_ETH_IOCTL
--
2.34.1

1
kernel-modules/intel-ice/debian/deb_folder/patches/series
View File

@ -2,3 +2,4 @@
0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch
0001-rename-the-ddp-file-to-avoid-conflict.patch
0001-Disable-irq_msix_misc-before-ptp-release.patch
0001-ICE-Add-the-condition-of-undef-NEED_ETH_HW_ADDR_SET-.patch

28
kernel-rt/debian/deb_patches/0030-Upgrade-5.10-kernel-to-5.10.189.patch Normal file
View File

@ -0,0 +1,28 @@
From 265e9c4c9f7e9f47adc94f5f5bca1d4483cf2ab0 Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Mon, 28 Aug 2023 07:44:14 +0000
Subject: [PATCH] Upgrade 5.10 kernel to 5.10.189
Update debian/changelog.
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e41f6761d..a49ab5c00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-rt (5.10.189-1) unstable; urgency=medium
+
+ * New upstream update:
+ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fpreempt-rt%2Fbase&qt=range&q=42680acb5fa5bb8ec4582e2bc50dd16aa71394a6
+
+ -- Peng Zhang <Peng.Zhang2@windriver.com> Mon, 28 Aug 2023 07:38:50 +0000
+
linux-rt (5.10.185-1) unstable; urgency=medium
* New upstream update:
--
2.30.2

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

@ -27,3 +27,4 @@
0027-Upgrade-5.10-kernel-to-5.10.180.patch
0028-config-Enable-Intel-RAPL-and-uncore-frequency-contro.patch
0029-Upgrade-5.10-kernel-to-5.10.185.patch
0030-Upgrade-5.10-kernel-to-5.10.189.patch

2
kernel-rt/debian/dl_hook
View File

@ -24,7 +24,7 @@
# building.
# Tools needed: tar/sed
KERNEL_HEAD_COMMIT=46fb028ad9413cfa8d47a6dc8bf9a57d9d5edf8b
KERNEL_HEAD_COMMIT=42680acb5fa5bb8ec4582e2bc50dd16aa71394a6
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.185
debver: 5.10.189
debname: linux-rt
dl_hook: dl_hook
dl_files:
linux-yocto-46fb028ad9413cfa8d47a6dc8bf9a57d9d5edf8b.tar.gz:
linux-yocto-42680acb5fa5bb8ec4582e2bc50dd16aa71394a6.tar.gz:
topdir: null
url:
"https://git.yoctoproject.org/linux-yocto/snapshot/\
linux-yocto-46fb028ad9413cfa8d47a6dc8bf9a57d9d5edf8b.tar.gz"
sha256sum: 89666dd1d47e3779ea7db880606335618e1217fe8ef78fc95fa9db7f20770a82
linux-yocto-42680acb5fa5bb8ec4582e2bc50dd16aa71394a6.tar.gz"
sha256sum: b89629d1b9833f8c4000ecf335370468db9f70228fd2235e8ab07a938e303fa1
linux_5.10.28-1.debian.tar.xz:
topdir: null
url:

14
kernel-rt/debian/patches/0057-Port-negative-dentries-limit-feature-from-3.10.patch
View File

@ -22,13 +22,15 @@ different location, requiring a procedure call to obtain
more calls into iterate_super
Signed-off-by: Jim Somerville <jim.somerville@windriver.com>
[zp: Adapted the patch for context and code changes.]
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
fs/dcache.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++-
kernel/sysctl.c | 12 ++++
2 files changed, 188 insertions(+), 2 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index 26a187abf13a..ef4e1a7352c2 100644
index ad9bffc38..edc1cd0eb 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -32,6 +32,7 @@
@ -177,7 +179,7 @@ index 26a187abf13a..ef4e1a7352c2 100644
static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,
struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)
{
@@ -1617,6 +1711,86 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
@@ -1618,6 +1712,86 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
return D_WALK_CONTINUE;
}
@ -265,7 +267,7 @@ index 26a187abf13a..ef4e1a7352c2 100644
{
shrink_dcache_parent(dentry);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index afad085960b8..18ea5c796519 100644
index a45f0dd10..034517367 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -106,6 +106,9 @@
@ -278,7 +280,7 @@ index afad085960b8..18ea5c796519 100644
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
static int sixty = 60;
@@ -3337,6 +3340,15 @@ static struct ctl_table fs_table[] = {
@@ -3416,6 +3419,15 @@ static struct ctl_table fs_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ONE,
},
@ -289,11 +291,11 @@ index afad085960b8..18ea5c796519 100644
+ .mode = 0644,
+ .proc_handler = proc_dcache_negative_dentry_limit,
+ .extra1 = &zero_ul,
+ .extra2 = &one_hundred,
+ .extra2 = SYSCTL_ONE_HUNDRED,
+ },
{ }
};
--
2.25.1
2.30.2

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

@ -0,0 +1,30 @@
From 282d6563fe01567af0719617127e29ef47b5cd7b Mon Sep 17 00:00:00 2001
From: Peng Zhang <Peng.Zhang2@windriver.com>
Date: Mon, 28 Aug 2023 06:12:16 +0000
Subject: [PATCH] Upgrade 5.10 kernel to 5.10.189
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 c9a526a23..f31fd4012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (5.10.189-1) unstable; urgency=medium
+
+ * New upstream update:
+ https://git.yoctoproject.org/linux-yocto/log/?h=v5.10%2Fstandard%2Fbase&qt=range&q=fc99f5e7ce23e4814c7b41f24c5d0296754be89e
+
+ -- Peng Zhang <Peng.Zhang2@windriver.com> Mon, 28 Aug 2023 05:56:12 +0000
+
linux (5.10.185-1) unstable; urgency=medium
* New upstream update:
--
2.30.2

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

@ -26,3 +26,4 @@
0026-Upgrade-5.10-kernel-to-5.10.180.patch
0027-config-Enable-Intel-RAPL-and-uncore-frequency-contro.patch
0028-Upgrade-5.10-kernel-to-5.10.185.patch
0029-Upgrade-5.10-kernel-to-5.10.189.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=dafc025b033585311d1693255c80b60b690b0e54
KERNEL_HEAD_COMMIT=fc99f5e7ce23e4814c7b41f24c5d0296754be89e
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.185
debver: 5.10.189
debname: linux
dl_hook: dl_hook
dl_files:
linux-yocto-dafc025b033585311d1693255c80b60b690b0e54.tar.gz:
linux-yocto-fc99f5e7ce23e4814c7b41f24c5d0296754be89e.tar.gz:
topdir: null
url:
"https://git.yoctoproject.org/linux-yocto/snapshot/\
linux-yocto-dafc025b033585311d1693255c80b60b690b0e54.tar.gz"
sha256sum: f84d3300ca76f11f1f7607f8445704442a850163473fd2058a0f60e27f55e365
linux-yocto-fc99f5e7ce23e4814c7b41f24c5d0296754be89e.tar.gz"
sha256sum: 9a13f9184be793728477a29a184743f735cd7682d44bb67cbf65a174c8cbe262
linux_5.10.28-1.debian.tar.xz:
topdir: null
url:

14
kernel-std/debian/patches/0056-Port-negative-dentries-limit-feature-from-3.10.patch
View File

@ -22,13 +22,15 @@ different location, requiring a procedure call to obtain
more calls into iterate_super
Signed-off-by: Jim Somerville <jim.somerville@windriver.com>
[zp: Adapted the patch for context and code changes.]
Signed-off-by: Peng Zhang <Peng.Zhang2@windriver.com>
---
fs/dcache.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++-
kernel/sysctl.c | 12 ++++
2 files changed, 188 insertions(+), 2 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index 26a187abf13a..ef4e1a7352c2 100644
index 30dec5522..51bafdd49 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -32,6 +32,7 @@
@ -177,7 +179,7 @@ index 26a187abf13a..ef4e1a7352c2 100644
static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,
struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)
{
@@ -1617,6 +1711,86 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
@@ -1618,6 +1712,86 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
return D_WALK_CONTINUE;
}
@ -265,7 +267,7 @@ index 26a187abf13a..ef4e1a7352c2 100644
{
shrink_dcache_parent(dentry);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index afad085960b8..18ea5c796519 100644
index a45f0dd10..034517367 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -106,6 +106,9 @@
@ -278,7 +280,7 @@ index afad085960b8..18ea5c796519 100644
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
static int sixty = 60;
@@ -3337,6 +3340,15 @@ static struct ctl_table fs_table[] = {
@@ -3416,6 +3419,15 @@ static struct ctl_table fs_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ONE,
},
@ -289,11 +291,11 @@ index afad085960b8..18ea5c796519 100644
+ .mode = 0644,
+ .proc_handler = proc_dcache_negative_dentry_limit,
+ .extra1 = &zero_ul,
+ .extra2 = &one_hundred,
+ .extra2 = SYSCTL_ONE_HUNDRED,
+ },
{ }
};
--
2.25.1
2.30.2