All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Gospodarek <andy@greyhouse.net>
To: netdev@vger.kernel.org
Cc: mchan@broadcom.com, talgi@mellanox.com, ogerlitz@mellanox.com,
	Andy Gospodarek <gospo@broadcom.com>
Subject: [PATCH net-next v4 08/10] net/dim: use struct net_dim_sample as arg to net_dim
Date: Tue,  9 Jan 2018 16:06:19 -0500	[thread overview]
Message-ID: <1515531981-14461-9-git-send-email-andy@greyhouse.net> (raw)
In-Reply-To: <1515531981-14461-1-git-send-email-andy@greyhouse.net>

From: Andy Gospodarek <gospo@broadcom.com>

Simplify the arguments net_dim() by formatting them into a struct
net_dim_sample before calling the function.

Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Suggested-by: Tal Gilboa <talgi@mellanox.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 13 ++++++++-----
 include/linux/net_dim.h                           | 10 +++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index a1c94fd..f292bb3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -78,11 +78,14 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
 	for (i = 0; i < c->num_tc; i++)
 		mlx5e_cq_arm(&c->sq[i].cq);
 
-	if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
-		net_dim(&c->rq.dim,
-			c->rq.cq.event_ctr,
-			c->rq.stats.packets,
-			c->rq.stats.bytes);
+	if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM)) {
+		struct net_dim_sample dim_sample;
+		net_dim_sample(c->rq.cq.event_ctr,
+			       c->rq.stats.packets,
+			       c->rq.stats.bytes,
+			       &dim_sample);
+		net_dim(&c->rq.dim, dim_sample);
+	}
 
 	mlx5e_cq_arm(&c->rq.cq);
 	mlx5e_cq_arm(&c->icosq.cq);
diff --git a/include/linux/net_dim.h b/include/linux/net_dim.h
index 741510f..1c7e450 100644
--- a/include/linux/net_dim.h
+++ b/include/linux/net_dim.h
@@ -342,21 +342,18 @@ static inline void net_dim_calc_stats(struct net_dim_sample *start,
 }
 
 static inline void net_dim(struct net_dim *dim,
-			   u16 event_ctr,
-			   u64 packets,
-			   u64 bytes)
+			   struct net_dim_sample end_sample)
 {
-	struct net_dim_sample end_sample;
 	struct net_dim_stats curr_stats;
 	u16 nevents;
 
 	switch (dim->state) {
 	case NET_DIM_MEASURE_IN_PROGRESS:
-		nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
+		nevents = BIT_GAP(BITS_PER_TYPE(u16),
+				  end_sample.event_ctr,
 				  dim->start_sample.event_ctr);
 		if (nevents < NET_DIM_NEVENTS)
 			break;
-		net_dim_sample(event_ctr, packets, bytes, &end_sample);
 		net_dim_calc_stats(&dim->start_sample, &end_sample,
 				   &curr_stats);
 		if (net_dim_decision(&curr_stats, dim)) {
@@ -366,7 +363,6 @@ static inline void net_dim(struct net_dim *dim,
 		}
 		/* fall through */
 	case NET_DIM_START_MEASURE:
-		net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);
 		dim->state = NET_DIM_MEASURE_IN_PROGRESS;
 		break;
 	case NET_DIM_APPLY_NEW_PROFILE:
-- 
2.7.4

  parent reply	other threads:[~2018-01-09 21:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-09 21:06 [PATCH net-next v4 00/10] net: create dynamic software irq moderation library Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 01/10] net/mlx5e: Move interrupt moderation structs to new file Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 02/10] net/mlx5e: Move interrupt moderation forward declarations Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 03/10] net/mlx5e: Remove rq references in mlx5e_rx_am Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 04/10] net/mlx5e: Move AM logic enums Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 05/10] net/mlx5e: Move generic functions to new file Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 06/10] net/mlx5e: Change Mellanox references in DIM code Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 07/10] net/mlx5e: Move dynamic interrupt coalescing code to include/linux Andy Gospodarek
2018-01-09 21:06 ` Andy Gospodarek [this message]
2018-01-09 21:06 ` [PATCH net-next v4 09/10] bnxt_en: add support for software dynamic interrupt moderation Andy Gospodarek
2018-01-09 21:06 ` [PATCH net-next v4 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation Andy Gospodarek
2018-01-09 21:55 ` [PATCH net-next v4 00/10] net: create dynamic software irq moderation library Tal Gilboa
2018-01-09 22:46 ` Florian Fainelli
2018-01-09 22:49   ` Tal Gilboa
2018-01-09 22:55     ` Andy Gospodarek
2018-01-10 20:28 ` David Miller

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=1515531981-14461-9-git-send-email-andy@greyhouse.net \
    --to=andy@greyhouse.net \
    --cc=gospo@broadcom.com \
    --cc=mchan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    --cc=ogerlitz@mellanox.com \
    --cc=talgi@mellanox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.