From: Saeed Mahameed <saeedm@nvidia.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, Mark Bloch <mbloch@nvidia.com>,
Maor Gottlieb <maorg@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: [net-next 09/15] net/mlx5: fs, refactor software deletion rule
Date: Mon, 2 May 2022 21:42:03 -0700 [thread overview]
Message-ID: <20220503044209.622171-10-saeedm@nvidia.com> (raw)
In-Reply-To: <20220503044209.622171-1-saeedm@nvidia.com>
From: Mark Bloch <mbloch@nvidia.com>
When deleting a rule make sure that for every type dests_size is
decreased only once and no other logic is executed.
Without this dests_size might be decreased twice when dests_size == 1
so the if for that type won't be entered and if action has
MLX5_FLOW_CONTEXT_ACTION_FWD_DEST set dests_size will be decreased again.
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 297e6a468a3e..ae83962fc5fc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -550,8 +550,8 @@ static void del_sw_hw_rule(struct fs_node *node)
mutex_unlock(&rule->dest_attr.ft->lock);
}
- if (rule->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_COUNTER &&
- --fte->dests_size) {
+ if (rule->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_COUNTER) {
+ --fte->dests_size;
fte->modify_mask |=
BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_ACTION) |
BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_FLOW_COUNTERS);
@@ -559,15 +559,15 @@ static void del_sw_hw_rule(struct fs_node *node)
goto out;
}
- if (rule->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_PORT &&
- --fte->dests_size) {
+ if (rule->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_PORT) {
+ --fte->dests_size;
fte->modify_mask |= BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_ACTION);
fte->action.action &= ~MLX5_FLOW_CONTEXT_ACTION_ALLOW;
goto out;
}
- if ((fte->action.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
- --fte->dests_size) {
+ if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
+ --fte->dests_size;
fte->modify_mask |=
BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_DESTINATION_LIST);
}
--
2.35.1
next prev parent reply other threads:[~2022-05-03 4:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 4:41 [pull request][net-next 00/15] mlx5 updates 2022-05-02 Saeed Mahameed
2022-05-03 4:41 ` [net-next 01/15] net/mlx5: use kvfree() for kvzalloc() in mlx5_ct_fs_smfs_matcher_create Saeed Mahameed
2022-05-03 11:00 ` patchwork-bot+netdevbpf
2022-05-03 4:41 ` [net-next 02/15] net/mlx5: Remove useless kfree Saeed Mahameed
2022-05-03 4:41 ` [net-next 03/15] net/mlx5: Delete redundant default assignment of runtime devlink params Saeed Mahameed
2022-05-03 4:41 ` [net-next 04/15] net/mlx5: Print initializing field in case of timeout Saeed Mahameed
2022-05-03 4:41 ` [net-next 05/15] net/mlx5e: Drop error CQE handling from the XSK RX handler Saeed Mahameed
2022-05-03 4:42 ` [net-next 06/15] net/mlx5e: Remove unused mlx5e_dcbnl_build_rep_netdev function Saeed Mahameed
2022-05-03 4:42 ` [net-next 07/15] net/mlx5e: TC, set proper dest type Saeed Mahameed
2022-05-03 4:42 ` [net-next 08/15] net/mlx5: fs, split software and IFC flow destination definitions Saeed Mahameed
2022-05-03 4:42 ` Saeed Mahameed [this message]
2022-05-03 4:42 ` [net-next 10/15] net/mlx5: fs, jump to exit point and don't fall through Saeed Mahameed
2022-05-03 4:42 ` [net-next 11/15] net/mlx5: fs, add unused destination type Saeed Mahameed
2022-05-03 4:42 ` [net-next 12/15] net/mlx5: fs, do proper bookkeeping for forward destinations Saeed Mahameed
2022-05-03 4:42 ` [net-next 13/15] net/mlx5: fs, delete the FTE when there are no rules attached to it Saeed Mahameed
2022-05-03 4:42 ` [net-next 14/15] net/mlx5: fs, call the deletion function of the node Saeed Mahameed
2022-05-03 4:42 ` [net-next 15/15] net/mlx5: fs, an FTE should have no dests when deleted Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220503044209.622171-10-saeedm@nvidia.com \
--to=saeedm@nvidia.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=maorg@nvidia.com \
--cc=mbloch@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).