dropped some duplicated patches

diff --git a/queue-5.15/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch b/queue-5.15/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
deleted file mode 100644 (file)
index dbe7936..0000000
--- a/queue-5.15/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0099073d67d434c3e9140697d9c99182ce276fa3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Oct 2023 13:12:58 +0200
-Subject: netfilter: nf_tables: do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit ebd032fa881882fef2acb9da1bbde48d8233241d ]
-
-pipapo set backend maintains two copies of the datastructure, removing
-the elements from the copy that is going to be discarded slows down
-the abort path significantly, from several minutes to few seconds after
-this patch.
-
-Fixes: 212ed75dc5fb ("netfilter: nf_tables: integrate pipapo into commit protocol")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index 8a4cd1c16e0e4..cd4318cbcaa39 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -9713,7 +9713,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      nft_setelem_remove(net, te->set, &te->elem);
-+                      if (!te->set->ops->abort ||
-+                          nft_setelem_is_catchall(te->set, &te->elem))
-+                              nft_setelem_remove(net, te->set, &te->elem);
-+
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-5.15/netfilter-nf_tables-revert-do-not-remove-elements-if.patch b/queue-5.15/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
deleted file mode 100644 (file)
index 89668e5..0000000
--- a/queue-5.15/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 50d86f272bb83ac65b42c1925af2837f619e8804 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Oct 2023 13:18:39 +0200
-Subject: netfilter: nf_tables: revert do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit f86fb94011aeb3b26337fc22204ca726aeb8bc24 ]
-
-nf_tables_abort_release() path calls nft_set_elem_destroy() for
-NFT_MSG_NEWSETELEM which releases the element, however, a reference to
-the element still remains in the working copy.
-
-Fixes: ebd032fa8818 ("netfilter: nf_tables: do not remove elements if set backend implements .abort")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index cd4318cbcaa39..8a4cd1c16e0e4 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -9713,10 +9713,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      if (!te->set->ops->abort ||
--                          nft_setelem_is_catchall(te->set, &te->elem))
--                              nft_setelem_remove(net, te->set, &te->elem);
--
-+                      nft_setelem_remove(net, te->set, &te->elem);
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index c796a45960c2b83335d03d62e85b2e08984321ab..2bbe597552e8f6ed2bb5fb399652071a6d27ad87 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -98,11 +98,9 @@ btrfs-error-when-cowing-block-from-a-root-that-is-be.patch
 btrfs-error-out-when-reallocating-block-for-defrag-u.patch
 hid-multitouch-add-required-quirk-for-synaptics-0xcd.patch
 platform-x86-touchscreen_dmi-add-info-for-the-positi.patch
-netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
 net-mlx5-handle-fw-tracer-change-ownership-event-bas.patch
 devlink-make-devlink_register-to-be-void.patch
 bluetooth-hci_event-fix-using-memcmp-when-comparing-.patch
-netfilter-nf_tables-revert-do-not-remove-elements-if.patch
 net-introduce-a-function-to-check-if-a-netdev-name-i.patch
 net-move-from-strlcpy-with-unused-retval-to-strscpy.patch
 net-fix-ifname-in-netlink-ntf-during-netns-move.patch

diff --git a/queue-6.1/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch b/queue-6.1/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
deleted file mode 100644 (file)
index 001fba7..0000000
--- a/queue-6.1/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ba39eabcdc1e1f894d45daaa82a41111a377f7dc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Oct 2023 13:12:58 +0200
-Subject: netfilter: nf_tables: do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit ebd032fa881882fef2acb9da1bbde48d8233241d ]
-
-pipapo set backend maintains two copies of the datastructure, removing
-the elements from the copy that is going to be discarded slows down
-the abort path significantly, from several minutes to few seconds after
-this patch.
-
-Fixes: 212ed75dc5fb ("netfilter: nf_tables: integrate pipapo into commit protocol")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index 5e3dbe2652dbd..8ab545802dd15 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -9931,7 +9931,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      nft_setelem_remove(net, te->set, &te->elem);
-+                      if (!te->set->ops->abort ||
-+                          nft_setelem_is_catchall(te->set, &te->elem))
-+                              nft_setelem_remove(net, te->set, &te->elem);
-+
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-6.1/netfilter-nf_tables-revert-do-not-remove-elements-if.patch b/queue-6.1/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
deleted file mode 100644 (file)
index 419cbdc..0000000
--- a/queue-6.1/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8f06b0849f28567f375bb02ef66207b3656145bc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Oct 2023 13:18:39 +0200
-Subject: netfilter: nf_tables: revert do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit f86fb94011aeb3b26337fc22204ca726aeb8bc24 ]
-
-nf_tables_abort_release() path calls nft_set_elem_destroy() for
-NFT_MSG_NEWSETELEM which releases the element, however, a reference to
-the element still remains in the working copy.
-
-Fixes: ebd032fa8818 ("netfilter: nf_tables: do not remove elements if set backend implements .abort")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index 8ab545802dd15..5e3dbe2652dbd 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -9931,10 +9931,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      if (!te->set->ops->abort ||
--                          nft_setelem_is_catchall(te->set, &te->elem))
--                              nft_setelem_remove(net, te->set, &te->elem);
--
-+                      nft_setelem_remove(net, te->set, &te->elem);
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 3a3a7fae345ddf532e69907e18459a1bb34975f0..2819466ac3591ab184420e5cf983b58607de2a22 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -138,7 +138,6 @@ net-dst-prevent-false-sharing-vs.-dst_entry-__refcnt.patch
 net-dst-switch-to-rcuref_t-reference-counting.patch
 net-dst-fix-missing-initialization-of-rt_uncached.patch
 xfrm6-fix-inet6_dev-refcount-underflow-problem.patch
-netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
 net-mlx5-e-switch-register-event-handler-before-armi.patch
 net-mlx5-handle-fw-tracer-change-ownership-event-bas.patch
 net-mlx5e-don-t-offload-internal-port-if-filter-devi.patch
@@ -147,7 +146,6 @@ tcp-allow-again-tcp_disconnect-when-threads-are-wait.patch
 ice-remove-redundant-pci_enable_pcie_error_reporting.patch
 bluetooth-hci_event-fix-using-memcmp-when-comparing-.patch
 selftests-openvswitch-add-version-check-for-pyroute2.patch
-netfilter-nf_tables-revert-do-not-remove-elements-if.patch
 tcp_bpf-properly-release-resources-on-error-paths.patch
 net-devlink-convert-devlink-port-type-specific-point.patch
 net-devlink-move-port_type_warn_schedule-call-to-__d.patch

diff --git a/queue-6.5/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch b/queue-6.5/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
deleted file mode 100644 (file)
index 11c4537..0000000
--- a/queue-6.5/netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5134a5b5531b39ff0a1cc717f8397b1f2ec35970 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Oct 2023 13:12:58 +0200
-Subject: netfilter: nf_tables: do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit ebd032fa881882fef2acb9da1bbde48d8233241d ]
-
-pipapo set backend maintains two copies of the datastructure, removing
-the elements from the copy that is going to be discarded slows down
-the abort path significantly, from several minutes to few seconds after
-this patch.
-
-Fixes: 212ed75dc5fb ("netfilter: nf_tables: integrate pipapo into commit protocol")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index e43d9508e7a9c..0d48d2e27a1ad 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -10336,7 +10336,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      nft_setelem_remove(net, te->set, &te->elem);
-+                      if (!te->set->ops->abort ||
-+                          nft_setelem_is_catchall(te->set, &te->elem))
-+                              nft_setelem_remove(net, te->set, &te->elem);
-+
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-6.5/netfilter-nf_tables-revert-do-not-remove-elements-if.patch b/queue-6.5/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
deleted file mode 100644 (file)
index 56235ea..0000000
--- a/queue-6.5/netfilter-nf_tables-revert-do-not-remove-elements-if.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3538f84c2bad0acbf3bd5116110d8d96f8f78fe6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Oct 2023 13:18:39 +0200
-Subject: netfilter: nf_tables: revert do not remove elements if set backend
- implements .abort
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[ Upstream commit f86fb94011aeb3b26337fc22204ca726aeb8bc24 ]
-
-nf_tables_abort_release() path calls nft_set_elem_destroy() for
-NFT_MSG_NEWSETELEM which releases the element, however, a reference to
-the element still remains in the working copy.
-
-Fixes: ebd032fa8818 ("netfilter: nf_tables: do not remove elements if set backend implements .abort")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/netfilter/nf_tables_api.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index 0d48d2e27a1ad..e43d9508e7a9c 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -10336,10 +10336,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
-                               break;
-                       }
-                       te = (struct nft_trans_elem *)trans->data;
--                      if (!te->set->ops->abort ||
--                          nft_setelem_is_catchall(te->set, &te->elem))
--                              nft_setelem_remove(net, te->set, &te->elem);
--
-+                      nft_setelem_remove(net, te->set, &te->elem);
-                       if (!nft_setelem_is_catchall(te->set, &te->elem))
-                               atomic_dec(&te->set->nelems);
- 
--- 
-2.40.1
-

diff --git a/queue-6.5/series b/queue-6.5/series
index 96cbc9e526043f4211ad92daec3674416fcf30cc..d241d33cb900b763e50b76f8acf8ebbf8163ac37 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -146,7 +146,6 @@ bluetooth-hci_sync-introduce-ptr_uint-uint_ptr-macro.patch
 bluetooth-iso-fix-invalid-context-error.patch
 bluetooth-hci_sync-delete-cis-in-bt_open-connect-bou.patch
 bluetooth-hci_sync-always-check-if-connection-is-ali.patch
-netfilter-nf_tables-do-not-remove-elements-if-set-ba.patch
 net-mlx5-e-switch-register-event-handler-before-armi.patch
 net-mlx5-handle-fw-tracer-change-ownership-event-bas.patch
 net-mlx5e-rx-fix-page_pool-allocation-failure-recove.patch
@@ -161,7 +160,6 @@ net-smc-support-smc-release-version-negotiation-in-c.patch
 net-smc-support-smc-v2.x-features-validate.patch
 net-smc-fix-smc-clc-failed-issue-when-netdevice-not-.patch
 bluetooth-hci_event-fix-using-memcmp-when-comparing-.patch
-netfilter-nf_tables-revert-do-not-remove-elements-if.patch
 tcp_bpf-properly-release-resources-on-error-paths.patch
 net-store-netdevs-in-an-xarray.patch
 net-move-altnames-together-with-the-netdevice.patch