From: Greg Kroah-Hartman Date: Tue, 16 Aug 2022 09:22:42 +0000 (+0200) Subject: drop netfilter-nf_tables-add-rescheduling-points-during-l.patch from all queues. X-Git-Tag: v5.15.61~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cbeabd18640def1a46e69db938ac7e84a1772de;p=thirdparty%2Fkernel%2Fstable-queue.git drop netfilter-nf_tables-add-rescheduling-points-during-l.patch from all queues. --- diff --git a/queue-4.19/netfilter-nf_tables-add-rescheduling-points-during-l.patch b/queue-4.19/netfilter-nf_tables-add-rescheduling-points-during-l.patch deleted file mode 100644 index 235a7b53076..00000000000 --- a/queue-4.19/netfilter-nf_tables-add-rescheduling-points-during-l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4a32dc585d23095db5a157c744287d5f6bcef5ca Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 26 Jul 2022 12:44:35 +0200 -Subject: netfilter: nf_tables: add rescheduling points during loop detection - walks - -From: Florian Westphal - -[ Upstream commit 81ea010667417ef3f218dfd99b69769fe66c2b67 ] - -Add explicit rescheduling points during ruleset walk. - -Switching to a faster algorithm is possible but this is a much -smaller change, suitable for nf tree. - -Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460 -Signed-off-by: Florian Westphal -Acked-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_tables_api.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 15cc05bc65f1..ac1cee5803ec 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -2551,6 +2551,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) - if (err < 0) - return err; - } -+ -+ cond_resched(); - } - - return 0; -@@ -6910,9 +6912,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, - break; - } - } -+ -+ cond_resched(); - } - - list_for_each_entry(set, &ctx->table->sets, list) { -+ cond_resched(); -+ - if (!nft_is_active_next(ctx->net, set)) - continue; - if (!(set->flags & NFT_SET_MAP) || --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 14f665e7bb6..f85f92561f8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -53,7 +53,6 @@ arm64-dts-qcom-ipq8074-fix-nand-node-name.patch hwmon-sht15-fix-wrong-assumptions-in-device-remove-c.patch pm-hibernate-defer-device-probing-when-resuming-from.patch selinux-add-boundary-check-in-put_entry.patch -netfilter-nf_tables-add-rescheduling-points-during-l.patch arm-findbit-fix-overflowing-offset.patch meson-mx-socinfo-fix-refcount-leak-in-meson_mx_socin.patch arm-bcm-fix-refcount-leak-in-bcm_kona_smc_init.patch diff --git a/queue-5.10/netfilter-nf_tables-add-rescheduling-points-during-l.patch b/queue-5.10/netfilter-nf_tables-add-rescheduling-points-during-l.patch deleted file mode 100644 index 6eea258878b..00000000000 --- a/queue-5.10/netfilter-nf_tables-add-rescheduling-points-during-l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4da556906e7409f356f4cf3c146829c771debbc8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 26 Jul 2022 12:44:35 +0200 -Subject: netfilter: nf_tables: add rescheduling points during loop detection - walks - -From: Florian Westphal - -[ Upstream commit 81ea010667417ef3f218dfd99b69769fe66c2b67 ] - -Add explicit rescheduling points during ruleset walk. - -Switching to a faster algorithm is possible but this is a much -smaller change, suitable for nf tree. - -Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460 -Signed-off-by: Florian Westphal -Acked-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_tables_api.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 2ba48f4e2d7d..7d6325ba15db 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -3128,6 +3128,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) - if (err < 0) - return err; - } -+ -+ cond_resched(); - } - - return 0; -@@ -8427,9 +8429,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, - break; - } - } -+ -+ cond_resched(); - } - - list_for_each_entry(set, &ctx->table->sets, list) { -+ cond_resched(); -+ - if (!nft_is_active_next(ctx->net, set)) - continue; - if (!(set->flags & NFT_SET_MAP) || --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 8130d962fc9..ff638edd917 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -107,7 +107,6 @@ pm-hibernate-defer-device-probing-when-resuming-from.patch selinux-add-boundary-check-in-put_entry.patch powerpc-64s-disable-stack-variable-initialisation-fo.patch spi-spi-rspi-fix-pio-fallback-on-rz-platforms.patch -netfilter-nf_tables-add-rescheduling-points-during-l.patch arm-findbit-fix-overflowing-offset.patch meson-mx-socinfo-fix-refcount-leak-in-meson_mx_socin.patch arm64-dts-renesas-beacon-fix-regulator-node-names.patch diff --git a/queue-5.15/netfilter-nf_tables-add-rescheduling-points-during-l.patch b/queue-5.15/netfilter-nf_tables-add-rescheduling-points-during-l.patch deleted file mode 100644 index c3794ea541d..00000000000 --- a/queue-5.15/netfilter-nf_tables-add-rescheduling-points-during-l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cb18ae0ad6de7e17090c7c780933c075c6898f9d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 26 Jul 2022 12:44:35 +0200 -Subject: netfilter: nf_tables: add rescheduling points during loop detection - walks - -From: Florian Westphal - -[ Upstream commit 81ea010667417ef3f218dfd99b69769fe66c2b67 ] - -Add explicit rescheduling points during ruleset walk. - -Switching to a faster algorithm is possible but this is a much -smaller change, suitable for nf tree. - -Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460 -Signed-off-by: Florian Westphal -Acked-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_tables_api.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 13d14fcc2371..3d52a08bd560 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -3248,6 +3248,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) - if (err < 0) - return err; - } -+ -+ cond_resched(); - } - - return 0; -@@ -9225,9 +9227,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, - break; - } - } -+ -+ cond_resched(); - } - - list_for_each_entry(set, &ctx->table->sets, list) { -+ cond_resched(); -+ - if (!nft_is_active_next(ctx->net, set)) - continue; - if (!(set->flags & NFT_SET_MAP) || --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 687572698aa..7f908736412 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -151,7 +151,6 @@ kasan-test-silence-gcc-12-warnings.patch drm-amdgpu-remove-one-duplicated-ef-removal.patch powerpc-64s-disable-stack-variable-initialisation-fo.patch spi-spi-rspi-fix-pio-fallback-on-rz-platforms.patch -netfilter-nf_tables-add-rescheduling-points-during-l.patch arm-findbit-fix-overflowing-offset.patch meson-mx-socinfo-fix-refcount-leak-in-meson_mx_socin.patch arm64-dts-renesas-beacon-fix-regulator-node-names.patch diff --git a/queue-5.18/netfilter-nf_tables-add-rescheduling-points-during-l.patch b/queue-5.18/netfilter-nf_tables-add-rescheduling-points-during-l.patch deleted file mode 100644 index 675a7cd8a5a..00000000000 --- a/queue-5.18/netfilter-nf_tables-add-rescheduling-points-during-l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0c28160ce56ea8c55964e56746d34d3ac1175f02 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 26 Jul 2022 12:44:35 +0200 -Subject: netfilter: nf_tables: add rescheduling points during loop detection - walks - -From: Florian Westphal - -[ Upstream commit 81ea010667417ef3f218dfd99b69769fe66c2b67 ] - -Add explicit rescheduling points during ruleset walk. - -Switching to a faster algorithm is possible but this is a much -smaller change, suitable for nf tree. - -Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460 -Signed-off-by: Florian Westphal -Acked-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_tables_api.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 2b60923cf87b..7eac496961a7 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -3343,6 +3343,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) - if (err < 0) - return err; - } -+ -+ cond_resched(); - } - - return 0; -@@ -9371,9 +9373,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, - break; - } - } -+ -+ cond_resched(); - } - - list_for_each_entry(set, &ctx->table->sets, list) { -+ cond_resched(); -+ - if (!nft_is_active_next(ctx->net, set)) - continue; - if (!(set->flags & NFT_SET_MAP) || --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 83ddd0b33e8..c58a6594b98 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -182,7 +182,6 @@ pinctrl-don-t-allow-pinctrl_amd-to-be-a-module.patch drm-amdgpu-remove-one-duplicated-ef-removal.patch powerpc-64s-disable-stack-variable-initialisation-fo.patch spi-spi-rspi-fix-pio-fallback-on-rz-platforms.patch -netfilter-nf_tables-add-rescheduling-points-during-l.patch netfilter-nft_queue-only-allow-supported-familes-and.patch arm-findbit-fix-overflowing-offset.patch meson-mx-socinfo-fix-refcount-leak-in-meson_mx_socin.patch diff --git a/queue-5.4/netfilter-nf_tables-add-rescheduling-points-during-l.patch b/queue-5.4/netfilter-nf_tables-add-rescheduling-points-during-l.patch deleted file mode 100644 index 837b77f6a71..00000000000 --- a/queue-5.4/netfilter-nf_tables-add-rescheduling-points-during-l.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3920173cb171191723ebb038ed1970da0e18f0fa Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 26 Jul 2022 12:44:35 +0200 -Subject: netfilter: nf_tables: add rescheduling points during loop detection - walks - -From: Florian Westphal - -[ Upstream commit 81ea010667417ef3f218dfd99b69769fe66c2b67 ] - -Add explicit rescheduling points during ruleset walk. - -Switching to a faster algorithm is possible but this is a much -smaller change, suitable for nf tree. - -Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460 -Signed-off-by: Florian Westphal -Acked-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_tables_api.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 3f72e31b1c7f..eb39317580e1 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -2685,6 +2685,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) - if (err < 0) - return err; - } -+ -+ cond_resched(); - } - - return 0; -@@ -7316,9 +7318,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, - break; - } - } -+ -+ cond_resched(); - } - - list_for_each_entry(set, &ctx->table->sets, list) { -+ cond_resched(); -+ - if (!nft_is_active_next(ctx->net, set)) - continue; - if (!(set->flags & NFT_SET_MAP) || --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index e4529191335..36296306a73 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -74,7 +74,6 @@ hwmon-sht15-fix-wrong-assumptions-in-device-remove-c.patch pm-hibernate-defer-device-probing-when-resuming-from.patch selinux-add-boundary-check-in-put_entry.patch spi-spi-rspi-fix-pio-fallback-on-rz-platforms.patch -netfilter-nf_tables-add-rescheduling-points-during-l.patch arm-findbit-fix-overflowing-offset.patch meson-mx-socinfo-fix-refcount-leak-in-meson_mx_socin.patch arm-bcm-fix-refcount-leak-in-bcm_kona_smc_init.patch