From cd3fe52be6c3ce6b05b857d44a725b19e8be2b97 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:01:08 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.220 (#12265) --- include/kernel-5.10 | 4 +- ...SSC-helper-should-use-its-own-config.patch | 140 ------------------ ...ve-ifdef-CONFIG_NFSD-from-client-SSC.patch | 84 ----------- .../generic/hack-5.10/204-module_strip.patch | 4 +- .../generic/hack-5.10/902-debloat_proc.patch | 2 +- 5 files changed, 5 insertions(+), 229 deletions(-) delete mode 100644 target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch delete mode 100644 target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 5c8eca928..90467d65a 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .219 -LINUX_KERNEL_HASH-5.10.219 = 93b73f15cc376463e6422cce09ccd9d0a20fb113921ffebddf3352c44d84cd30 +LINUX_VERSION-5.10 = .220 +LINUX_KERNEL_HASH-5.10.220 = 7cc3aff924e9707a5dbf1200c79a7f01617e097b9b175d02bda8ca762aeee19b diff --git a/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch b/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch deleted file mode 100644 index 8517bd7bb..000000000 --- a/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 02591f9febd5f69bb4c266a4abf899c4cf21964f Mon Sep 17 00:00:00 2001 -From: Dai Ngo -Date: Thu, 28 Jan 2021 01:42:26 -0500 -Subject: [PATCH] NFSv4_2: SSC helper should use its own config. - -Currently NFSv4_2 SSC helper, nfs_ssc, incorrectly uses GRACE_PERIOD -as its config. Fix by adding new config NFS_V4_2_SSC_HELPER which -depends on NFS_V4_2 and is automatically selected when NFSD_V4 is -enabled. Also removed the file name from a comment in nfs_ssc.c. - -Signed-off-by: Dai Ngo -Signed-off-by: Chuck Lever ---- - fs/Kconfig | 4 ++++ - fs/nfs/nfs4file.c | 4 ++++ - fs/nfs/super.c | 12 ++++++++++++ - fs/nfs_common/Makefile | 2 +- - fs/nfs_common/nfs_ssc.c | 2 -- - fs/nfsd/Kconfig | 1 + - 6 files changed, 22 insertions(+), 3 deletions(-) - ---- a/fs/Kconfig -+++ b/fs/Kconfig -@@ -333,6 +333,10 @@ config NFS_COMMON - depends on NFSD || NFS_FS || LOCKD - default y - -+config NFS_V4_2_SSC_HELPER -+ tristate -+ default y if NFS_V4=y || NFS_FS=y -+ - source "net/sunrpc/Kconfig" - source "fs/ceph/Kconfig" - source "fs/cifs/Kconfig" ---- a/fs/nfs/nfs4file.c -+++ b/fs/nfs/nfs4file.c -@@ -430,7 +430,9 @@ static const struct nfs4_ssc_client_ops - */ - void nfs42_ssc_register_ops(void) - { -+#ifdef CONFIG_NFSD_V4 - nfs42_ssc_register(&nfs4_ssc_clnt_ops_tbl); -+#endif - } - - /** -@@ -441,7 +443,9 @@ void nfs42_ssc_register_ops(void) - */ - void nfs42_ssc_unregister_ops(void) - { -+#ifdef CONFIG_NFSD_V4 - nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl); -+#endif - } - #endif /* CONFIG_NFS_V4_2 */ - ---- a/fs/nfs/super.c -+++ b/fs/nfs/super.c -@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = - }; - EXPORT_SYMBOL_GPL(nfs_sops); - -+#ifdef CONFIG_NFS_V4_2 - static const struct nfs_ssc_client_ops nfs_ssc_clnt_ops_tbl = { - .sco_sb_deactive = nfs_sb_deactive, - }; -+#endif - - #if IS_ENABLED(CONFIG_NFS_V4) - static int __init register_nfs4_fs(void) -@@ -111,15 +113,21 @@ static void unregister_nfs4_fs(void) - } - #endif - -+#ifdef CONFIG_NFS_V4_2 - static void nfs_ssc_register_ops(void) - { -+#ifdef CONFIG_NFSD_V4 - nfs_ssc_register(&nfs_ssc_clnt_ops_tbl); -+#endif - } - - static void nfs_ssc_unregister_ops(void) - { -+#ifdef CONFIG_NFSD_V4 - nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl); -+#endif - } -+#endif /* CONFIG_NFS_V4_2 */ - - static struct shrinker acl_shrinker = { - .count_objects = nfs_access_cache_count, -@@ -148,7 +156,9 @@ int __init register_nfs_fs(void) - ret = register_shrinker(&acl_shrinker); - if (ret < 0) - goto error_3; -+#ifdef CONFIG_NFS_V4_2 - nfs_ssc_register_ops(); -+#endif - return 0; - error_3: - nfs_unregister_sysctl(); -@@ -168,7 +178,9 @@ void __exit unregister_nfs_fs(void) - unregister_shrinker(&acl_shrinker); - nfs_unregister_sysctl(); - unregister_nfs4_fs(); -+#ifdef CONFIG_NFS_V4_2 - nfs_ssc_unregister_ops(); -+#endif - unregister_filesystem(&nfs_fs_type); - } - ---- a/fs/nfs_common/Makefile -+++ b/fs/nfs_common/Makefile -@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl - nfs_acl-objs := nfsacl.o - - obj-$(CONFIG_GRACE_PERIOD) += grace.o --obj-$(CONFIG_GRACE_PERIOD) += nfs_ssc.o -+obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o ---- a/fs/nfs_common/nfs_ssc.c -+++ b/fs/nfs_common/nfs_ssc.c -@@ -1,7 +1,5 @@ - // SPDX-License-Identifier: GPL-2.0-only - /* -- * fs/nfs_common/nfs_ssc_comm.c -- * - * Helper for knfsd's SSC to access ops in NFS client modules - * - * Author: Dai Ngo ---- a/fs/nfsd/Kconfig -+++ b/fs/nfsd/Kconfig -@@ -77,6 +77,7 @@ config NFSD_V4 - select CRYPTO_MD5 - select CRYPTO_SHA256 - select GRACE_PERIOD -+ select NFS_V4_2_SSC_HELPER if NFS_V4_2 - help - This option enables support in your system's NFS server for - version 4 of the NFS protocol (RFC 3530). diff --git a/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch b/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch deleted file mode 100644 index 84c68e142..000000000 --- a/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d9092b4bb2109502eb8972021a3f74febc931a63 Mon Sep 17 00:00:00 2001 -From: Dai Ngo -Date: Thu, 22 Apr 2021 03:37:49 -0400 -Subject: [PATCH] NFSv4.2: Remove ifdef CONFIG_NFSD from NFSv4.2 client SSC - code. - -The client SSC code should not depend on any of the CONFIG_NFSD config. -This patch removes all CONFIG_NFSD from NFSv4.2 client SSC code and -simplifies the config of CONFIG_NFS_V4_2_SSC_HELPER, NFSD_V4_2_INTER_SSC. - -Signed-off-by: Dai Ngo -Signed-off-by: Trond Myklebust ---- - fs/Kconfig | 4 ++-- - fs/nfs/nfs4file.c | 4 ---- - fs/nfs/super.c | 4 ---- - fs/nfsd/Kconfig | 2 +- - 4 files changed, 3 insertions(+), 11 deletions(-) - ---- a/fs/Kconfig -+++ b/fs/Kconfig -@@ -334,8 +334,8 @@ config NFS_COMMON - default y - - config NFS_V4_2_SSC_HELPER -- tristate -- default y if NFS_V4=y || NFS_FS=y -+ bool -+ default y if NFS_V4_2 - - source "net/sunrpc/Kconfig" - source "fs/ceph/Kconfig" ---- a/fs/nfs/nfs4file.c -+++ b/fs/nfs/nfs4file.c -@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops - */ - void nfs42_ssc_register_ops(void) - { --#ifdef CONFIG_NFSD_V4 - nfs42_ssc_register(&nfs4_ssc_clnt_ops_tbl); --#endif - } - - /** -@@ -443,9 +441,7 @@ void nfs42_ssc_register_ops(void) - */ - void nfs42_ssc_unregister_ops(void) - { --#ifdef CONFIG_NFSD_V4 - nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl); --#endif - } - #endif /* CONFIG_NFS_V4_2 */ - ---- a/fs/nfs/super.c -+++ b/fs/nfs/super.c -@@ -116,16 +116,12 @@ static void unregister_nfs4_fs(void) - #ifdef CONFIG_NFS_V4_2 - static void nfs_ssc_register_ops(void) - { --#ifdef CONFIG_NFSD_V4 - nfs_ssc_register(&nfs_ssc_clnt_ops_tbl); --#endif - } - - static void nfs_ssc_unregister_ops(void) - { --#ifdef CONFIG_NFSD_V4 - nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl); --#endif - } - #endif /* CONFIG_NFS_V4_2 */ - ---- a/fs/nfsd/Kconfig -+++ b/fs/nfsd/Kconfig -@@ -138,7 +138,7 @@ config NFSD_FLEXFILELAYOUT - - config NFSD_V4_2_INTER_SSC - bool "NFSv4.2 inter server to server COPY" -- depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2 -+ depends on NFSD_V4 && NFS_V4_2 - help - This option enables support for NFSv4.2 inter server to - server copy where the destination server calls the NFSv4.2 diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index 17e34524c..1db015f68 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3262,9 +3262,11 @@ static int setup_load_info(struct load_i +@@ -3254,9 +3254,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3285,6 +3287,7 @@ static int check_modinfo(struct module * +@@ -3277,6 +3279,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch index d5440e419..8bb572e42 100644 --- a/target/linux/generic/hack-5.10/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau --- a/fs/locks.c +++ b/fs/locks.c -@@ -3016,6 +3016,8 @@ static const struct seq_operations locks +@@ -3076,6 +3076,8 @@ static const struct seq_operations locks static int __init proc_locks_init(void) {