2022-10-06 19:40:41

by Maksym Glubokiy

[permalink] [raw]
Subject: [PATCH net] prestera: matchall: do not rollback if rule exists

From: Serhiy Boiko <[email protected]>

If you try to create a 'mirror' ACL rule on a port that already has a
mirror rule, prestera_span_rule_add() will fail with EEXIST error.

This forces rollback procedure which destroys existing mirror rule on
hardware leaving it visible in linux.

Add an explicit check for EEXIST to prevent the deletion of the existing
rule but keep user seeing error message:

$ tc filter add dev sw1p1 ... skip_sw action mirred egress mirror dev sw1p2
$ tc filter add dev sw1p1 ... skip_sw action mirred egress mirror dev sw1p3
RTNETLINK answers: File exists
We have an error talking to the kernel

Fixes: 13defa275eef ("net: marvell: prestera: Add matchall support")
Signed-off-by: Serhiy Boiko <[email protected]>
Signed-off-by: Maksym Glubokiy <[email protected]>
---
drivers/net/ethernet/marvell/prestera/prestera_matchall.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c b/drivers/net/ethernet/marvell/prestera/prestera_matchall.c
index 6f2b95a5263e..1da9c1bc1ee9 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_matchall.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_matchall.c
@@ -96,6 +96,8 @@ int prestera_mall_replace(struct prestera_flow_block *block,

list_for_each_entry(binding, &block->binding_list, list) {
err = prestera_span_rule_add(binding, port, block->ingress);
+ if (err == -EEXIST)
+ return err;
if (err)
goto rollback;
}
--
2.25.1


2022-10-07 08:48:20

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH net] prestera: matchall: do not rollback if rule exists

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Thu, 6 Oct 2022 22:04:09 +0300 you wrote:
> From: Serhiy Boiko <[email protected]>
>
> If you try to create a 'mirror' ACL rule on a port that already has a
> mirror rule, prestera_span_rule_add() will fail with EEXIST error.
>
> This forces rollback procedure which destroys existing mirror rule on
> hardware leaving it visible in linux.
>
> [...]

Here is the summary with links:
- [net] prestera: matchall: do not rollback if rule exists
https://git.kernel.org/netdev/net/c/fb4a5dfca0f0

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html