This is a note to let you know that I've just added the patch titled
netfilter: nf_tables: add rescheduling points during loop detection walks
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nf_tables-add-rescheduling-points-during-loop-detection-walks.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From pablo@xxxxxxxxxxxxx Wed Jul 5 18:55:22 2023
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date: Wed, 5 Jul 2023 18:55:08 +0200
Subject: netfilter: nf_tables: add rescheduling points during loop detection walks
To: netfilter-devel@xxxxxxxxxxxxxxx
Cc: sashal@xxxxxxxxxx, gregkh@xxxxxxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx
Message-ID: <20230705165516.50145-3-pablo@xxxxxxxxxxxxx>
From: Florian Westphal <fw@xxxxxxxxx>
[ 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 <fw@xxxxxxxxx>
Acked-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/netfilter/nf_tables_api.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2552,6 +2552,8 @@ int nft_chain_validate(const struct nft_
if (err < 0)
return err;
}
+
+ cond_resched();
}
return 0;
@@ -6956,9 +6958,13 @@ static int nf_tables_check_loops(const s
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) ||
Patches currently in stable-queue which might be from pablo@xxxxxxxxxxxxx are
queue-4.19/netfilter-nf_tables-fix-scheduling-while-atomic-splat.patch
queue-4.19/netfilter-nf_tables-reject-unbound-anonymous-set-before-commit-phase.patch
queue-4.19/netfilter-nf_tables-use-net_generic-infra-for-transaction-data.patch
queue-4.19/netfilter-nf_tables-fix-nat-hook-table-deletion.patch
queue-4.19/netfilter-nf_tables-incorrect-error-path-handling-with-nft_msg_newrule.patch
queue-4.19/gtp-fix-use-after-free-in-__gtp_encap_destroy.patch
queue-4.19/netfilter-nftables-add-helper-function-to-set-the-base-sequence-number.patch
queue-4.19/netfilter-nf_tables-add-rescheduling-points-during-loop-detection-walks.patch
queue-4.19/lib-ts_bm-reset-initial-match-offset-for-every-block.patch
queue-4.19/netfilter-nf_tables-add-nft_trans_prepare_error-to-deal-with-bound-set-chain.patch
queue-4.19/netfilter-nf_conntrack_sip-fix-the-ct_sip_parse_nume.patch
queue-4.19/netfilter-add-helper-function-to-set-up-the-nfnetlink-header-and-use-it.patch
queue-4.19/netfilter-nf_tables-unbind-non-anonymous-set-if-rule-construction-fails.patch
