]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net/mlx5e: CT: extract a memcmp from a spinlock section
authorCosmin Ratiu <cratiu@nvidia.com>
Tue, 8 Jul 2025 21:16:24 +0000 (00:16 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 10 Jul 2025 02:47:43 +0000 (19:47 -0700)
This reduces the time the lock is held and reduces contention.

Signed-off-by: Cosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1752009387-13300-3-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

index 81332cd4a5824f35975ba9a9bebabb894ee1d03b..870d12364f99e1d07daf171ebf71b9c7bbced82d 100644 (file)
@@ -1195,6 +1195,7 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
        struct flow_action_entry *meta_action;
        unsigned long cookie = flow->cookie;
        struct mlx5_ct_entry *entry;
+       bool has_nat;
        int err;
 
        meta_action = mlx5_tc_ct_get_ct_metadata_action(flow_rule);
@@ -1236,6 +1237,8 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
        err = mlx5_tc_ct_rule_to_tuple_nat(&entry->tuple_nat, flow_rule);
        if (err)
                goto err_set;
+       has_nat = memcmp(&entry->tuple, &entry->tuple_nat,
+                        sizeof(entry->tuple));
 
        spin_lock_bh(&ct_priv->ht_lock);
 
@@ -1244,7 +1247,7 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
        if (err)
                goto err_entries;
 
-       if (memcmp(&entry->tuple, &entry->tuple_nat, sizeof(entry->tuple))) {
+       if (has_nat) {
                err = rhashtable_lookup_insert_fast(&ct_priv->ct_tuples_nat_ht,
                                                    &entry->tuple_nat_node,
                                                    tuples_nat_ht_params);