netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Eric Dumazet <edumazet@google.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>,
	netdev@vger.kernel.org, Tariq Toukan <tariqt@nvidia.com>,
	Leon Romanovsky <leonro@nvidia.com>,
	linux-rdma@vger.kernel.org, Oz Shlomo <ozsh@nvidia.com>,
	Paul Blakey <paulb@nvidia.com>
Subject: [net-next 12/15] net/mlx5e: TC, refactor access to hash key
Date: Tue,  6 Jun 2023 00:12:16 -0700	[thread overview]
Message-ID: <20230606071219.483255-13-saeed@kernel.org> (raw)
In-Reply-To: <20230606071219.483255-1-saeed@kernel.org>

From: Oz Shlomo <ozsh@nvidia.com>

Currently, a temp object is filled and used as a key for rhashtable_lookup.
Lookups will only works while key remains the first attribute in the
relevant rhashtable node object.

Fix this by passing a key, instead of a object containing the key.

Signed-off-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Paul Blakey <paulb@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
 .../net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
index 07c1895a2b23..7aa926e542d3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
@@ -25,8 +25,8 @@ struct mlx5e_tc_act_stats {
 
 static const struct rhashtable_params act_counters_ht_params = {
 	.head_offset = offsetof(struct mlx5e_tc_act_stats, hash),
-	.key_offset = 0,
-	.key_len = offsetof(struct mlx5e_tc_act_stats, counter),
+	.key_offset = offsetof(struct mlx5e_tc_act_stats, tc_act_cookie),
+	.key_len = sizeof_field(struct mlx5e_tc_act_stats, tc_act_cookie),
 	.automatic_shrinking = true,
 };
 
@@ -169,14 +169,11 @@ mlx5e_tc_act_stats_fill_stats(struct mlx5e_tc_act_stats_handle *handle,
 {
 	struct rhashtable *ht = &handle->ht;
 	struct mlx5e_tc_act_stats *item;
-	struct mlx5e_tc_act_stats key;
 	u64 pkts, bytes, lastused;
 	int err = 0;
 
-	key.tc_act_cookie = fl_act->cookie;
-
 	rcu_read_lock();
-	item = rhashtable_lookup(ht, &key, act_counters_ht_params);
+	item = rhashtable_lookup(ht, &fl_act->cookie, act_counters_ht_params);
 	if (!item) {
 		rcu_read_unlock();
 		err = -ENOENT;
-- 
2.40.1


  parent reply	other threads:[~2023-06-06  7:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06  7:12 [pull request][net-next 00/15] mlx5 updates 2023-06-06 Saeed Mahameed
2023-06-06  7:12 ` [net-next 01/15] RDMA/mlx5: Free second uplink ib port Saeed Mahameed
2023-06-06  7:12 ` [net-next 02/15] {net/RDMA}/mlx5: introduce lag_for_each_peer Saeed Mahameed
2023-06-06  7:12 ` [net-next 03/15] net/mlx5: LAG, check if all eswitches are paired for shared FDB Saeed Mahameed
2023-06-06  7:12 ` [net-next 04/15] net/mlx5: LAG, generalize handling of " Saeed Mahameed
2023-06-06  7:12 ` [net-next 05/15] net/mlx5: LAG, change mlx5_shared_fdb_supported() to static Saeed Mahameed
2023-06-06  7:12 ` [net-next 06/15] net/mlx5: LAG, block multipath LAG in case ldev have more than 2 ports Saeed Mahameed
2023-06-06  7:12 ` [net-next 07/15] net/mlx5: LAG, block multiport eswitch " Saeed Mahameed
2023-06-06  7:12 ` [net-next 08/15] net/mlx5: Enable 4 ports VF LAG Saeed Mahameed
2023-06-06  7:12 ` [net-next 09/15] net/mlx5e: RX, Log error when page_pool size is too large Saeed Mahameed
2023-06-07 16:24   ` Alexander Lobakin
2023-06-07 16:40     ` Dragos Tatulea
2023-06-06  7:12 ` [net-next 10/15] net/mlx5e: Expose catastrophic steering error counters Saeed Mahameed
2023-06-06  7:12 ` [net-next 11/15] net/mlx5e: Remove RX page cache leftovers Saeed Mahameed
2023-06-06  7:12 ` Saeed Mahameed [this message]
2023-06-06  7:12 ` [net-next 13/15] net/mlx5: Skip inline mode check after mlx5_eswitch_enable_locked() failure Saeed Mahameed
2023-06-07  5:01   ` Jakub Kicinski
2023-06-07 14:10     ` Jason Gunthorpe
2023-06-07 16:19       ` Jakub Kicinski
2023-06-07 23:18         ` Jason Gunthorpe
2023-06-07 15:46     ` Jiri Pirko
2023-06-07 16:22       ` Jakub Kicinski
2023-06-06  7:12 ` [net-next 14/15] mlx5/core: E-Switch, Allocate ECPF vport if it's an eswitch manager Saeed Mahameed
2023-06-06  7:12 ` [net-next 15/15] net/mlx5e: simplify condition after napi budget handling change 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=20230606071219.483255-13-saeed@kernel.org \
    --to=saeed@kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=leonro@nvidia.com \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=ozsh@nvidia.com \
    --cc=pabeni@redhat.com \
    --cc=paulb@nvidia.com \
    --cc=saeedm@nvidia.com \
    --cc=tariqt@nvidia.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).