* [net-next 00/10] net: create dynamic software irq moderation library
@ 2018-01-04 20:21 Andy Gospodarek
2018-01-04 20:21 ` [net-next 01/10] net/mlx5e: move interrupt moderation structs to new file Andy Gospodarek
` (12 more replies)
0 siblings, 13 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
This converts the dynamic interrupt moderation library from the mlx5_en driver
into a library so it can be used by any driver. The penultimatepatch in this
set adds support for interrupt moderation in the bnxt_en driver and the last
patch creates an entry in the MAINTAINERS file.
The main purpose of this code in the mlx5_en driver is to allow an
administrator to make sure that default coalesce settings are optimized
for low latency, but quickly adapt to handle high throughput traffic and
optimize how many packets are received during each napi poll.
For any new driver the following changes would be needed to use this
library:
- add elements in ring struct to track items needed by this library
- create function that can be called to actually set coalesce settings
for the driver
Credit to Rob Rice and Lee Reed for doing some of the initial proof of
concept and testing for this patch and Tal Gilboa and Or Gerlitz for their
comments, etc on this set.
Andy Gospodarek (10):
net/mlx5e: move interrupt moderation structs to new file
net/mlx5e: move interrupt moderation forward declarations
net/mlx5e: remove rq references in mlx5e_rx_am
net/mlx5e: move AM logic enums
net/mlx5e: move generic functions to new file
net/mlx5e: change Mellanox references in DIM code
net: move dynamic interrpt coalescing code to include/linux
net/dim: use struct net_dim_sample as arg to net_dim
bnxt_en: add support for software dynamic interrupt moderation
MAINTAINERS: add entry for Dynamic Interrupt Moderation
MAINTAINERS | 5 +
drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 52 +++
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 34 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 32 ++
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +
drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 46 +--
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 49 +++
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +-
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 341 -------------------
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 108 ++++++
include/linux/mlx5/mlx5_ifc.h | 6 -
include/linux/net_dim.h | 372 +++++++++++++++++++++
17 files changed, 693 insertions(+), 426 deletions(-)
create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
create mode 100644 include/linux/net_dim.h
--
2.7.4
^ permalink raw reply [flat|nested] 24+ messages in thread
* [net-next 01/10] net/mlx5e: move interrupt moderation structs to new file
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 02/10] net/mlx5e: move interrupt moderation forward declarations Andy Gospodarek
` (11 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
Create new header file to prepare to move code that handles irq
moderation to a library that lives in a header file.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en.h | 33 +----------
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 75 ++++++++++++++++++++++++
include/linux/mlx5/mlx5_ifc.h | 6 --
3 files changed, 76 insertions(+), 38 deletions(-)
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 543060c..ddb5429 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -49,6 +49,7 @@
#include "wq.h"
#include "mlx5_core.h"
#include "en_stats.h"
+#include "en_dim.h"
#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
@@ -226,12 +227,6 @@ enum mlx5e_priv_flag {
#define MLX5E_MAX_BW_ALLOC 100 /* Max percentage of BW allocation */
#endif
-struct mlx5e_cq_moder {
- u16 usec;
- u16 pkts;
- u8 cq_period_mode;
-};
-
struct mlx5e_params {
u8 log_sq_size;
u8 rq_wq_type;
@@ -472,32 +467,6 @@ struct mlx5e_mpw_info {
u16 skbs_frags[MLX5_MPWRQ_PAGES_PER_WQE];
};
-struct mlx5e_rx_am_stats {
- int ppms; /* packets per msec */
- int bpms; /* bytes per msec */
- int epms; /* events per msec */
-};
-
-struct mlx5e_rx_am_sample {
- ktime_t time;
- u32 pkt_ctr;
- u32 byte_ctr;
- u16 event_ctr;
-};
-
-struct mlx5e_rx_am { /* Adaptive Moderation */
- u8 state;
- struct mlx5e_rx_am_stats prev_stats;
- struct mlx5e_rx_am_sample start_sample;
- struct work_struct work;
- u8 profile_ix;
- u8 mode;
- u8 tune_state;
- u8 steps_right;
- u8 steps_left;
- u8 tired;
-};
-
/* a single cache unit is capable to serve one napi call (for non-striding rq)
* or a MPWQE (for striding rq).
*/
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
new file mode 100644
index 0000000..84b8524
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2013-2015, Mellanox Technologies, Ltd. All rights reserved.
+ * Copyright (c) 2017, Broadcom Limited
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+#ifndef MLX5_AM_H
+#define MLX5_AM_H
+
+struct mlx5e_cq_moder {
+ u16 usec;
+ u16 pkts;
+ u8 cq_period_mode;
+};
+
+struct mlx5e_rx_am_sample {
+ ktime_t time;
+ u32 pkt_ctr;
+ u32 byte_ctr;
+ u16 event_ctr;
+};
+
+struct mlx5e_rx_am_stats {
+ int ppms; /* packets per msec */
+ int bpms; /* bytes per msec */
+ int epms; /* events per msec */
+};
+
+struct mlx5e_rx_am { /* Adaptive Moderation */
+ u8 state;
+ struct mlx5e_rx_am_stats prev_stats;
+ struct mlx5e_rx_am_sample start_sample;
+ struct work_struct work;
+ u8 profile_ix;
+ u8 mode;
+ u8 tune_state;
+ u8 steps_right;
+ u8 steps_left;
+ u8 tired;
+};
+
+enum {
+ MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
+ MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
+ MLX5_CQ_PERIOD_NUM_MODES
+};
+
+#endif /* MLX5_AM_H */
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index d44ec5f..60d17e5 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -2918,12 +2918,6 @@ enum {
MLX5_CQC_ST_FIRED = 0xa,
};
-enum {
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
- MLX5_CQ_PERIOD_NUM_MODES
-};
-
struct mlx5_ifc_cqc_bits {
u8 status[0x4];
u8 reserved_at_4[0x4];
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 02/10] net/mlx5e: move interrupt moderation forward declarations
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
2018-01-04 20:21 ` [net-next 01/10] net/mlx5e: move interrupt moderation structs to new file Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 03/10] net/mlx5e: remove rq references in mlx5e_rx_am Andy Gospodarek
` (10 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
Move these to newly created file to prepare to move these functions to a
library.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 ----
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 5 +++++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index ddb5429..2ccedf6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -829,10 +829,6 @@ void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix);
void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix);
void mlx5e_free_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi);
-void mlx5e_rx_am(struct mlx5e_rq *rq);
-void mlx5e_rx_am_work(struct work_struct *work);
-struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
-
void mlx5e_update_stats(struct mlx5e_priv *priv, bool full);
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
index 84b8524..f5f6535 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -72,4 +72,9 @@ enum {
MLX5_CQ_PERIOD_NUM_MODES
};
+struct mlx5e_rq;
+void mlx5e_rx_am(struct mlx5e_rq *rq);
+void mlx5e_rx_am_work(struct work_struct *work);
+struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
+
#endif /* MLX5_AM_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 03/10] net/mlx5e: remove rq references in mlx5e_rx_am
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
2018-01-04 20:21 ` [net-next 01/10] net/mlx5e: move interrupt moderation structs to new file Andy Gospodarek
2018-01-04 20:21 ` [net-next 02/10] net/mlx5e: move interrupt moderation forward declarations Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 04/10] net/mlx5e: move AM logic enums Andy Gospodarek
` (9 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
This makes mlx5e_am_sample more generic so that it can be called easily
from a driver that does not use the same data structure to store these
values in a single structure.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 6 ++++--
drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 22 +++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 5 ++++-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
index f5f6535..b676a057 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -72,8 +72,10 @@ enum {
MLX5_CQ_PERIOD_NUM_MODES
};
-struct mlx5e_rq;
-void mlx5e_rx_am(struct mlx5e_rq *rq);
+void mlx5e_rx_am(struct mlx5e_rx_am *am,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes);
void mlx5e_rx_am_work(struct work_struct *work);
struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
index e401d9d..1630076 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
@@ -264,13 +264,15 @@ static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
return am->profile_ix != prev_ix;
}
-static void mlx5e_am_sample(struct mlx5e_rq *rq,
+static void mlx5e_am_sample(u16 event_ctr,
+ u64 packets,
+ u64 bytes,
struct mlx5e_rx_am_sample *s)
{
s->time = ktime_get();
- s->pkt_ctr = rq->stats.packets;
- s->byte_ctr = rq->stats.bytes;
- s->event_ctr = rq->cq.event_ctr;
+ s->pkt_ctr = packets;
+ s->byte_ctr = bytes;
+ s->event_ctr = event_ctr;
}
#define MLX5E_AM_NEVENTS 64
@@ -309,20 +311,22 @@ void mlx5e_rx_am_work(struct work_struct *work)
am->state = MLX5E_AM_START_MEASURE;
}
-void mlx5e_rx_am(struct mlx5e_rq *rq)
+void mlx5e_rx_am(struct mlx5e_rx_am *am,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes)
{
- struct mlx5e_rx_am *am = &rq->am;
struct mlx5e_rx_am_sample end_sample;
struct mlx5e_rx_am_stats curr_stats;
u16 nevents;
switch (am->state) {
case MLX5E_AM_MEASURE_IN_PROGRESS:
- nevents = BIT_GAP(BITS_PER_TYPE(u16), rq->cq.event_ctr,
+ nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
am->start_sample.event_ctr);
if (nevents < MLX5E_AM_NEVENTS)
break;
- mlx5e_am_sample(rq, &end_sample);
+ mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
mlx5e_am_calc_stats(&am->start_sample, &end_sample,
&curr_stats);
if (mlx5e_am_decision(&curr_stats, am)) {
@@ -332,7 +336,7 @@ void mlx5e_rx_am(struct mlx5e_rq *rq)
}
/* fall through */
case MLX5E_AM_START_MEASURE:
- mlx5e_am_sample(rq, &am->start_sample);
+ mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
break;
case MLX5E_AM_APPLY_NEW_PROFILE:
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index ab92298..1849169 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -79,7 +79,10 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
mlx5e_cq_arm(&c->sq[i].cq);
if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
- mlx5e_rx_am(&c->rq);
+ mlx5e_rx_am(&c->rq.am,
+ c->rq.cq.event_ctr,
+ c->rq.stats.packets,
+ c->rq.stats.bytes);
mlx5e_cq_arm(&c->rq.cq);
mlx5e_cq_arm(&c->icosq.cq);
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 04/10] net/mlx5e: move AM logic enums
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (2 preceding siblings ...)
2018-01-04 20:21 ` [net-next 03/10] net/mlx5e: remove rq references in mlx5e_rx_am Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 05/10] net/mlx5e: move generic functions to new file Andy Gospodarek
` (8 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
More movement to help make this code more generic.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 26 ++++++++++++++++++++++
drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 25 ---------------------
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
index b676a057..c9f0d05 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -72,6 +72,32 @@ enum {
MLX5_CQ_PERIOD_NUM_MODES
};
+/* Adaptive moderation logic */
+enum {
+ MLX5E_AM_START_MEASURE,
+ MLX5E_AM_MEASURE_IN_PROGRESS,
+ MLX5E_AM_APPLY_NEW_PROFILE,
+};
+
+enum {
+ MLX5E_AM_PARKING_ON_TOP,
+ MLX5E_AM_PARKING_TIRED,
+ MLX5E_AM_GOING_RIGHT,
+ MLX5E_AM_GOING_LEFT,
+};
+
+enum {
+ MLX5E_AM_STATS_WORSE,
+ MLX5E_AM_STATS_SAME,
+ MLX5E_AM_STATS_BETTER,
+};
+
+enum {
+ MLX5E_AM_STEPPED,
+ MLX5E_AM_TOO_TIRED,
+ MLX5E_AM_ON_EDGE,
+};
+
void mlx5e_rx_am(struct mlx5e_rx_am *am,
u16 event_ctr,
u64 packets,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
index 1630076..337dd60 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
@@ -82,31 +82,6 @@ struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
}
-/* Adaptive moderation logic */
-enum {
- MLX5E_AM_START_MEASURE,
- MLX5E_AM_MEASURE_IN_PROGRESS,
- MLX5E_AM_APPLY_NEW_PROFILE,
-};
-
-enum {
- MLX5E_AM_PARKING_ON_TOP,
- MLX5E_AM_PARKING_TIRED,
- MLX5E_AM_GOING_RIGHT,
- MLX5E_AM_GOING_LEFT,
-};
-
-enum {
- MLX5E_AM_STATS_WORSE,
- MLX5E_AM_STATS_SAME,
- MLX5E_AM_STATS_BETTER,
-};
-
-enum {
- MLX5E_AM_STEPPED,
- MLX5E_AM_TOO_TIRED,
- MLX5E_AM_ON_EDGE,
-};
static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 05/10] net/mlx5e: move generic functions to new file
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (3 preceding siblings ...)
2018-01-04 20:21 ` [net-next 04/10] net/mlx5e: move AM logic enums Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 06/10] net/mlx5e: change Mellanox references in DIM code Andy Gospodarek
` (7 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
These functions were identified as ones that could be made generic and
used by multiple drivers. Most of the contents of en_rx_am.c are moved
to net_dim.c.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/Makefile | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 48 ++++
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 320 ---------------------
drivers/net/ethernet/mellanox/mlx5/core/net_dim.c | 307 ++++++++++++++++++++
drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 109 +++++++
6 files changed, 467 insertions(+), 322 deletions(-)
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 19b21b4..b46b6de2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -14,8 +14,8 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \
fpga/ipsec.o
mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \
- en_tx.o en_rx.o en_rx_am.o en_txrx.o en_stats.o vxlan.o \
- en_arfs.o en_fs_ethtool.o en_selftest.o
+ en_tx.o en_rx.o en_dim.o en_txrx.o en_stats.o vxlan.o \
+ en_arfs.o en_fs_ethtool.o en_selftest.o net_dim.o
mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
new file mode 100644
index 0000000..b9b434b
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "en.h"
+
+void mlx5e_rx_am_work(struct work_struct *work)
+{
+ struct mlx5e_rx_am *am = container_of(work, struct mlx5e_rx_am,
+ work);
+ struct mlx5e_rq *rq = container_of(am, struct mlx5e_rq, am);
+ struct mlx5e_cq_moder cur_profile = mlx5e_am_get_profile(am->mode,
+ am->profile_ix);
+
+ mlx5_core_modify_cq_moderation(rq->mdev, &rq->cq.mcq,
+ cur_profile.usec, cur_profile.pkts);
+
+ am->state = MLX5E_AM_START_MEASURE;
+}
+
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
index c9f0d05..5ce8e54 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -104,5 +104,6 @@ void mlx5e_rx_am(struct mlx5e_rx_am *am,
u64 bytes);
void mlx5e_rx_am_work(struct work_struct *work);
struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
+struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
#endif /* MLX5_AM_H */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
deleted file mode 100644
index 337dd60..0000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "en.h"
-
-/* Adaptive moderation profiles */
-#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
-#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
-#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
-#define MLX5E_PARAMS_AM_NUM_PROFILES 5
-
-/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
-#define MLX5_AM_EQE_PROFILES { \
- {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-}
-
-#define MLX5_AM_CQE_PROFILES { \
- {2, 256}, \
- {8, 128}, \
- {16, 64}, \
- {32, 64}, \
- {64, 64} \
-}
-
-static const struct mlx5e_cq_moder
-profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
- MLX5_AM_EQE_PROFILES,
- MLX5_AM_CQE_PROFILES,
-};
-
-static inline struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
-{
- struct mlx5e_cq_moder cq_moder;
-
- cq_moder = profile[cq_period_mode][ix];
- cq_moder.cq_period_mode = cq_period_mode;
- return cq_moder;
-}
-
-struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
-{
- int default_profile_ix;
-
- if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
- default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
- else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
- default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
-
- return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
-}
-
-
-static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
-{
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
- return true;
- case MLX5E_AM_GOING_RIGHT:
- return (am->steps_left > 1) && (am->steps_right == 1);
- default: /* MLX5E_AM_GOING_LEFT */
- return (am->steps_right > 1) && (am->steps_left == 1);
- }
-}
-
-static void mlx5e_am_turn(struct mlx5e_rx_am *am)
-{
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
- break;
- case MLX5E_AM_GOING_RIGHT:
- am->tune_state = MLX5E_AM_GOING_LEFT;
- am->steps_left = 0;
- break;
- case MLX5E_AM_GOING_LEFT:
- am->tune_state = MLX5E_AM_GOING_RIGHT;
- am->steps_right = 0;
- break;
- }
-}
-
-static int mlx5e_am_step(struct mlx5e_rx_am *am)
-{
- if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
- return MLX5E_AM_TOO_TIRED;
-
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
- break;
- case MLX5E_AM_GOING_RIGHT:
- if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
- return MLX5E_AM_ON_EDGE;
- am->profile_ix++;
- am->steps_right++;
- break;
- case MLX5E_AM_GOING_LEFT:
- if (am->profile_ix == 0)
- return MLX5E_AM_ON_EDGE;
- am->profile_ix--;
- am->steps_left++;
- break;
- }
-
- am->tired++;
- return MLX5E_AM_STEPPED;
-}
-
-static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
-{
- am->steps_right = 0;
- am->steps_left = 0;
- am->tired = 0;
- am->tune_state = MLX5E_AM_PARKING_ON_TOP;
-}
-
-static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
-{
- am->steps_right = 0;
- am->steps_left = 0;
- am->tune_state = MLX5E_AM_PARKING_TIRED;
-}
-
-static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
-{
- am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
- MLX5E_AM_GOING_RIGHT;
- mlx5e_am_step(am);
-}
-
-#define IS_SIGNIFICANT_DIFF(val, ref) \
- (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
-
-static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
- struct mlx5e_rx_am_stats *prev)
-{
- if (!prev->bpms)
- return curr->bpms ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_SAME;
-
- if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
- return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
-
- if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
- return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
-
- if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
- return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
-
- return MLX5E_AM_STATS_SAME;
-}
-
-static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
- struct mlx5e_rx_am *am)
-{
- int prev_state = am->tune_state;
- int prev_ix = am->profile_ix;
- int stats_res;
- int step_res;
-
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
- if (stats_res != MLX5E_AM_STATS_SAME)
- mlx5e_am_exit_parking(am);
- break;
-
- case MLX5E_AM_PARKING_TIRED:
- am->tired--;
- if (!am->tired)
- mlx5e_am_exit_parking(am);
- break;
-
- case MLX5E_AM_GOING_RIGHT:
- case MLX5E_AM_GOING_LEFT:
- stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
- if (stats_res != MLX5E_AM_STATS_BETTER)
- mlx5e_am_turn(am);
-
- if (mlx5e_am_on_top(am)) {
- mlx5e_am_park_on_top(am);
- break;
- }
-
- step_res = mlx5e_am_step(am);
- switch (step_res) {
- case MLX5E_AM_ON_EDGE:
- mlx5e_am_park_on_top(am);
- break;
- case MLX5E_AM_TOO_TIRED:
- mlx5e_am_park_tired(am);
- break;
- }
-
- break;
- }
-
- if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
- (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
- am->prev_stats = *curr_stats;
-
- return am->profile_ix != prev_ix;
-}
-
-static void mlx5e_am_sample(u16 event_ctr,
- u64 packets,
- u64 bytes,
- struct mlx5e_rx_am_sample *s)
-{
- s->time = ktime_get();
- s->pkt_ctr = packets;
- s->byte_ctr = bytes;
- s->event_ctr = event_ctr;
-}
-
-#define MLX5E_AM_NEVENTS 64
-#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
-#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
-
-static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
- struct mlx5e_rx_am_sample *end,
- struct mlx5e_rx_am_stats *curr_stats)
-{
- /* u32 holds up to 71 minutes, should be enough */
- u32 delta_us = ktime_us_delta(end->time, start->time);
- u32 npkts = BIT_GAP(BITS_PER_TYPE(u32), end->pkt_ctr, start->pkt_ctr);
- u32 nbytes = BIT_GAP(BITS_PER_TYPE(u32), end->byte_ctr,
- start->byte_ctr);
-
- if (!delta_us)
- return;
-
- curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
- curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
- curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
- delta_us);
-}
-
-void mlx5e_rx_am_work(struct work_struct *work)
-{
- struct mlx5e_rx_am *am = container_of(work, struct mlx5e_rx_am,
- work);
- struct mlx5e_rq *rq = container_of(am, struct mlx5e_rq, am);
- struct mlx5e_cq_moder cur_profile = profile[am->mode][am->profile_ix];
-
- mlx5_core_modify_cq_moderation(rq->mdev, &rq->cq.mcq,
- cur_profile.usec, cur_profile.pkts);
-
- am->state = MLX5E_AM_START_MEASURE;
-}
-
-void mlx5e_rx_am(struct mlx5e_rx_am *am,
- u16 event_ctr,
- u64 packets,
- u64 bytes)
-{
- struct mlx5e_rx_am_sample end_sample;
- struct mlx5e_rx_am_stats curr_stats;
- u16 nevents;
-
- switch (am->state) {
- case MLX5E_AM_MEASURE_IN_PROGRESS:
- nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
- am->start_sample.event_ctr);
- if (nevents < MLX5E_AM_NEVENTS)
- break;
- mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
- mlx5e_am_calc_stats(&am->start_sample, &end_sample,
- &curr_stats);
- if (mlx5e_am_decision(&curr_stats, am)) {
- am->state = MLX5E_AM_APPLY_NEW_PROFILE;
- schedule_work(&am->work);
- break;
- }
- /* fall through */
- case MLX5E_AM_START_MEASURE:
- mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
- am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
- break;
- case MLX5E_AM_APPLY_NEW_PROFILE:
- break;
- }
-}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
new file mode 100644
index 0000000..ca05f4e
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2017, Broadcom Limiited. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "en.h"
+
+#define MLX5E_PARAMS_AM_NUM_PROFILES 5
+/* Adaptive moderation profiles */
+#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
+#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
+#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
+
+/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
+#define MLX5_AM_EQE_PROFILES { \
+ {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+}
+
+#define MLX5_AM_CQE_PROFILES { \
+ {2, 256}, \
+ {8, 128}, \
+ {16, 64}, \
+ {32, 64}, \
+ {64, 64} \
+}
+
+static const struct mlx5e_cq_moder
+profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
+ MLX5_AM_EQE_PROFILES,
+ MLX5_AM_CQE_PROFILES,
+};
+
+struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
+{
+ struct mlx5e_cq_moder cq_moder;
+
+ cq_moder = profile[cq_period_mode][ix];
+ cq_moder.cq_period_mode = cq_period_mode;
+ return cq_moder;
+}
+
+struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
+{
+ int default_profile_ix;
+
+ if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
+ default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
+ else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
+ default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
+
+ return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
+}
+
+static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
+{
+ switch (am->tune_state) {
+ case MLX5E_AM_PARKING_ON_TOP:
+ case MLX5E_AM_PARKING_TIRED:
+ return true;
+ case MLX5E_AM_GOING_RIGHT:
+ return (am->steps_left > 1) && (am->steps_right == 1);
+ default: /* MLX5E_AM_GOING_LEFT */
+ return (am->steps_right > 1) && (am->steps_left == 1);
+ }
+}
+
+static void mlx5e_am_turn(struct mlx5e_rx_am *am)
+{
+ switch (am->tune_state) {
+ case MLX5E_AM_PARKING_ON_TOP:
+ case MLX5E_AM_PARKING_TIRED:
+ break;
+ case MLX5E_AM_GOING_RIGHT:
+ am->tune_state = MLX5E_AM_GOING_LEFT;
+ am->steps_left = 0;
+ break;
+ case MLX5E_AM_GOING_LEFT:
+ am->tune_state = MLX5E_AM_GOING_RIGHT;
+ am->steps_right = 0;
+ break;
+ }
+}
+
+static int mlx5e_am_step(struct mlx5e_rx_am *am)
+{
+ if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
+ return MLX5E_AM_TOO_TIRED;
+
+ switch (am->tune_state) {
+ case MLX5E_AM_PARKING_ON_TOP:
+ case MLX5E_AM_PARKING_TIRED:
+ break;
+ case MLX5E_AM_GOING_RIGHT:
+ if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
+ return MLX5E_AM_ON_EDGE;
+ am->profile_ix++;
+ am->steps_right++;
+ break;
+ case MLX5E_AM_GOING_LEFT:
+ if (am->profile_ix == 0)
+ return MLX5E_AM_ON_EDGE;
+ am->profile_ix--;
+ am->steps_left++;
+ break;
+ }
+
+ am->tired++;
+ return MLX5E_AM_STEPPED;
+}
+
+static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
+{
+ am->steps_right = 0;
+ am->steps_left = 0;
+ am->tired = 0;
+ am->tune_state = MLX5E_AM_PARKING_ON_TOP;
+}
+
+static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
+{
+ am->steps_right = 0;
+ am->steps_left = 0;
+ am->tune_state = MLX5E_AM_PARKING_TIRED;
+}
+
+static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
+{
+ am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
+ MLX5E_AM_GOING_RIGHT;
+ mlx5e_am_step(am);
+}
+
+#define IS_SIGNIFICANT_DIFF(val, ref) \
+ (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
+
+static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
+ struct mlx5e_rx_am_stats *prev)
+{
+ if (!prev->bpms)
+ return curr->bpms ? MLX5E_AM_STATS_BETTER :
+ MLX5E_AM_STATS_SAME;
+
+ if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
+ return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
+ MLX5E_AM_STATS_WORSE;
+
+ if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
+ return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
+ MLX5E_AM_STATS_WORSE;
+
+ if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
+ return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
+ MLX5E_AM_STATS_WORSE;
+
+ return MLX5E_AM_STATS_SAME;
+}
+
+static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
+ struct mlx5e_rx_am *am)
+{
+ int prev_state = am->tune_state;
+ int prev_ix = am->profile_ix;
+ int stats_res;
+ int step_res;
+
+ switch (am->tune_state) {
+ case MLX5E_AM_PARKING_ON_TOP:
+ stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
+ if (stats_res != MLX5E_AM_STATS_SAME)
+ mlx5e_am_exit_parking(am);
+ break;
+
+ case MLX5E_AM_PARKING_TIRED:
+ am->tired--;
+ if (!am->tired)
+ mlx5e_am_exit_parking(am);
+ break;
+
+ case MLX5E_AM_GOING_RIGHT:
+ case MLX5E_AM_GOING_LEFT:
+ stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
+ if (stats_res != MLX5E_AM_STATS_BETTER)
+ mlx5e_am_turn(am);
+
+ if (mlx5e_am_on_top(am)) {
+ mlx5e_am_park_on_top(am);
+ break;
+ }
+
+ step_res = mlx5e_am_step(am);
+ switch (step_res) {
+ case MLX5E_AM_ON_EDGE:
+ mlx5e_am_park_on_top(am);
+ break;
+ case MLX5E_AM_TOO_TIRED:
+ mlx5e_am_park_tired(am);
+ break;
+ }
+
+ break;
+ }
+
+ if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
+ (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
+ am->prev_stats = *curr_stats;
+
+ return am->profile_ix != prev_ix;
+}
+
+static void mlx5e_am_sample(u16 event_ctr,
+ u64 packets,
+ u64 bytes,
+ struct mlx5e_rx_am_sample *s)
+{
+ s->time = ktime_get();
+ s->pkt_ctr = packets;
+ s->byte_ctr = bytes;
+ s->event_ctr = event_ctr;
+}
+
+#define MLX5E_AM_NEVENTS 64
+#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
+#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
+
+static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
+ struct mlx5e_rx_am_sample *end,
+ struct mlx5e_rx_am_stats *curr_stats)
+{
+ /* u32 holds up to 71 minutes, should be enough */
+ u32 delta_us = ktime_us_delta(end->time, start->time);
+ u32 npkts = BIT_GAP(BITS_PER_TYPE(u32), end->pkt_ctr, start->pkt_ctr);
+ u32 nbytes = BIT_GAP(BITS_PER_TYPE(u32), end->byte_ctr,
+ start->byte_ctr);
+
+ if (!delta_us)
+ return;
+
+ curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
+ curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
+ curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
+ delta_us);
+}
+
+void mlx5e_rx_am(struct mlx5e_rx_am *am,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes)
+{
+ struct mlx5e_rx_am_sample end_sample;
+ struct mlx5e_rx_am_stats curr_stats;
+ u16 nevents;
+
+ switch (am->state) {
+ case MLX5E_AM_MEASURE_IN_PROGRESS:
+ nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
+ am->start_sample.event_ctr);
+ if (nevents < MLX5E_AM_NEVENTS)
+ break;
+ mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
+ mlx5e_am_calc_stats(&am->start_sample, &end_sample,
+ &curr_stats);
+ if (mlx5e_am_decision(&curr_stats, am)) {
+ am->state = MLX5E_AM_APPLY_NEW_PROFILE;
+ schedule_work(&am->work);
+ break;
+ }
+ /* fall through */
+ case MLX5E_AM_START_MEASURE:
+ mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
+ am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
+ break;
+ case MLX5E_AM_APPLY_NEW_PROFILE:
+ break;
+ }
+}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
new file mode 100644
index 0000000..5ce8e54
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2013-2015, Mellanox Technologies, Ltd. All rights reserved.
+ * Copyright (c) 2017, Broadcom Limited
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+#ifndef MLX5_AM_H
+#define MLX5_AM_H
+
+struct mlx5e_cq_moder {
+ u16 usec;
+ u16 pkts;
+ u8 cq_period_mode;
+};
+
+struct mlx5e_rx_am_sample {
+ ktime_t time;
+ u32 pkt_ctr;
+ u32 byte_ctr;
+ u16 event_ctr;
+};
+
+struct mlx5e_rx_am_stats {
+ int ppms; /* packets per msec */
+ int bpms; /* bytes per msec */
+ int epms; /* events per msec */
+};
+
+struct mlx5e_rx_am { /* Adaptive Moderation */
+ u8 state;
+ struct mlx5e_rx_am_stats prev_stats;
+ struct mlx5e_rx_am_sample start_sample;
+ struct work_struct work;
+ u8 profile_ix;
+ u8 mode;
+ u8 tune_state;
+ u8 steps_right;
+ u8 steps_left;
+ u8 tired;
+};
+
+enum {
+ MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
+ MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
+ MLX5_CQ_PERIOD_NUM_MODES
+};
+
+/* Adaptive moderation logic */
+enum {
+ MLX5E_AM_START_MEASURE,
+ MLX5E_AM_MEASURE_IN_PROGRESS,
+ MLX5E_AM_APPLY_NEW_PROFILE,
+};
+
+enum {
+ MLX5E_AM_PARKING_ON_TOP,
+ MLX5E_AM_PARKING_TIRED,
+ MLX5E_AM_GOING_RIGHT,
+ MLX5E_AM_GOING_LEFT,
+};
+
+enum {
+ MLX5E_AM_STATS_WORSE,
+ MLX5E_AM_STATS_SAME,
+ MLX5E_AM_STATS_BETTER,
+};
+
+enum {
+ MLX5E_AM_STEPPED,
+ MLX5E_AM_TOO_TIRED,
+ MLX5E_AM_ON_EDGE,
+};
+
+void mlx5e_rx_am(struct mlx5e_rx_am *am,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes);
+void mlx5e_rx_am_work(struct work_struct *work);
+struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
+struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
+
+#endif /* MLX5_AM_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 06/10] net/mlx5e: change Mellanox references in DIM code
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (4 preceding siblings ...)
2018-01-04 20:21 ` [net-next 05/10] net/mlx5e: move generic functions to new file Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-05 8:04 ` Tal Gilboa
2018-01-04 20:21 ` [net-next 07/10] net: move dynamic interrupt coalescing code to include/linux Andy Gospodarek
` (6 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
Change all mlx5_am* and MLX_AM* references to net_dim and NET_DIM,
respectively, in code that handles dynamic interrupt moderation. Also
change all references from 'am' to 'dim' when used as local variables.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 14 +-
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 20 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +-
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +--
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/net_dim.c | 284 ++++++++++-----------
drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 63 +++--
9 files changed, 219 insertions(+), 222 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 2ccedf6..da2d5e7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -50,6 +50,7 @@
#include "mlx5_core.h"
#include "en_stats.h"
#include "en_dim.h"
+#include "net_dim.h"
#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
@@ -237,8 +238,8 @@ struct mlx5e_params {
u16 num_channels;
u8 num_tc;
bool rx_cqe_compress_def;
- struct mlx5e_cq_moder rx_cq_moderation;
- struct mlx5e_cq_moder tx_cq_moderation;
+ struct net_dim_cq_moder rx_cq_moderation;
+ struct net_dim_cq_moder tx_cq_moderation;
bool lro_en;
u32 lro_wqe_sz;
u16 tx_max_inline;
@@ -248,7 +249,7 @@ struct mlx5e_params {
u32 indirection_rqt[MLX5E_INDIR_RQT_SIZE];
bool vlan_strip_disable;
bool scatter_fcs_en;
- bool rx_am_enabled;
+ bool rx_dim_enabled;
u32 lro_timeout;
u32 pflags;
struct bpf_prog *xdp_prog;
@@ -527,7 +528,7 @@ struct mlx5e_rq {
unsigned long state;
int ix;
- struct mlx5e_rx_am am; /* Adaptive Moderation */
+ struct net_dim dim; /* Dynamic Interrupt Moderation */
/* XDP */
struct bpf_prog *xdp_prog;
@@ -1075,4 +1076,5 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
struct mlx5e_params *params,
u16 max_channels);
u8 mlx5e_params_calculate_tx_min_inline(struct mlx5_core_dev *mdev);
+void mlx5e_rx_dim_work(struct work_struct *work);
#endif /* __MLX5_EN_H__ */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
index b9b434b..f620325 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
@@ -32,17 +32,17 @@
#include "en.h"
-void mlx5e_rx_am_work(struct work_struct *work)
+void mlx5e_rx_dim_work(struct work_struct *work)
{
- struct mlx5e_rx_am *am = container_of(work, struct mlx5e_rx_am,
- work);
- struct mlx5e_rq *rq = container_of(am, struct mlx5e_rq, am);
- struct mlx5e_cq_moder cur_profile = mlx5e_am_get_profile(am->mode,
- am->profile_ix);
+ struct net_dim *dim = container_of(work, struct net_dim,
+ work);
+ struct mlx5e_rq *rq = container_of(dim, struct mlx5e_rq, dim);
+ struct net_dim_cq_moder cur_profile = net_dim_get_profile(dim->mode,
+ dim->profile_ix);
mlx5_core_modify_cq_moderation(rq->mdev, &rq->cq.mcq,
cur_profile.usec, cur_profile.pkts);
- am->state = MLX5E_AM_START_MEASURE;
+ dim->state = NET_DIM_START_MEASURE;
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
index 5ce8e54..21219de 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
@@ -40,23 +40,23 @@ struct mlx5e_cq_moder {
u8 cq_period_mode;
};
-struct mlx5e_rx_am_sample {
+struct mlx5e_rx_dim_sample {
ktime_t time;
u32 pkt_ctr;
u32 byte_ctr;
u16 event_ctr;
};
-struct mlx5e_rx_am_stats {
+struct mlx5e_rx_dim_stats {
int ppms; /* packets per msec */
int bpms; /* bytes per msec */
int epms; /* events per msec */
};
-struct mlx5e_rx_am { /* Adaptive Moderation */
+struct mlx5e_rx_dim { /* Adaptive Moderation */
u8 state;
- struct mlx5e_rx_am_stats prev_stats;
- struct mlx5e_rx_am_sample start_sample;
+ struct mlx5e_rx_dim_stats prev_stats;
+ struct mlx5e_rx_dim_sample start_sample;
struct work_struct work;
u8 profile_ix;
u8 mode;
@@ -98,12 +98,8 @@ enum {
MLX5E_AM_ON_EDGE,
};
-void mlx5e_rx_am(struct mlx5e_rx_am *am,
- u16 event_ctr,
- u64 packets,
- u64 bytes);
-void mlx5e_rx_am_work(struct work_struct *work);
-struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
-struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
+void mlx5e_rx_dim_work(struct work_struct *work);
+struct mlx5e_cq_moder mlx5e_dim_get_def_profile(u8 rx_cq_period_mode);
+struct mlx5e_cq_moder mlx5e_dim_get_profile(u8 cq_period_mode, int ix);
#endif /* MLX5_AM_H */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 8f05efa..772d276 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -480,7 +480,7 @@ int mlx5e_ethtool_get_coalesce(struct mlx5e_priv *priv,
coal->rx_max_coalesced_frames = priv->channels.params.rx_cq_moderation.pkts;
coal->tx_coalesce_usecs = priv->channels.params.tx_cq_moderation.usec;
coal->tx_max_coalesced_frames = priv->channels.params.tx_cq_moderation.pkts;
- coal->use_adaptive_rx_coalesce = priv->channels.params.rx_am_enabled;
+ coal->use_adaptive_rx_coalesce = priv->channels.params.rx_dim_enabled;
return 0;
}
@@ -534,7 +534,7 @@ int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,
new_channels.params.tx_cq_moderation.pkts = coal->tx_max_coalesced_frames;
new_channels.params.rx_cq_moderation.usec = coal->rx_coalesce_usecs;
new_channels.params.rx_cq_moderation.pkts = coal->rx_max_coalesced_frames;
- new_channels.params.rx_am_enabled = !!coal->use_adaptive_rx_coalesce;
+ new_channels.params.rx_dim_enabled = !!coal->use_adaptive_rx_coalesce;
if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {
priv->channels.params = new_channels.params;
@@ -542,7 +542,7 @@ int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,
}
/* we are opened */
- reset = !!coal->use_adaptive_rx_coalesce != priv->channels.params.rx_am_enabled;
+ reset = !!coal->use_adaptive_rx_coalesce != priv->channels.params.rx_dim_enabled;
if (!reset) {
mlx5e_set_priv_channels_coalesce(priv, coal);
priv->channels.params = new_channels.params;
@@ -1465,14 +1465,14 @@ static int set_pflag_cqe_based_moder(struct net_device *netdev, bool enable,
int err = 0;
cq_period_mode = enable ?
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
current_cq_period_mode = is_rx_cq ?
priv->channels.params.rx_cq_moderation.cq_period_mode :
priv->channels.params.tx_cq_moderation.cq_period_mode;
mode_changed = cq_period_mode != current_cq_period_mode;
- if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE &&
+ if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE &&
!MLX5_CAP_GEN(mdev, cq_period_start_from_cqe))
return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 3aa1c90..edd4077 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -674,8 +674,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
wqe->data.lkey = rq->mkey_be;
}
- INIT_WORK(&rq->am.work, mlx5e_rx_am_work);
- rq->am.mode = params->rx_cq_moderation.cq_period_mode;
+ INIT_WORK(&rq->dim.work, mlx5e_rx_dim_work);
+ rq->dim.mode = params->rx_cq_moderation.cq_period_mode;
rq->page_cache.head = 0;
rq->page_cache.tail = 0;
@@ -919,7 +919,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
if (err)
goto err_destroy_rq;
- if (params->rx_am_enabled)
+ if (params->rx_dim_enabled)
c->rq.state |= BIT(MLX5E_RQ_STATE_AM);
return 0;
@@ -952,7 +952,7 @@ static void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
static void mlx5e_close_rq(struct mlx5e_rq *rq)
{
- cancel_work_sync(&rq->am.work);
+ cancel_work_sync(&rq->dim.work);
mlx5e_destroy_rq(rq);
mlx5e_free_rx_descs(rq);
mlx5e_free_rq(rq);
@@ -1565,7 +1565,7 @@ static void mlx5e_destroy_cq(struct mlx5e_cq *cq)
}
static int mlx5e_open_cq(struct mlx5e_channel *c,
- struct mlx5e_cq_moder moder,
+ struct net_dim_cq_moder moder,
struct mlx5e_cq_param *param,
struct mlx5e_cq *cq)
{
@@ -1747,7 +1747,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
struct mlx5e_channel_param *cparam,
struct mlx5e_channel **cp)
{
- struct mlx5e_cq_moder icocq_moder = {0, 0};
+ struct net_dim_cq_moder icocq_moder = {0, 0};
struct net_device *netdev = priv->netdev;
int cpu = mlx5e_get_cpu(priv, ix);
struct mlx5e_channel *c;
@@ -1999,7 +1999,7 @@ static void mlx5e_build_ico_cq_param(struct mlx5e_priv *priv,
mlx5e_build_common_cq_param(priv, param);
- param->cq_period_mode = MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
+ param->cq_period_mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
}
static void mlx5e_build_icosq_param(struct mlx5e_priv *priv,
@@ -4016,13 +4016,13 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
params->tx_cq_moderation.usec =
MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC;
- if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
+ if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
params->tx_cq_moderation.usec =
MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC_FROM_CQE;
MLX5E_SET_PFLAG(params, MLX5E_PFLAG_TX_CQE_BASED_MODER,
params->tx_cq_moderation.cq_period_mode ==
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
}
void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
@@ -4034,17 +4034,17 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
params->rx_cq_moderation.usec =
MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC;
- if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
+ if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
params->rx_cq_moderation.usec =
MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE;
- if (params->rx_am_enabled)
+ if (params->rx_dim_enabled)
params->rx_cq_moderation =
- mlx5e_am_get_def_profile(cq_period_mode);
+ net_dim_get_def_profile(cq_period_mode);
MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_CQE_BASED_MODER,
params->rx_cq_moderation.cq_period_mode ==
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
}
u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)
@@ -4100,9 +4100,9 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
/* CQ moderation params */
cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
- params->rx_am_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+ params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
mlx5e_set_rx_cq_mode_params(params, cq_period_mode);
mlx5e_set_tx_cq_mode_params(params, cq_period_mode);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index c6a77f8..ccb038f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -877,8 +877,8 @@ static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev,
struct mlx5e_params *params)
{
u8 cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
params->rq_wq_type = MLX5_WQ_TYPE_LINKED_LIST;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index 1849169..dae77a9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -79,7 +79,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
mlx5e_cq_arm(&c->sq[i].cq);
if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
- mlx5e_rx_am(&c->rq.am,
+ net_dim(&c->rq.dim,
c->rq.cq.event_ctr,
c->rq.stats.packets,
c->rq.stats.bytes);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
index ca05f4e..00b9ae3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
@@ -33,22 +33,22 @@
#include "en.h"
-#define MLX5E_PARAMS_AM_NUM_PROFILES 5
+#define NET_DIM_PARAMS_NUM_PROFILES 5
/* Adaptive moderation profiles */
-#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
-#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
-#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
-
-/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
-#define MLX5_AM_EQE_PROFILES { \
- {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
+#define NET_DIM_DEF_PROFILE_CQE 1
+#define NET_DIM_DEF_PROFILE_EQE 1
+
+/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
+#define NET_DIM_EQE_PROFILES { \
+ {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
}
-#define MLX5_AM_CQE_PROFILES { \
+#define NET_DIM_CQE_PROFILES { \
{2, 256}, \
{8, 128}, \
{16, 64}, \
@@ -56,193 +56,193 @@
{64, 64} \
}
-static const struct mlx5e_cq_moder
-profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
- MLX5_AM_EQE_PROFILES,
- MLX5_AM_CQE_PROFILES,
+static const struct net_dim_cq_moder
+profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
+ NET_DIM_EQE_PROFILES,
+ NET_DIM_CQE_PROFILES,
};
-struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
+struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
{
- struct mlx5e_cq_moder cq_moder;
+ struct net_dim_cq_moder cq_moder;
cq_moder = profile[cq_period_mode][ix];
cq_moder.cq_period_mode = cq_period_mode;
return cq_moder;
}
-struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
+struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
{
int default_profile_ix;
- if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
- default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
- else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
- default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
+ if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
+ default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
+ else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
+ default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
- return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
+ return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
}
-static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
+static bool net_dim_on_top(struct net_dim *dim)
{
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
return true;
- case MLX5E_AM_GOING_RIGHT:
- return (am->steps_left > 1) && (am->steps_right == 1);
- default: /* MLX5E_AM_GOING_LEFT */
- return (am->steps_right > 1) && (am->steps_left == 1);
+ case NET_DIM_GOING_RIGHT:
+ return (dim->steps_left > 1) && (dim->steps_right == 1);
+ default: /* NET_DIM_GOING_LEFT */
+ return (dim->steps_right > 1) && (dim->steps_left == 1);
}
}
-static void mlx5e_am_turn(struct mlx5e_rx_am *am)
+static void net_dim_turn(struct net_dim *dim)
{
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
break;
- case MLX5E_AM_GOING_RIGHT:
- am->tune_state = MLX5E_AM_GOING_LEFT;
- am->steps_left = 0;
+ case NET_DIM_GOING_RIGHT:
+ dim->tune_state = NET_DIM_GOING_LEFT;
+ dim->steps_left = 0;
break;
- case MLX5E_AM_GOING_LEFT:
- am->tune_state = MLX5E_AM_GOING_RIGHT;
- am->steps_right = 0;
+ case NET_DIM_GOING_LEFT:
+ dim->tune_state = NET_DIM_GOING_RIGHT;
+ dim->steps_right = 0;
break;
}
}
-static int mlx5e_am_step(struct mlx5e_rx_am *am)
+static int net_dim_step(struct net_dim *dim)
{
- if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
- return MLX5E_AM_TOO_TIRED;
+ if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
+ return NET_DIM_TOO_TIRED;
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- case MLX5E_AM_PARKING_TIRED:
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
break;
- case MLX5E_AM_GOING_RIGHT:
- if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
- return MLX5E_AM_ON_EDGE;
- am->profile_ix++;
- am->steps_right++;
+ case NET_DIM_GOING_RIGHT:
+ if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
+ return NET_DIM_ON_EDGE;
+ dim->profile_ix++;
+ dim->steps_right++;
break;
- case MLX5E_AM_GOING_LEFT:
- if (am->profile_ix == 0)
- return MLX5E_AM_ON_EDGE;
- am->profile_ix--;
- am->steps_left++;
+ case NET_DIM_GOING_LEFT:
+ if (dim->profile_ix == 0)
+ return NET_DIM_ON_EDGE;
+ dim->profile_ix--;
+ dim->steps_left++;
break;
}
- am->tired++;
- return MLX5E_AM_STEPPED;
+ dim->tired++;
+ return NET_DIM_STEPPED;
}
-static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
+static void net_dim_park_on_top(struct net_dim *dim)
{
- am->steps_right = 0;
- am->steps_left = 0;
- am->tired = 0;
- am->tune_state = MLX5E_AM_PARKING_ON_TOP;
+ dim->steps_right = 0;
+ dim->steps_left = 0;
+ dim->tired = 0;
+ dim->tune_state = NET_DIM_PARKING_ON_TOP;
}
-static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
+static void net_dim_park_tired(struct net_dim *dim)
{
- am->steps_right = 0;
- am->steps_left = 0;
- am->tune_state = MLX5E_AM_PARKING_TIRED;
+ dim->steps_right = 0;
+ dim->steps_left = 0;
+ dim->tune_state = NET_DIM_PARKING_TIRED;
}
-static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
+static void net_dim_exit_parking(struct net_dim *dim)
{
- am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
- MLX5E_AM_GOING_RIGHT;
- mlx5e_am_step(am);
+ dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
+ NET_DIM_GOING_RIGHT;
+ net_dim_step(dim);
}
#define IS_SIGNIFICANT_DIFF(val, ref) \
(((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
-static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
- struct mlx5e_rx_am_stats *prev)
+static int net_dim_stats_compare(struct net_dim_stats *curr,
+ struct net_dim_stats *prev)
{
if (!prev->bpms)
- return curr->bpms ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_SAME;
+ return curr->bpms ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_SAME;
if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
- return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
+ return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
- return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
+ return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
- return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
- MLX5E_AM_STATS_WORSE;
+ return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
- return MLX5E_AM_STATS_SAME;
+ return NET_DIM_STATS_SAME;
}
-static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
- struct mlx5e_rx_am *am)
+static bool net_dim_decision(struct net_dim_stats *curr_stats,
+ struct net_dim *dim)
{
- int prev_state = am->tune_state;
- int prev_ix = am->profile_ix;
+ int prev_state = dim->tune_state;
+ int prev_ix = dim->profile_ix;
int stats_res;
int step_res;
- switch (am->tune_state) {
- case MLX5E_AM_PARKING_ON_TOP:
- stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
- if (stats_res != MLX5E_AM_STATS_SAME)
- mlx5e_am_exit_parking(am);
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
+ if (stats_res != NET_DIM_STATS_SAME)
+ net_dim_exit_parking(dim);
break;
- case MLX5E_AM_PARKING_TIRED:
- am->tired--;
- if (!am->tired)
- mlx5e_am_exit_parking(am);
+ case NET_DIM_PARKING_TIRED:
+ dim->tired--;
+ if (!dim->tired)
+ net_dim_exit_parking(dim);
break;
- case MLX5E_AM_GOING_RIGHT:
- case MLX5E_AM_GOING_LEFT:
- stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
- if (stats_res != MLX5E_AM_STATS_BETTER)
- mlx5e_am_turn(am);
+ case NET_DIM_GOING_RIGHT:
+ case NET_DIM_GOING_LEFT:
+ stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
+ if (stats_res != NET_DIM_STATS_BETTER)
+ net_dim_turn(dim);
- if (mlx5e_am_on_top(am)) {
- mlx5e_am_park_on_top(am);
+ if (net_dim_on_top(dim)) {
+ net_dim_park_on_top(dim);
break;
}
- step_res = mlx5e_am_step(am);
+ step_res = net_dim_step(dim);
switch (step_res) {
- case MLX5E_AM_ON_EDGE:
- mlx5e_am_park_on_top(am);
+ case NET_DIM_ON_EDGE:
+ net_dim_park_on_top(dim);
break;
- case MLX5E_AM_TOO_TIRED:
- mlx5e_am_park_tired(am);
+ case NET_DIM_TOO_TIRED:
+ net_dim_park_tired(dim);
break;
}
break;
}
- if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
- (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
- am->prev_stats = *curr_stats;
+ if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
+ (dim->tune_state != NET_DIM_PARKING_ON_TOP))
+ dim->prev_stats = *curr_stats;
- return am->profile_ix != prev_ix;
+ return dim->profile_ix != prev_ix;
}
-static void mlx5e_am_sample(u16 event_ctr,
- u64 packets,
- u64 bytes,
- struct mlx5e_rx_am_sample *s)
+static void net_dim_sample(u16 event_ctr,
+ u64 packets,
+ u64 bytes,
+ struct net_dim_sample *s)
{
s->time = ktime_get();
s->pkt_ctr = packets;
@@ -250,13 +250,13 @@ static void mlx5e_am_sample(u16 event_ctr,
s->event_ctr = event_ctr;
}
-#define MLX5E_AM_NEVENTS 64
+#define NET_DIM_NEVENTS 64
#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
-static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
- struct mlx5e_rx_am_sample *end,
- struct mlx5e_rx_am_stats *curr_stats)
+static void net_dim_calc_stats(struct net_dim_sample *start,
+ struct net_dim_sample *end,
+ struct net_dim_stats *curr_stats)
{
/* u32 holds up to 71 minutes, should be enough */
u32 delta_us = ktime_us_delta(end->time, start->time);
@@ -269,39 +269,39 @@ static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
- curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
+ curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
delta_us);
}
-void mlx5e_rx_am(struct mlx5e_rx_am *am,
- u16 event_ctr,
- u64 packets,
- u64 bytes)
+void net_dim(struct net_dim *dim,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes)
{
- struct mlx5e_rx_am_sample end_sample;
- struct mlx5e_rx_am_stats curr_stats;
+ struct net_dim_sample end_sample;
+ struct net_dim_stats curr_stats;
u16 nevents;
- switch (am->state) {
- case MLX5E_AM_MEASURE_IN_PROGRESS:
+ switch (dim->state) {
+ case NET_DIM_MEASURE_IN_PROGRESS:
nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
- am->start_sample.event_ctr);
- if (nevents < MLX5E_AM_NEVENTS)
+ dim->start_sample.event_ctr);
+ if (nevents < NET_DIM_NEVENTS)
break;
- mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
- mlx5e_am_calc_stats(&am->start_sample, &end_sample,
+ net_dim_sample(event_ctr, packets, bytes, &end_sample);
+ net_dim_calc_stats(&dim->start_sample, &end_sample,
&curr_stats);
- if (mlx5e_am_decision(&curr_stats, am)) {
- am->state = MLX5E_AM_APPLY_NEW_PROFILE;
- schedule_work(&am->work);
+ if (net_dim_decision(&curr_stats, dim)) {
+ dim->state = NET_DIM_APPLY_NEW_PROFILE;
+ schedule_work(&dim->work);
break;
}
/* fall through */
- case MLX5E_AM_START_MEASURE:
- mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
- am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
+ case NET_DIM_START_MEASURE:
+ net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);
+ dim->state = NET_DIM_MEASURE_IN_PROGRESS;
break;
- case MLX5E_AM_APPLY_NEW_PROFILE:
+ case NET_DIM_APPLY_NEW_PROFILE:
break;
}
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
index 5ce8e54..a775c12 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
@@ -31,32 +31,32 @@
* SOFTWARE.
*/
-#ifndef MLX5_AM_H
-#define MLX5_AM_H
+#ifndef NET_DIM_H
+#define NET_DIM_H
-struct mlx5e_cq_moder {
+struct net_dim_cq_moder {
u16 usec;
u16 pkts;
u8 cq_period_mode;
};
-struct mlx5e_rx_am_sample {
+struct net_dim_sample {
ktime_t time;
u32 pkt_ctr;
u32 byte_ctr;
u16 event_ctr;
};
-struct mlx5e_rx_am_stats {
+struct net_dim_stats {
int ppms; /* packets per msec */
int bpms; /* bytes per msec */
int epms; /* events per msec */
};
-struct mlx5e_rx_am { /* Adaptive Moderation */
+struct net_dim { /* Adaptive Moderation */
u8 state;
- struct mlx5e_rx_am_stats prev_stats;
- struct mlx5e_rx_am_sample start_sample;
+ struct net_dim_stats prev_stats;
+ struct net_dim_sample start_sample;
struct work_struct work;
u8 profile_ix;
u8 mode;
@@ -67,43 +67,42 @@ struct mlx5e_rx_am { /* Adaptive Moderation */
};
enum {
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
- MLX5_CQ_PERIOD_NUM_MODES
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
+ NET_DIM_CQ_PERIOD_NUM_MODES
};
/* Adaptive moderation logic */
enum {
- MLX5E_AM_START_MEASURE,
- MLX5E_AM_MEASURE_IN_PROGRESS,
- MLX5E_AM_APPLY_NEW_PROFILE,
+ NET_DIM_START_MEASURE,
+ NET_DIM_MEASURE_IN_PROGRESS,
+ NET_DIM_APPLY_NEW_PROFILE,
};
enum {
- MLX5E_AM_PARKING_ON_TOP,
- MLX5E_AM_PARKING_TIRED,
- MLX5E_AM_GOING_RIGHT,
- MLX5E_AM_GOING_LEFT,
+ NET_DIM_PARKING_ON_TOP,
+ NET_DIM_PARKING_TIRED,
+ NET_DIM_GOING_RIGHT,
+ NET_DIM_GOING_LEFT,
};
enum {
- MLX5E_AM_STATS_WORSE,
- MLX5E_AM_STATS_SAME,
- MLX5E_AM_STATS_BETTER,
+ NET_DIM_STATS_WORSE,
+ NET_DIM_STATS_SAME,
+ NET_DIM_STATS_BETTER,
};
enum {
- MLX5E_AM_STEPPED,
- MLX5E_AM_TOO_TIRED,
- MLX5E_AM_ON_EDGE,
+ NET_DIM_STEPPED,
+ NET_DIM_TOO_TIRED,
+ NET_DIM_ON_EDGE,
};
-void mlx5e_rx_am(struct mlx5e_rx_am *am,
- u16 event_ctr,
- u64 packets,
- u64 bytes);
-void mlx5e_rx_am_work(struct work_struct *work);
-struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
-struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
+void net_dim(struct net_dim *dim,
+ u16 event_ctr,
+ u64 packets,
+ u64 bytes);
+struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode);
+struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix);
-#endif /* MLX5_AM_H */
+#endif /* NET_DIM_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 07/10] net: move dynamic interrupt coalescing code to include/linux
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (5 preceding siblings ...)
2018-01-04 20:21 ` [net-next 06/10] net/mlx5e: change Mellanox references in DIM code Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim Andy Gospodarek
` (5 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
This move allows drivers to add private structure elements to track the
number of packets, bytes, and interrupts events per ring. A driver
also defines a workqueue handler to act on this collected data once per
poll and modify the coalescing parameters per ring.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Acked-by: Tal Gilboa <talgi@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +-
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_dim.h | 105 ------
drivers/net/ethernet/mellanox/mlx5/core/net_dim.c | 307 ------------------
include/linux/net_dim.h | 376 ++++++++++++++++++++++
6 files changed, 379 insertions(+), 415 deletions(-)
delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
create mode 100644 include/linux/net_dim.h
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index b46b6de2..c805769 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -15,7 +15,7 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \
mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \
en_tx.o en_rx.o en_dim.o en_txrx.o en_stats.o vxlan.o \
- en_arfs.o en_fs_ethtool.o en_selftest.o net_dim.o
+ en_arfs.o en_fs_ethtool.o en_selftest.o
mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index da2d5e7..41e6783 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -46,11 +46,10 @@
#include <linux/mlx5/transobj.h>
#include <linux/rhashtable.h>
#include <net/switchdev.h>
+#include <linux/net_dim.h>
#include "wq.h"
#include "mlx5_core.h"
#include "en_stats.h"
-#include "en_dim.h"
-#include "net_dim.h"
#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
index f620325..2b89951 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
@@ -30,6 +30,7 @@
* SOFTWARE.
*/
+#include <linux/net_dim.h>
#include "en.h"
void mlx5e_rx_dim_work(struct work_struct *work)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
deleted file mode 100644
index 21219de..0000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dim.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2013-2015, Mellanox Technologies, Ltd. All rights reserved.
- * Copyright (c) 2017, Broadcom Limited
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-*/
-
-#ifndef MLX5_AM_H
-#define MLX5_AM_H
-
-struct mlx5e_cq_moder {
- u16 usec;
- u16 pkts;
- u8 cq_period_mode;
-};
-
-struct mlx5e_rx_dim_sample {
- ktime_t time;
- u32 pkt_ctr;
- u32 byte_ctr;
- u16 event_ctr;
-};
-
-struct mlx5e_rx_dim_stats {
- int ppms; /* packets per msec */
- int bpms; /* bytes per msec */
- int epms; /* events per msec */
-};
-
-struct mlx5e_rx_dim { /* Adaptive Moderation */
- u8 state;
- struct mlx5e_rx_dim_stats prev_stats;
- struct mlx5e_rx_dim_sample start_sample;
- struct work_struct work;
- u8 profile_ix;
- u8 mode;
- u8 tune_state;
- u8 steps_right;
- u8 steps_left;
- u8 tired;
-};
-
-enum {
- MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
- MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
- MLX5_CQ_PERIOD_NUM_MODES
-};
-
-/* Adaptive moderation logic */
-enum {
- MLX5E_AM_START_MEASURE,
- MLX5E_AM_MEASURE_IN_PROGRESS,
- MLX5E_AM_APPLY_NEW_PROFILE,
-};
-
-enum {
- MLX5E_AM_PARKING_ON_TOP,
- MLX5E_AM_PARKING_TIRED,
- MLX5E_AM_GOING_RIGHT,
- MLX5E_AM_GOING_LEFT,
-};
-
-enum {
- MLX5E_AM_STATS_WORSE,
- MLX5E_AM_STATS_SAME,
- MLX5E_AM_STATS_BETTER,
-};
-
-enum {
- MLX5E_AM_STEPPED,
- MLX5E_AM_TOO_TIRED,
- MLX5E_AM_ON_EDGE,
-};
-
-void mlx5e_rx_dim_work(struct work_struct *work);
-struct mlx5e_cq_moder mlx5e_dim_get_def_profile(u8 rx_cq_period_mode);
-struct mlx5e_cq_moder mlx5e_dim_get_profile(u8 cq_period_mode, int ix);
-
-#endif /* MLX5_AM_H */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
deleted file mode 100644
index 00b9ae3..0000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
- * Copyright (c) 2017, Broadcom Limiited. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses. You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "en.h"
-
-#define NET_DIM_PARAMS_NUM_PROFILES 5
-/* Adaptive moderation profiles */
-#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
-#define NET_DIM_DEF_PROFILE_CQE 1
-#define NET_DIM_DEF_PROFILE_EQE 1
-
-/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
-#define NET_DIM_EQE_PROFILES { \
- {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
- {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-}
-
-#define NET_DIM_CQE_PROFILES { \
- {2, 256}, \
- {8, 128}, \
- {16, 64}, \
- {32, 64}, \
- {64, 64} \
-}
-
-static const struct net_dim_cq_moder
-profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
- NET_DIM_EQE_PROFILES,
- NET_DIM_CQE_PROFILES,
-};
-
-struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
-{
- struct net_dim_cq_moder cq_moder;
-
- cq_moder = profile[cq_period_mode][ix];
- cq_moder.cq_period_mode = cq_period_mode;
- return cq_moder;
-}
-
-struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
-{
- int default_profile_ix;
-
- if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
- default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
- else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
- default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
-
- return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
-}
-
-static bool net_dim_on_top(struct net_dim *dim)
-{
- switch (dim->tune_state) {
- case NET_DIM_PARKING_ON_TOP:
- case NET_DIM_PARKING_TIRED:
- return true;
- case NET_DIM_GOING_RIGHT:
- return (dim->steps_left > 1) && (dim->steps_right == 1);
- default: /* NET_DIM_GOING_LEFT */
- return (dim->steps_right > 1) && (dim->steps_left == 1);
- }
-}
-
-static void net_dim_turn(struct net_dim *dim)
-{
- switch (dim->tune_state) {
- case NET_DIM_PARKING_ON_TOP:
- case NET_DIM_PARKING_TIRED:
- break;
- case NET_DIM_GOING_RIGHT:
- dim->tune_state = NET_DIM_GOING_LEFT;
- dim->steps_left = 0;
- break;
- case NET_DIM_GOING_LEFT:
- dim->tune_state = NET_DIM_GOING_RIGHT;
- dim->steps_right = 0;
- break;
- }
-}
-
-static int net_dim_step(struct net_dim *dim)
-{
- if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
- return NET_DIM_TOO_TIRED;
-
- switch (dim->tune_state) {
- case NET_DIM_PARKING_ON_TOP:
- case NET_DIM_PARKING_TIRED:
- break;
- case NET_DIM_GOING_RIGHT:
- if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
- return NET_DIM_ON_EDGE;
- dim->profile_ix++;
- dim->steps_right++;
- break;
- case NET_DIM_GOING_LEFT:
- if (dim->profile_ix == 0)
- return NET_DIM_ON_EDGE;
- dim->profile_ix--;
- dim->steps_left++;
- break;
- }
-
- dim->tired++;
- return NET_DIM_STEPPED;
-}
-
-static void net_dim_park_on_top(struct net_dim *dim)
-{
- dim->steps_right = 0;
- dim->steps_left = 0;
- dim->tired = 0;
- dim->tune_state = NET_DIM_PARKING_ON_TOP;
-}
-
-static void net_dim_park_tired(struct net_dim *dim)
-{
- dim->steps_right = 0;
- dim->steps_left = 0;
- dim->tune_state = NET_DIM_PARKING_TIRED;
-}
-
-static void net_dim_exit_parking(struct net_dim *dim)
-{
- dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
- NET_DIM_GOING_RIGHT;
- net_dim_step(dim);
-}
-
-#define IS_SIGNIFICANT_DIFF(val, ref) \
- (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
-
-static int net_dim_stats_compare(struct net_dim_stats *curr,
- struct net_dim_stats *prev)
-{
- if (!prev->bpms)
- return curr->bpms ? NET_DIM_STATS_BETTER :
- NET_DIM_STATS_SAME;
-
- if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
- return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
- NET_DIM_STATS_WORSE;
-
- if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
- return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
- NET_DIM_STATS_WORSE;
-
- if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
- return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
- NET_DIM_STATS_WORSE;
-
- return NET_DIM_STATS_SAME;
-}
-
-static bool net_dim_decision(struct net_dim_stats *curr_stats,
- struct net_dim *dim)
-{
- int prev_state = dim->tune_state;
- int prev_ix = dim->profile_ix;
- int stats_res;
- int step_res;
-
- switch (dim->tune_state) {
- case NET_DIM_PARKING_ON_TOP:
- stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
- if (stats_res != NET_DIM_STATS_SAME)
- net_dim_exit_parking(dim);
- break;
-
- case NET_DIM_PARKING_TIRED:
- dim->tired--;
- if (!dim->tired)
- net_dim_exit_parking(dim);
- break;
-
- case NET_DIM_GOING_RIGHT:
- case NET_DIM_GOING_LEFT:
- stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
- if (stats_res != NET_DIM_STATS_BETTER)
- net_dim_turn(dim);
-
- if (net_dim_on_top(dim)) {
- net_dim_park_on_top(dim);
- break;
- }
-
- step_res = net_dim_step(dim);
- switch (step_res) {
- case NET_DIM_ON_EDGE:
- net_dim_park_on_top(dim);
- break;
- case NET_DIM_TOO_TIRED:
- net_dim_park_tired(dim);
- break;
- }
-
- break;
- }
-
- if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
- (dim->tune_state != NET_DIM_PARKING_ON_TOP))
- dim->prev_stats = *curr_stats;
-
- return dim->profile_ix != prev_ix;
-}
-
-static void net_dim_sample(u16 event_ctr,
- u64 packets,
- u64 bytes,
- struct net_dim_sample *s)
-{
- s->time = ktime_get();
- s->pkt_ctr = packets;
- s->byte_ctr = bytes;
- s->event_ctr = event_ctr;
-}
-
-#define NET_DIM_NEVENTS 64
-#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
-#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
-
-static void net_dim_calc_stats(struct net_dim_sample *start,
- struct net_dim_sample *end,
- struct net_dim_stats *curr_stats)
-{
- /* u32 holds up to 71 minutes, should be enough */
- u32 delta_us = ktime_us_delta(end->time, start->time);
- u32 npkts = BIT_GAP(BITS_PER_TYPE(u32), end->pkt_ctr, start->pkt_ctr);
- u32 nbytes = BIT_GAP(BITS_PER_TYPE(u32), end->byte_ctr,
- start->byte_ctr);
-
- if (!delta_us)
- return;
-
- curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
- curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
- curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
- delta_us);
-}
-
-void net_dim(struct net_dim *dim,
- u16 event_ctr,
- u64 packets,
- u64 bytes)
-{
- 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,
- 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)) {
- dim->state = NET_DIM_APPLY_NEW_PROFILE;
- schedule_work(&dim->work);
- break;
- }
- /* 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:
- break;
- }
-}
diff --git a/include/linux/net_dim.h b/include/linux/net_dim.h
new file mode 100644
index 0000000..bb99073
--- /dev/null
+++ b/include/linux/net_dim.h
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 2013-2015, Mellanox Technologies, Ltd. All rights reserved.
+ * Copyright (c) 2017, Broadcom Limited
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+#ifndef NET_DIM_H
+#define NET_DIM_H
+
+#include <linux/module.h>
+
+struct net_dim_cq_moder {
+ u16 usec;
+ u16 pkts;
+ u8 cq_period_mode;
+};
+
+struct net_dim_sample {
+ ktime_t time;
+ u32 pkt_ctr;
+ u32 byte_ctr;
+ u16 event_ctr;
+};
+
+struct net_dim_stats {
+ int ppms; /* packets per msec */
+ int bpms; /* bytes per msec */
+ int epms; /* events per msec */
+};
+
+struct net_dim { /* Adaptive Moderation */
+ u8 state;
+ struct net_dim_stats prev_stats;
+ struct net_dim_sample start_sample;
+ struct work_struct work;
+ u8 profile_ix;
+ u8 mode;
+ u8 tune_state;
+ u8 steps_right;
+ u8 steps_left;
+ u8 tired;
+};
+
+enum {
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
+ NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
+ NET_DIM_CQ_PERIOD_NUM_MODES
+};
+
+/* Adaptive moderation logic */
+enum {
+ NET_DIM_START_MEASURE,
+ NET_DIM_MEASURE_IN_PROGRESS,
+ NET_DIM_APPLY_NEW_PROFILE,
+};
+
+enum {
+ NET_DIM_PARKING_ON_TOP,
+ NET_DIM_PARKING_TIRED,
+ NET_DIM_GOING_RIGHT,
+ NET_DIM_GOING_LEFT,
+};
+
+enum {
+ NET_DIM_STATS_WORSE,
+ NET_DIM_STATS_SAME,
+ NET_DIM_STATS_BETTER,
+};
+
+enum {
+ NET_DIM_STEPPED,
+ NET_DIM_TOO_TIRED,
+ NET_DIM_ON_EDGE,
+};
+
+#define NET_DIM_PARAMS_NUM_PROFILES 5
+/* Adaptive moderation profiles */
+#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
+#define NET_DIM_DEF_PROFILE_CQE 1
+#define NET_DIM_DEF_PROFILE_EQE 1
+
+/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
+#define NET_DIM_EQE_PROFILES { \
+ {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+ {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
+}
+
+#define NET_DIM_CQE_PROFILES { \
+ {2, 256}, \
+ {8, 128}, \
+ {16, 64}, \
+ {32, 64}, \
+ {64, 64} \
+}
+
+static const struct net_dim_cq_moder
+profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
+ NET_DIM_EQE_PROFILES,
+ NET_DIM_CQE_PROFILES,
+};
+
+static inline struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
+{
+ struct net_dim_cq_moder cq_moder;
+
+ cq_moder = profile[cq_period_mode][ix];
+ cq_moder.cq_period_mode = cq_period_mode;
+ return cq_moder;
+}
+
+static inline struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
+{
+ int default_profile_ix;
+
+ if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
+ default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
+ else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
+ default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
+
+ return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
+}
+
+static inline bool net_dim_on_top(struct net_dim *dim)
+{
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
+ return true;
+ case NET_DIM_GOING_RIGHT:
+ return (dim->steps_left > 1) && (dim->steps_right == 1);
+ default: /* NET_DIM_GOING_LEFT */
+ return (dim->steps_right > 1) && (dim->steps_left == 1);
+ }
+}
+
+static inline void net_dim_turn(struct net_dim *dim)
+{
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
+ break;
+ case NET_DIM_GOING_RIGHT:
+ dim->tune_state = NET_DIM_GOING_LEFT;
+ dim->steps_left = 0;
+ break;
+ case NET_DIM_GOING_LEFT:
+ dim->tune_state = NET_DIM_GOING_RIGHT;
+ dim->steps_right = 0;
+ break;
+ }
+}
+
+static inline int net_dim_step(struct net_dim *dim)
+{
+ if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
+ return NET_DIM_TOO_TIRED;
+
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ case NET_DIM_PARKING_TIRED:
+ break;
+ case NET_DIM_GOING_RIGHT:
+ if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
+ return NET_DIM_ON_EDGE;
+ dim->profile_ix++;
+ dim->steps_right++;
+ break;
+ case NET_DIM_GOING_LEFT:
+ if (dim->profile_ix == 0)
+ return NET_DIM_ON_EDGE;
+ dim->profile_ix--;
+ dim->steps_left++;
+ break;
+ }
+
+ dim->tired++;
+ return NET_DIM_STEPPED;
+}
+
+static inline void net_dim_park_on_top(struct net_dim *dim)
+{
+ dim->steps_right = 0;
+ dim->steps_left = 0;
+ dim->tired = 0;
+ dim->tune_state = NET_DIM_PARKING_ON_TOP;
+}
+
+static inline void net_dim_park_tired(struct net_dim *dim)
+{
+ dim->steps_right = 0;
+ dim->steps_left = 0;
+ dim->tune_state = NET_DIM_PARKING_TIRED;
+}
+
+static inline void net_dim_exit_parking(struct net_dim *dim)
+{
+ dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
+ NET_DIM_GOING_RIGHT;
+ net_dim_step(dim);
+}
+
+#define IS_SIGNIFICANT_DIFF(val, ref) \
+ (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
+
+static inline int net_dim_stats_compare(struct net_dim_stats *curr,
+ struct net_dim_stats *prev)
+{
+ if (!prev->bpms)
+ return curr->bpms ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_SAME;
+
+ if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
+ return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
+
+ if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
+ return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
+
+ if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
+ return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
+ NET_DIM_STATS_WORSE;
+
+ return NET_DIM_STATS_SAME;
+}
+
+static inline bool net_dim_decision(struct net_dim_stats *curr_stats,
+ struct net_dim *dim)
+{
+ int prev_state = dim->tune_state;
+ int prev_ix = dim->profile_ix;
+ int stats_res;
+ int step_res;
+
+ switch (dim->tune_state) {
+ case NET_DIM_PARKING_ON_TOP:
+ stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
+ if (stats_res != NET_DIM_STATS_SAME)
+ net_dim_exit_parking(dim);
+ break;
+
+ case NET_DIM_PARKING_TIRED:
+ dim->tired--;
+ if (!dim->tired)
+ net_dim_exit_parking(dim);
+ break;
+
+ case NET_DIM_GOING_RIGHT:
+ case NET_DIM_GOING_LEFT:
+ stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
+ if (stats_res != NET_DIM_STATS_BETTER)
+ net_dim_turn(dim);
+
+ if (net_dim_on_top(dim)) {
+ net_dim_park_on_top(dim);
+ break;
+ }
+
+ step_res = net_dim_step(dim);
+ switch (step_res) {
+ case NET_DIM_ON_EDGE:
+ net_dim_park_on_top(dim);
+ break;
+ case NET_DIM_TOO_TIRED:
+ net_dim_park_tired(dim);
+ break;
+ }
+
+ break;
+ }
+
+ if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
+ (dim->tune_state != NET_DIM_PARKING_ON_TOP))
+ dim->prev_stats = *curr_stats;
+
+ return dim->profile_ix != prev_ix;
+}
+
+static inline void net_dim_sample(u16 event_ctr,
+ u64 packets,
+ u64 bytes,
+ struct net_dim_sample *s)
+{
+ s->time = ktime_get();
+ s->pkt_ctr = packets;
+ s->byte_ctr = bytes;
+ s->event_ctr = event_ctr;
+}
+
+#define NET_DIM_NEVENTS 64
+#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
+#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
+
+static inline void net_dim_calc_stats(struct net_dim_sample *start,
+ struct net_dim_sample *end,
+ struct net_dim_stats *curr_stats)
+{
+ /* u32 holds up to 71 minutes, should be enough */
+ u32 delta_us = ktime_us_delta(end->time, start->time);
+ u32 npkts = BIT_GAP(BITS_PER_TYPE(u32), end->pkt_ctr, start->pkt_ctr);
+ u32 nbytes = BIT_GAP(BITS_PER_TYPE(u32), end->byte_ctr,
+ start->byte_ctr);
+
+ if (!delta_us)
+ return;
+
+ curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
+ curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
+ curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
+ delta_us);
+}
+
+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_stats curr_stats;
+ u16 nevents;
+
+ switch (dim->state) {
+ case NET_DIM_MEASURE_IN_PROGRESS:
+ nevents = BIT_GAP(BITS_PER_TYPE(u16), 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)) {
+ dim->state = NET_DIM_APPLY_NEW_PROFILE;
+ schedule_work(&dim->work);
+ break;
+ }
+ /* 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:
+ break;
+ }
+}
+
+#endif /* NET_DIM_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (6 preceding siblings ...)
2018-01-04 20:21 ` [net-next 07/10] net: move dynamic interrupt coalescing code to include/linux Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-05 8:13 ` Tal Gilboa
2018-01-04 20:21 ` [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation Andy Gospodarek
` (4 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
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>
---
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 dae77a9..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 bb99073..2cceefa 100644
--- a/include/linux/net_dim.h
+++ b/include/linux/net_dim.h
@@ -341,21 +341,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)) {
@@ -365,7 +362,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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (7 preceding siblings ...)
2018-01-04 20:21 ` [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 22:16 ` Michael Chan
2018-01-04 20:21 ` [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation Andy Gospodarek
` (3 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
This implements the changes needed for the bnxt_en driver to add support
for dynamic interrupt moderation per ring.
This does add additional counters in the receive path, but testing shows
that any additional instructions are offset by throughput gain when the
default configuration is for low latency.
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 52 +++++++++++++++++++++++
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 34 ++++++++++-----
drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 32 ++++++++++++++
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 ++++++
5 files changed, 120 insertions(+), 12 deletions(-)
create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
diff --git a/drivers/net/ethernet/broadcom/bnxt/Makefile b/drivers/net/ethernet/broadcom/bnxt/Makefile
index 59c8ec9..7c560d5 100644
--- a/drivers/net/ethernet/broadcom/bnxt/Makefile
+++ b/drivers/net/ethernet/broadcom/bnxt/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_BNXT) += bnxt_en.o
-bnxt_en-y := bnxt.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o bnxt_vfr.o bnxt_devlink.o
+bnxt_en-y := bnxt.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o bnxt_vfr.o bnxt_devlink.o bnxt_dim.o
bnxt_en-$(CONFIG_BNXT_FLOWER_OFFLOAD) += bnxt_tc.o
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9efbdc6..3c5d2fa 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1645,6 +1645,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
rxr->rx_next_cons = NEXT_RX(cons);
next_rx_no_prod:
+ cpr->rx_packets += 1;
+ cpr->rx_bytes += len;
*raw_cons = tmp_raw_cons;
return rc;
@@ -1802,6 +1804,7 @@ static irqreturn_t bnxt_msix(int irq, void *dev_instance)
struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
u32 cons = RING_CMP(cpr->cp_raw_cons);
+ cpr->event_ctr++;
prefetch(&cpr->cp_desc_ring[CP_RING(cons)][CP_IDX(cons)]);
napi_schedule(&bnapi->napi);
return IRQ_HANDLED;
@@ -2025,6 +2028,14 @@ static int bnxt_poll(struct napi_struct *napi, int budget)
break;
}
}
+ if (bp->flags & BNXT_FLAG_DIM) {
+ struct net_dim_sample dim_sample;
+ net_dim_sample(cpr->event_ctr,
+ cpr->rx_packets,
+ cpr->rx_bytes,
+ &dim_sample);
+ net_dim(&cpr->am, dim_sample);
+ }
mmiowb();
return work_done;
}
@@ -2610,6 +2621,8 @@ static void bnxt_init_cp_rings(struct bnxt *bp)
struct bnxt_ring_struct *ring = &cpr->cp_ring_struct;
ring->fw_ring_id = INVALID_HW_RING_ID;
+ cpr->rx_ring_coal.coal_ticks = bp->rx_coal.coal_ticks;
+ cpr->rx_ring_coal.coal_bufs = bp->rx_coal.coal_bufs;
}
}
@@ -4583,6 +4596,41 @@ static void bnxt_hwrm_set_coal_params(struct bnxt_coal *hw_coal,
req->flags = cpu_to_le16(flags);
}
+int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi)
+{
+ struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req_rx = {0};
+ struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
+ struct bnxt_coal coal;
+ unsigned int grp_idx;
+ int rc = 0;
+
+ /* Tick values in micro seconds.
+ * 1 coal_buf x bufs_per_record = 1 completion record.
+ */
+ memcpy(&coal, &bp->rx_coal, sizeof(struct bnxt_coal));
+
+ coal.coal_ticks = cpr->rx_ring_coal.coal_ticks;
+ coal.coal_bufs = cpr->rx_ring_coal.coal_bufs;
+
+ if (!bnapi->rx_ring)
+ return -ENODEV;
+
+ bnxt_hwrm_cmd_hdr_init(bp, &req_rx,
+ HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);
+
+ bnxt_hwrm_set_coal_params(&coal, &req_rx);
+
+ mutex_lock(&bp->hwrm_cmd_lock);
+ grp_idx = bnapi->index;
+
+ req_rx.ring_id = cpu_to_le16(bp->grp_info[grp_idx].cp_fw_ring_id);
+
+ rc = _hwrm_send_message(bp, &req_rx, sizeof(req_rx),
+ HWRM_CMD_TIMEOUT);
+ mutex_unlock(&bp->hwrm_cmd_lock);
+ return rc;
+}
+
int bnxt_hwrm_set_coal(struct bnxt *bp)
{
int i, rc = 0;
@@ -5705,7 +5753,11 @@ static void bnxt_enable_napi(struct bnxt *bp)
int i;
for (i = 0; i < bp->cp_nr_rings; i++) {
+ struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
bp->bnapi[i]->in_reset = false;
+
+ INIT_WORK(&cpr->am.work, bnxt_dim_work);
+ cpr->am.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
napi_enable(&bp->bnapi[i]->napi);
}
}
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 5359a1f..b3d5a363 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -23,6 +23,7 @@
#include <net/devlink.h>
#include <net/dst_metadata.h>
#include <net/switchdev.h>
+#include <linux/net_dim.h>
struct tx_bd {
__le32 tx_bd_len_flags_type;
@@ -607,6 +608,17 @@ struct bnxt_tx_ring_info {
struct bnxt_ring_struct tx_ring_struct;
};
+struct bnxt_coal {
+ u16 coal_ticks;
+ u16 coal_ticks_irq;
+ u16 coal_bufs;
+ u16 coal_bufs_irq;
+ /* RING_IDLE enabled when coal ticks < idle_thresh */
+ u16 idle_thresh;
+ u8 bufs_per_record;
+ u8 budget;
+};
+
struct bnxt_tpa_info {
void *data;
u8 *data_ptr;
@@ -670,6 +682,13 @@ struct bnxt_cp_ring_info {
u32 cp_raw_cons;
void __iomem *cp_doorbell;
+ struct bnxt_coal rx_ring_coal;
+ u64 rx_packets;
+ u64 rx_bytes;
+ u64 event_ctr;
+
+ struct net_dim am;
+
struct tx_cmp *cp_desc_ring[MAX_CP_PAGES];
dma_addr_t cp_desc_mapping[MAX_CP_PAGES];
@@ -944,17 +963,6 @@ struct bnxt_test_info {
#define BNXT_CAG_REG_LEGACY_INT_STATUS 0x4014
#define BNXT_CAG_REG_BASE 0x300000
-struct bnxt_coal {
- u16 coal_ticks;
- u16 coal_ticks_irq;
- u16 coal_bufs;
- u16 coal_bufs_irq;
- /* RING_IDLE enabled when coal ticks < idle_thresh */
- u16 idle_thresh;
- u8 bufs_per_record;
- u8 budget;
-};
-
struct bnxt_tc_flow_stats {
u64 packets;
u64 bytes;
@@ -1126,6 +1134,7 @@ struct bnxt {
#define BNXT_FLAG_DOUBLE_DB 0x400000
#define BNXT_FLAG_FW_DCBX_AGENT 0x800000
#define BNXT_FLAG_CHIP_NITRO_A0 0x1000000
+ #define BNXT_FLAG_DIM 0x2000000
#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA | \
BNXT_FLAG_RFS | \
@@ -1423,4 +1432,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);
int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);
void bnxt_restore_pf_fw_resources(struct bnxt *bp);
int bnxt_port_attr_get(struct bnxt *bp, struct switchdev_attr *attr);
+void bnxt_dim_work(struct work_struct *work);
+int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi);
+
#endif
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
new file mode 100644
index 0000000..0eefe4b
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017 Broadcom Limited
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ */
+
+#include <linux/net_dim.h>
+#include "bnxt_hsi.h"
+#include "bnxt.h"
+
+void bnxt_dim_work(struct work_struct *work)
+{
+ struct net_dim *am = container_of(work, struct net_dim,
+ work);
+ struct bnxt_cp_ring_info *cpr = container_of(am,
+ struct bnxt_cp_ring_info,
+ am);
+ struct bnxt_napi *bnapi = container_of(cpr,
+ struct bnxt_napi,
+ cp_ring);
+ struct net_dim_cq_moder cur_profile = net_dim_get_profile(am->mode,
+ am->profile_ix);
+
+ cpr->rx_ring_coal.coal_ticks = cur_profile.usec;
+ cpr->rx_ring_coal.coal_bufs = cur_profile.pkts;
+
+ bnxt_hwrm_set_ring_coal(bnapi->bp, bnapi);
+ am->state = NET_DIM_START_MEASURE;
+}
+
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index fe7599f..632e03b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -49,6 +49,8 @@ static int bnxt_get_coalesce(struct net_device *dev,
memset(coal, 0, sizeof(*coal));
+ coal->use_adaptive_rx_coalesce = bp->flags & BNXT_FLAG_DIM;
+
hw_coal = &bp->rx_coal;
mult = hw_coal->bufs_per_record;
coal->rx_coalesce_usecs = hw_coal->coal_ticks;
@@ -77,6 +79,15 @@ static int bnxt_set_coalesce(struct net_device *dev,
int rc = 0;
u16 mult;
+ if (coal->use_adaptive_rx_coalesce)
+ bp->flags |= BNXT_FLAG_DIM;
+ else {
+ if (bp->flags & BNXT_FLAG_DIM) {
+ bp->flags &= ~(BNXT_FLAG_DIM);
+ goto reset_coalesce;
+ }
+ }
+
hw_coal = &bp->rx_coal;
mult = hw_coal->bufs_per_record;
hw_coal->coal_ticks = coal->rx_coalesce_usecs;
@@ -104,6 +115,7 @@ static int bnxt_set_coalesce(struct net_device *dev,
update_stats = true;
}
+reset_coalesce:
if (netif_running(dev)) {
if (update_stats) {
rc = bnxt_close_nic(bp, true, false);
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (8 preceding siblings ...)
2018-01-04 20:21 ` [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation Andy Gospodarek
@ 2018-01-04 20:21 ` Andy Gospodarek
2018-01-04 22:36 ` Stephen Hemminger
2018-01-04 20:37 ` [net-next 00/10] net: create dynamic software irq moderation library Or Gerlitz
` (2 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 20:21 UTC (permalink / raw)
To: netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
From: Andy Gospodarek <gospo@broadcom.com>
Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
Signed-off-by: Tal Gilboa <talgi@mellanox.com>
---
MAINTAINERS | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 753799d..769857b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4944,6 +4944,11 @@ S: Maintained
F: lib/dynamic_debug.c
F: include/linux/dynamic_debug.h
+DYNAMIC INTERRUPT MODERATION
+M: Tal Gilboa <talgi@mellanox.com>
+S: Mainained
+F: include/linux/net_dim.h
+
DZ DECSTATION DZ11 SERIAL DRIVER
M: "Maciej W. Rozycki" <macro@linux-mips.org>
S: Maintained
--
2.7.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [net-next 00/10] net: create dynamic software irq moderation library
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (9 preceding siblings ...)
2018-01-04 20:21 ` [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation Andy Gospodarek
@ 2018-01-04 20:37 ` Or Gerlitz
2018-01-04 22:46 ` Andy Gospodarek
2018-01-04 21:37 ` Saeed Mahameed
2018-01-05 8:14 ` Tal Gilboa
12 siblings, 1 reply; 24+ messages in thread
From: Or Gerlitz @ 2018-01-04 20:37 UTC (permalink / raw)
To: Andy Gospodarek
Cc: Linux Netdev List, mchan, Tal Gilboa, Or Gerlitz, Andy Gospodarek
> net/mlx5e: move interrupt moderation structs to new file
> net/mlx5e: move interrupt moderation forward declarations
> net/mlx5e: remove rq references in mlx5e_rx_am
> net/mlx5e: move AM logic enums
> net/mlx5e: move generic functions to new file
> net/mlx5e: change Mellanox references in DIM code
Hi, Andy && happy new 2018 -- this is indeed a nit, but I have
provided it to you twice (...),
please get the commit titles to align with what we do which is capital
letter after the net/mlx5e: prefix
from: net/mlx5e: move interrupt moderation structs to new file
to: net/mlx5e: Move interrupt moderation structs to new file
If you get other comments, just apply this for the next version, if everyone
is happy, that would be a very small effort to just fix and get that in..
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 00/10] net: create dynamic software irq moderation library
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (10 preceding siblings ...)
2018-01-04 20:37 ` [net-next 00/10] net: create dynamic software irq moderation library Or Gerlitz
@ 2018-01-04 21:37 ` Saeed Mahameed
2018-01-05 8:14 ` Tal Gilboa
12 siblings, 0 replies; 24+ messages in thread
From: Saeed Mahameed @ 2018-01-04 21:37 UTC (permalink / raw)
To: Andy Gospodarek, netdev; +Cc: mchan, talgi, ogerlitz, Andy Gospodarek
On 1/4/2018 12:21 PM, Andy Gospodarek wrote:
> From: Andy Gospodarek <gospo@broadcom.com>
>
> This converts the dynamic interrupt moderation library from the mlx5_en driver
> into a library so it can be used by any driver. The penultimatepatch in this
> set adds support for interrupt moderation in the bnxt_en driver and the last
> patch creates an entry in the MAINTAINERS file.
>
> The main purpose of this code in the mlx5_en driver is to allow an
> administrator to make sure that default coalesce settings are optimized
> for low latency, but quickly adapt to handle high throughput traffic and
> optimize how many packets are received during each napi poll.
>
> For any new driver the following changes would be needed to use this
> library:
>
> - add elements in ring struct to track items needed by this library
> - create function that can be called to actually set coalesce settings
> for the driver
>
> Credit to Rob Rice and Lee Reed for doing some of the initial proof of
> concept and testing for this patch and Tal Gilboa and Or Gerlitz for their
> comments, etc on this set.
> > Andy Gospodarek (10):
> net/mlx5e: move interrupt moderation structs to new file
> net/mlx5e: move interrupt moderation forward declarations
> net/mlx5e: remove rq references in mlx5e_rx_am
> net/mlx5e: move AM logic enums
> net/mlx5e: move generic functions to new file
> net/mlx5e: change Mellanox references in DIM code
> net: move dynamic interrpt coalescing code to include/linux
> net/dim: use struct net_dim_sample as arg to net_dim
> bnxt_en: add support for software dynamic interrupt moderation
> MAINTAINERS: add entry for Dynamic Interrupt Moderation
Very clean and nice work!
Thank you Andy for following my suggestion of changing the API to be
static inline helper functions instead of function pointers provided by
device drivers, the current API is less demanding for the device drivers
and has no performance impact.
Awesome work.
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
>
> MAINTAINERS | 5 +
> drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +-
> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 52 +++
> drivers/net/ethernet/broadcom/bnxt/bnxt.h | 34 +-
> drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 32 ++
> drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +
> drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en.h | 46 +--
> drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 49 +++
> .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 341 -------------------
Goodbye mlx5/core/en_rx_am.c :)
> drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 +-
> drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 108 ++++++
> include/linux/mlx5/mlx5_ifc.h | 6 -
> include/linux/net_dim.h | 372 +++++++++++++++++++++
> 17 files changed, 693 insertions(+), 426 deletions(-)
> create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
> create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
> delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
> create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> create mode 100644 include/linux/net_dim.h
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation
2018-01-04 20:21 ` [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation Andy Gospodarek
@ 2018-01-04 22:16 ` Michael Chan
2018-01-05 13:44 ` Andy Gospodarek
0 siblings, 1 reply; 24+ messages in thread
From: Michael Chan @ 2018-01-04 22:16 UTC (permalink / raw)
To: Andy Gospodarek
Cc: Netdev, michael.chan@broadcom.com, talgi, ogerlitz, Andy Gospodarek
On Thu, Jan 4, 2018 at 12:21 PM, Andy Gospodarek <andy@greyhouse.net> wrote:
> From: Andy Gospodarek <gospo@broadcom.com>
>
> This implements the changes needed for the bnxt_en driver to add support
> for dynamic interrupt moderation per ring.
>
> This does add additional counters in the receive path, but testing shows
> that any additional instructions are offset by throughput gain when the
> default configuration is for low latency.
>
> Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
> Cc: Michael Chan <mchan@broadcom.com>
Andy, looks good in general. I just have a few comments below. These
minor issues can be cleaned up after merge if you want.
....
> +int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi)
> +{
> + struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req_rx = {0};
> + struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
> + struct bnxt_coal coal;
> + unsigned int grp_idx;
> + int rc = 0;
> +
> + /* Tick values in micro seconds.
> + * 1 coal_buf x bufs_per_record = 1 completion record.
> + */
> + memcpy(&coal, &bp->rx_coal, sizeof(struct bnxt_coal));
> +
> + coal.coal_ticks = cpr->rx_ring_coal.coal_ticks;
> + coal.coal_bufs = cpr->rx_ring_coal.coal_bufs;
> +
> + if (!bnapi->rx_ring)
> + return -ENODEV;
> +
> + bnxt_hwrm_cmd_hdr_init(bp, &req_rx,
> + HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);
> +
> + bnxt_hwrm_set_coal_params(&coal, &req_rx);
> +
> + mutex_lock(&bp->hwrm_cmd_lock);
> + grp_idx = bnapi->index;
> +
> + req_rx.ring_id = cpu_to_le16(bp->grp_info[grp_idx].cp_fw_ring_id);
> +
> + rc = _hwrm_send_message(bp, &req_rx, sizeof(req_rx),
> + HWRM_CMD_TIMEOUT);
> + mutex_unlock(&bp->hwrm_cmd_lock);
You can use the hwrm_send_message() variant that does not require you
to take the mutex. You only need this variant and take the mutex if
you need to check the firmware reply.
> + return rc;
> +}
> +
> int bnxt_hwrm_set_coal(struct bnxt *bp)
> {
> int i, rc = 0;
> @@ -5705,7 +5753,11 @@ static void bnxt_enable_napi(struct bnxt *bp)
> int i;
>
> for (i = 0; i < bp->cp_nr_rings; i++) {
We only need to enable this for every completion ring that has an RX
ring. In some cases, for example when XDP is enabled, there will be a
set of completion rings with only TX rings. So I think we can
optimize this for completion rings with RX only.
> + struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
> bp->bnapi[i]->in_reset = false;
> +
> + INIT_WORK(&cpr->am.work, bnxt_dim_work);
> + cpr->am.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> napi_enable(&bp->bnapi[i]->napi);
> }
> }
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation
2018-01-04 20:21 ` [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation Andy Gospodarek
@ 2018-01-04 22:36 ` Stephen Hemminger
2018-01-04 22:45 ` Andy Gospodarek
0 siblings, 1 reply; 24+ messages in thread
From: Stephen Hemminger @ 2018-01-04 22:36 UTC (permalink / raw)
To: Andy Gospodarek; +Cc: netdev, mchan, talgi, ogerlitz, Andy Gospodarek
On Thu, 4 Jan 2018 15:21:30 -0500
Andy Gospodarek <andy@greyhouse.net> wrote:
> +DYNAMIC INTERRUPT MODERATION
> +M: Tal Gilboa <talgi@mellanox.com>
> +S: Mainained
s/Mainained/Maintained/
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation
2018-01-04 22:36 ` Stephen Hemminger
@ 2018-01-04 22:45 ` Andy Gospodarek
0 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 22:45 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, mchan, talgi, ogerlitz, Andy Gospodarek
On Thu, Jan 04, 2018 at 02:36:54PM -0800, Stephen Hemminger wrote:
> On Thu, 4 Jan 2018 15:21:30 -0500
> Andy Gospodarek <andy@greyhouse.net> wrote:
>
> > +DYNAMIC INTERRUPT MODERATION
> > +M: Tal Gilboa <talgi@mellanox.com>
> > +S: Mainained
>
> s/Mainained/Maintained/
Ugh. Thanks for noticing that, Stephen!
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 00/10] net: create dynamic software irq moderation library
2018-01-04 20:37 ` [net-next 00/10] net: create dynamic software irq moderation library Or Gerlitz
@ 2018-01-04 22:46 ` Andy Gospodarek
0 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-04 22:46 UTC (permalink / raw)
To: Or Gerlitz
Cc: Linux Netdev List, mchan, Tal Gilboa, Or Gerlitz, Andy Gospodarek
On Thu, Jan 04, 2018 at 10:37:37PM +0200, Or Gerlitz wrote:
> > net/mlx5e: move interrupt moderation structs to new file
> > net/mlx5e: move interrupt moderation forward declarations
> > net/mlx5e: remove rq references in mlx5e_rx_am
> > net/mlx5e: move AM logic enums
> > net/mlx5e: move generic functions to new file
> > net/mlx5e: change Mellanox references in DIM code
>
> Hi, Andy && happy new 2018 -- this is indeed a nit, but I have
> provided it to you twice (...),
> please get the commit titles to align with what we do which is capital
> letter after the net/mlx5e: prefix
>
> from: net/mlx5e: move interrupt moderation structs to new file
> to: net/mlx5e: Move interrupt moderation structs to new file
>
> If you get other comments, just apply this for the next version, if everyone
> is happy, that would be a very small effort to just fix and get that in..
Or, you did mention this part and I'm _really_ sorry to forgot to add
the capitalization. I will do that if there is a v2 (which is looks
like there might be since I cannot spell 'Maintained' correctly.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 06/10] net/mlx5e: change Mellanox references in DIM code
2018-01-04 20:21 ` [net-next 06/10] net/mlx5e: change Mellanox references in DIM code Andy Gospodarek
@ 2018-01-05 8:04 ` Tal Gilboa
2018-01-05 13:55 ` Andy Gospodarek
2018-01-05 20:57 ` Andy Gospodarek
0 siblings, 2 replies; 24+ messages in thread
From: Tal Gilboa @ 2018-01-05 8:04 UTC (permalink / raw)
To: Andy Gospodarek, netdev; +Cc: mchan, ogerlitz, Andy Gospodarek
On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> From: Andy Gospodarek <gospo@broadcom.com>
>
> Change all mlx5_am* and MLX_AM* references to net_dim and NET_DIM,
MLX_AM->MLX5_AM
> cq_period_mode = enable ?
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
I'm not sure about this part. CQE/EQE based moderation is a feature in
Mellanox's chips, which isn't necessarily coupled with adaptive
moderation. net_dim lib should know which values to choose according to
the selected mode, but I don't think mlx5 driver should use an enum from
net_dim for enabling/disabling HW features. Another issue is that we use
the enum value as an argument for the command to HW (0=EQE, 1=CQE). If
someone would change the values it would break the HW feature. I think
it would be safer to use the NET_DIM_XXX enum only when using functions
from net_dim lib.
> current_cq_period_mode = is_rx_cq ?
> priv->channels.params.rx_cq_moderation.cq_period_mode :
> priv->channels.params.tx_cq_moderation.cq_period_mode;
> mode_changed = cq_period_mode != current_cq_period_mode;
>
> - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE &&
> + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE &&
> !MLX5_CAP_GEN(mdev, cq_period_start_from_cqe))
> return -EOPNOTSUPP;
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> index 3aa1c90..edd4077 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@ -674,8 +674,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
> wqe->data.lkey = rq->mkey_be;
> }
>
> - INIT_WORK(&rq->am.work, mlx5e_rx_am_work);
> - rq->am.mode = params->rx_cq_moderation.cq_period_mode;
> + INIT_WORK(&rq->dim.work, mlx5e_rx_dim_work);
> + rq->dim.mode = params->rx_cq_moderation.cq_period_mode;
> rq->page_cache.head = 0;
> rq->page_cache.tail = 0;
>
> @@ -919,7 +919,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
> if (err)
> goto err_destroy_rq;
>
> - if (params->rx_am_enabled)
> + if (params->rx_dim_enabled)
> c->rq.state |= BIT(MLX5E_RQ_STATE_AM);
>
> return 0;
> @@ -952,7 +952,7 @@ static void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
>
> static void mlx5e_close_rq(struct mlx5e_rq *rq)
> {
> - cancel_work_sync(&rq->am.work);
> + cancel_work_sync(&rq->dim.work);
> mlx5e_destroy_rq(rq);
> mlx5e_free_rx_descs(rq);
> mlx5e_free_rq(rq);
> @@ -1565,7 +1565,7 @@ static void mlx5e_destroy_cq(struct mlx5e_cq *cq)
> }
>
> static int mlx5e_open_cq(struct mlx5e_channel *c,
> - struct mlx5e_cq_moder moder,
> + struct net_dim_cq_moder moder,
> struct mlx5e_cq_param *param,
> struct mlx5e_cq *cq)
> {
> @@ -1747,7 +1747,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
> struct mlx5e_channel_param *cparam,
> struct mlx5e_channel **cp)
> {
> - struct mlx5e_cq_moder icocq_moder = {0, 0};
> + struct net_dim_cq_moder icocq_moder = {0, 0};
> struct net_device *netdev = priv->netdev;
> int cpu = mlx5e_get_cpu(priv, ix);
> struct mlx5e_channel *c;
> @@ -1999,7 +1999,7 @@ static void mlx5e_build_ico_cq_param(struct mlx5e_priv *priv,
>
> mlx5e_build_common_cq_param(priv, param);
>
> - param->cq_period_mode = MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> + param->cq_period_mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> }
>
> static void mlx5e_build_icosq_param(struct mlx5e_priv *priv,
> @@ -4016,13 +4016,13 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> params->tx_cq_moderation.usec =
> MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC;
>
> - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> params->tx_cq_moderation.usec =
> MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC_FROM_CQE;
>
> MLX5E_SET_PFLAG(params, MLX5E_PFLAG_TX_CQE_BASED_MODER,
> params->tx_cq_moderation.cq_period_mode ==
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> }
>
> void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> @@ -4034,17 +4034,17 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> params->rx_cq_moderation.usec =
> MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC;
>
> - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> params->rx_cq_moderation.usec =
> MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE;
>
> - if (params->rx_am_enabled)
> + if (params->rx_dim_enabled)
> params->rx_cq_moderation =
> - mlx5e_am_get_def_profile(cq_period_mode);
> + net_dim_get_def_profile(cq_period_mode);
>
> MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_CQE_BASED_MODER,
> params->rx_cq_moderation.cq_period_mode ==
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> }
>
> u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)
> @@ -4100,9 +4100,9 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
>
> /* CQ moderation params */
> cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> - params->rx_am_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> + params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> mlx5e_set_rx_cq_mode_params(params, cq_period_mode);
> mlx5e_set_tx_cq_mode_params(params, cq_period_mode);
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> index c6a77f8..ccb038f 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> @@ -877,8 +877,8 @@ static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev,
> struct mlx5e_params *params)
> {
> u8 cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
>
> params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
> params->rq_wq_type = MLX5_WQ_TYPE_LINKED_LIST;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> index 1849169..dae77a9 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> @@ -79,7 +79,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
> mlx5e_cq_arm(&c->sq[i].cq);
>
> if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
> - mlx5e_rx_am(&c->rq.am,
> + net_dim(&c->rq.dim,
> c->rq.cq.event_ctr,
> c->rq.stats.packets,
> c->rq.stats.bytes);
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> index ca05f4e..00b9ae3 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> @@ -33,22 +33,22 @@
>
> #include "en.h"
>
> -#define MLX5E_PARAMS_AM_NUM_PROFILES 5
> +#define NET_DIM_PARAMS_NUM_PROFILES 5
> /* Adaptive moderation profiles */
> -#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> -#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
> -#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
> -
> -/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
> -#define MLX5_AM_EQE_PROFILES { \
> - {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> - {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> - {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> - {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> - {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> +#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> +#define NET_DIM_DEF_PROFILE_CQE 1
> +#define NET_DIM_DEF_PROFILE_EQE 1
> +
> +/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
> +#define NET_DIM_EQE_PROFILES { \
> + {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> + {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> + {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> + {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> + {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> }
>
> -#define MLX5_AM_CQE_PROFILES { \
> +#define NET_DIM_CQE_PROFILES { \
> {2, 256}, \
> {8, 128}, \
> {16, 64}, \
> @@ -56,193 +56,193 @@
> {64, 64} \
> }
>
> -static const struct mlx5e_cq_moder
> -profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
> - MLX5_AM_EQE_PROFILES,
> - MLX5_AM_CQE_PROFILES,
> +static const struct net_dim_cq_moder
> +profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
> + NET_DIM_EQE_PROFILES,
> + NET_DIM_CQE_PROFILES,
> };
>
> -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
> +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
> {
> - struct mlx5e_cq_moder cq_moder;
> + struct net_dim_cq_moder cq_moder;
>
> cq_moder = profile[cq_period_mode][ix];
> cq_moder.cq_period_mode = cq_period_mode;
> return cq_moder;
> }
>
> -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
> +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
> {
> int default_profile_ix;
>
> - if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
> - else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
> - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
> + if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> + default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
> + else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
> + default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
>
> - return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
> + return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
> }
>
> -static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
> +static bool net_dim_on_top(struct net_dim *dim)
> {
> - switch (am->tune_state) {
> - case MLX5E_AM_PARKING_ON_TOP:
> - case MLX5E_AM_PARKING_TIRED:
> + switch (dim->tune_state) {
> + case NET_DIM_PARKING_ON_TOP:
> + case NET_DIM_PARKING_TIRED:
> return true;
> - case MLX5E_AM_GOING_RIGHT:
> - return (am->steps_left > 1) && (am->steps_right == 1);
> - default: /* MLX5E_AM_GOING_LEFT */
> - return (am->steps_right > 1) && (am->steps_left == 1);
> + case NET_DIM_GOING_RIGHT:
> + return (dim->steps_left > 1) && (dim->steps_right == 1);
> + default: /* NET_DIM_GOING_LEFT */
> + return (dim->steps_right > 1) && (dim->steps_left == 1);
> }
> }
>
> -static void mlx5e_am_turn(struct mlx5e_rx_am *am)
> +static void net_dim_turn(struct net_dim *dim)
> {
> - switch (am->tune_state) {
> - case MLX5E_AM_PARKING_ON_TOP:
> - case MLX5E_AM_PARKING_TIRED:
> + switch (dim->tune_state) {
> + case NET_DIM_PARKING_ON_TOP:
> + case NET_DIM_PARKING_TIRED:
> break;
> - case MLX5E_AM_GOING_RIGHT:
> - am->tune_state = MLX5E_AM_GOING_LEFT;
> - am->steps_left = 0;
> + case NET_DIM_GOING_RIGHT:
> + dim->tune_state = NET_DIM_GOING_LEFT;
> + dim->steps_left = 0;
> break;
> - case MLX5E_AM_GOING_LEFT:
> - am->tune_state = MLX5E_AM_GOING_RIGHT;
> - am->steps_right = 0;
> + case NET_DIM_GOING_LEFT:
> + dim->tune_state = NET_DIM_GOING_RIGHT;
> + dim->steps_right = 0;
> break;
> }
> }
>
> -static int mlx5e_am_step(struct mlx5e_rx_am *am)
> +static int net_dim_step(struct net_dim *dim)
> {
> - if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
> - return MLX5E_AM_TOO_TIRED;
> + if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
> + return NET_DIM_TOO_TIRED;
>
> - switch (am->tune_state) {
> - case MLX5E_AM_PARKING_ON_TOP:
> - case MLX5E_AM_PARKING_TIRED:
> + switch (dim->tune_state) {
> + case NET_DIM_PARKING_ON_TOP:
> + case NET_DIM_PARKING_TIRED:
> break;
> - case MLX5E_AM_GOING_RIGHT:
> - if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
> - return MLX5E_AM_ON_EDGE;
> - am->profile_ix++;
> - am->steps_right++;
> + case NET_DIM_GOING_RIGHT:
> + if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
> + return NET_DIM_ON_EDGE;
> + dim->profile_ix++;
> + dim->steps_right++;
> break;
> - case MLX5E_AM_GOING_LEFT:
> - if (am->profile_ix == 0)
> - return MLX5E_AM_ON_EDGE;
> - am->profile_ix--;
> - am->steps_left++;
> + case NET_DIM_GOING_LEFT:
> + if (dim->profile_ix == 0)
> + return NET_DIM_ON_EDGE;
> + dim->profile_ix--;
> + dim->steps_left++;
> break;
> }
>
> - am->tired++;
> - return MLX5E_AM_STEPPED;
> + dim->tired++;
> + return NET_DIM_STEPPED;
> }
>
> -static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
> +static void net_dim_park_on_top(struct net_dim *dim)
> {
> - am->steps_right = 0;
> - am->steps_left = 0;
> - am->tired = 0;
> - am->tune_state = MLX5E_AM_PARKING_ON_TOP;
> + dim->steps_right = 0;
> + dim->steps_left = 0;
> + dim->tired = 0;
> + dim->tune_state = NET_DIM_PARKING_ON_TOP;
> }
>
> -static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
> +static void net_dim_park_tired(struct net_dim *dim)
> {
> - am->steps_right = 0;
> - am->steps_left = 0;
> - am->tune_state = MLX5E_AM_PARKING_TIRED;
> + dim->steps_right = 0;
> + dim->steps_left = 0;
> + dim->tune_state = NET_DIM_PARKING_TIRED;
> }
>
> -static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
> +static void net_dim_exit_parking(struct net_dim *dim)
> {
> - am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
> - MLX5E_AM_GOING_RIGHT;
> - mlx5e_am_step(am);
> + dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
> + NET_DIM_GOING_RIGHT;
> + net_dim_step(dim);
> }
>
> #define IS_SIGNIFICANT_DIFF(val, ref) \
> (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
>
> -static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
> - struct mlx5e_rx_am_stats *prev)
> +static int net_dim_stats_compare(struct net_dim_stats *curr,
> + struct net_dim_stats *prev)
> {
> if (!prev->bpms)
> - return curr->bpms ? MLX5E_AM_STATS_BETTER :
> - MLX5E_AM_STATS_SAME;
> + return curr->bpms ? NET_DIM_STATS_BETTER :
> + NET_DIM_STATS_SAME;
>
> if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
> - return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
> - MLX5E_AM_STATS_WORSE;
> + return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
> + NET_DIM_STATS_WORSE;
>
> if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
> - return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
> - MLX5E_AM_STATS_WORSE;
> + return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
> + NET_DIM_STATS_WORSE;
>
> if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
> - return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
> - MLX5E_AM_STATS_WORSE;
> + return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
> + NET_DIM_STATS_WORSE;
>
> - return MLX5E_AM_STATS_SAME;
> + return NET_DIM_STATS_SAME;
> }
>
> -static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
> - struct mlx5e_rx_am *am)
> +static bool net_dim_decision(struct net_dim_stats *curr_stats,
> + struct net_dim *dim)
> {
> - int prev_state = am->tune_state;
> - int prev_ix = am->profile_ix;
> + int prev_state = dim->tune_state;
> + int prev_ix = dim->profile_ix;
> int stats_res;
> int step_res;
>
> - switch (am->tune_state) {
> - case MLX5E_AM_PARKING_ON_TOP:
> - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> - if (stats_res != MLX5E_AM_STATS_SAME)
> - mlx5e_am_exit_parking(am);
> + switch (dim->tune_state) {
> + case NET_DIM_PARKING_ON_TOP:
> + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> + if (stats_res != NET_DIM_STATS_SAME)
> + net_dim_exit_parking(dim);
> break;
>
> - case MLX5E_AM_PARKING_TIRED:
> - am->tired--;
> - if (!am->tired)
> - mlx5e_am_exit_parking(am);
> + case NET_DIM_PARKING_TIRED:
> + dim->tired--;
> + if (!dim->tired)
> + net_dim_exit_parking(dim);
> break;
>
> - case MLX5E_AM_GOING_RIGHT:
> - case MLX5E_AM_GOING_LEFT:
> - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> - if (stats_res != MLX5E_AM_STATS_BETTER)
> - mlx5e_am_turn(am);
> + case NET_DIM_GOING_RIGHT:
> + case NET_DIM_GOING_LEFT:
> + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> + if (stats_res != NET_DIM_STATS_BETTER)
> + net_dim_turn(dim);
>
> - if (mlx5e_am_on_top(am)) {
> - mlx5e_am_park_on_top(am);
> + if (net_dim_on_top(dim)) {
> + net_dim_park_on_top(dim);
> break;
> }
>
> - step_res = mlx5e_am_step(am);
> + step_res = net_dim_step(dim);
> switch (step_res) {
> - case MLX5E_AM_ON_EDGE:
> - mlx5e_am_park_on_top(am);
> + case NET_DIM_ON_EDGE:
> + net_dim_park_on_top(dim);
> break;
> - case MLX5E_AM_TOO_TIRED:
> - mlx5e_am_park_tired(am);
> + case NET_DIM_TOO_TIRED:
> + net_dim_park_tired(dim);
> break;
> }
>
> break;
> }
>
> - if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
> - (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
> - am->prev_stats = *curr_stats;
> + if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
> + (dim->tune_state != NET_DIM_PARKING_ON_TOP))
> + dim->prev_stats = *curr_stats;
>
> - return am->profile_ix != prev_ix;
> + return dim->profile_ix != prev_ix;
> }
>
> -static void mlx5e_am_sample(u16 event_ctr,
> - u64 packets,
> - u64 bytes,
> - struct mlx5e_rx_am_sample *s)
> +static void net_dim_sample(u16 event_ctr,
> + u64 packets,
> + u64 bytes,
> + struct net_dim_sample *s)
> {
> s->time = ktime_get();
> s->pkt_ctr = packets;
> @@ -250,13 +250,13 @@ static void mlx5e_am_sample(u16 event_ctr,
> s->event_ctr = event_ctr;
> }
>
> -#define MLX5E_AM_NEVENTS 64
> +#define NET_DIM_NEVENTS 64
> #define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
> #define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
>
> -static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
> - struct mlx5e_rx_am_sample *end,
> - struct mlx5e_rx_am_stats *curr_stats)
> +static void net_dim_calc_stats(struct net_dim_sample *start,
> + struct net_dim_sample *end,
> + struct net_dim_stats *curr_stats)
> {
> /* u32 holds up to 71 minutes, should be enough */
> u32 delta_us = ktime_us_delta(end->time, start->time);
> @@ -269,39 +269,39 @@ static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
>
> curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
> curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
> - curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
> + curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
> delta_us);
> }
>
> -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> - u16 event_ctr,
> - u64 packets,
> - u64 bytes)
> +void net_dim(struct net_dim *dim,
> + u16 event_ctr,
> + u64 packets,
> + u64 bytes)
> {
> - struct mlx5e_rx_am_sample end_sample;
> - struct mlx5e_rx_am_stats curr_stats;
> + struct net_dim_sample end_sample;
> + struct net_dim_stats curr_stats;
> u16 nevents;
>
> - switch (am->state) {
> - case MLX5E_AM_MEASURE_IN_PROGRESS:
> + switch (dim->state) {
> + case NET_DIM_MEASURE_IN_PROGRESS:
> nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
> - am->start_sample.event_ctr);
> - if (nevents < MLX5E_AM_NEVENTS)
> + dim->start_sample.event_ctr);
> + if (nevents < NET_DIM_NEVENTS)
> break;
> - mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
> - mlx5e_am_calc_stats(&am->start_sample, &end_sample,
> + net_dim_sample(event_ctr, packets, bytes, &end_sample);
> + net_dim_calc_stats(&dim->start_sample, &end_sample,
> &curr_stats);
> - if (mlx5e_am_decision(&curr_stats, am)) {
> - am->state = MLX5E_AM_APPLY_NEW_PROFILE;
> - schedule_work(&am->work);
> + if (net_dim_decision(&curr_stats, dim)) {
> + dim->state = NET_DIM_APPLY_NEW_PROFILE;
> + schedule_work(&dim->work);
> break;
> }
> /* fall through */
> - case MLX5E_AM_START_MEASURE:
> - mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
> - am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
> + case NET_DIM_START_MEASURE:
> + net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);
> + dim->state = NET_DIM_MEASURE_IN_PROGRESS;
> break;
> - case MLX5E_AM_APPLY_NEW_PROFILE:
> + case NET_DIM_APPLY_NEW_PROFILE:
> break;
> }
> }
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> index 5ce8e54..a775c12 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> @@ -31,32 +31,32 @@
> * SOFTWARE.
> */
>
> -#ifndef MLX5_AM_H
> -#define MLX5_AM_H
> +#ifndef NET_DIM_H
> +#define NET_DIM_H
>
> -struct mlx5e_cq_moder {
> +struct net_dim_cq_moder {
> u16 usec;
> u16 pkts;
> u8 cq_period_mode;
> };
>
> -struct mlx5e_rx_am_sample {
> +struct net_dim_sample {
> ktime_t time;
> u32 pkt_ctr;
> u32 byte_ctr;
> u16 event_ctr;
> };
>
> -struct mlx5e_rx_am_stats {
> +struct net_dim_stats {
> int ppms; /* packets per msec */
> int bpms; /* bytes per msec */
> int epms; /* events per msec */
> };
>
> -struct mlx5e_rx_am { /* Adaptive Moderation */
> +struct net_dim { /* Adaptive Moderation */
> u8 state;
> - struct mlx5e_rx_am_stats prev_stats;
> - struct mlx5e_rx_am_sample start_sample;
> + struct net_dim_stats prev_stats;
> + struct net_dim_sample start_sample;
> struct work_struct work;
> u8 profile_ix;
> u8 mode;
> @@ -67,43 +67,42 @@ struct mlx5e_rx_am { /* Adaptive Moderation */
> };
>
> enum {
> - MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> - MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> - MLX5_CQ_PERIOD_NUM_MODES
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> + NET_DIM_CQ_PERIOD_NUM_MODES
> };
>
> /* Adaptive moderation logic */
> enum {
> - MLX5E_AM_START_MEASURE,
> - MLX5E_AM_MEASURE_IN_PROGRESS,
> - MLX5E_AM_APPLY_NEW_PROFILE,
> + NET_DIM_START_MEASURE,
> + NET_DIM_MEASURE_IN_PROGRESS,
> + NET_DIM_APPLY_NEW_PROFILE,
> };
>
> enum {
> - MLX5E_AM_PARKING_ON_TOP,
> - MLX5E_AM_PARKING_TIRED,
> - MLX5E_AM_GOING_RIGHT,
> - MLX5E_AM_GOING_LEFT,
> + NET_DIM_PARKING_ON_TOP,
> + NET_DIM_PARKING_TIRED,
> + NET_DIM_GOING_RIGHT,
> + NET_DIM_GOING_LEFT,
> };
>
> enum {
> - MLX5E_AM_STATS_WORSE,
> - MLX5E_AM_STATS_SAME,
> - MLX5E_AM_STATS_BETTER,
> + NET_DIM_STATS_WORSE,
> + NET_DIM_STATS_SAME,
> + NET_DIM_STATS_BETTER,
> };
>
> enum {
> - MLX5E_AM_STEPPED,
> - MLX5E_AM_TOO_TIRED,
> - MLX5E_AM_ON_EDGE,
> + NET_DIM_STEPPED,
> + NET_DIM_TOO_TIRED,
> + NET_DIM_ON_EDGE,
> };
>
> -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> - u16 event_ctr,
> - u64 packets,
> - u64 bytes);
> -void mlx5e_rx_am_work(struct work_struct *work);
> -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
> -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
> +void net_dim(struct net_dim *dim,
> + u16 event_ctr,
> + u64 packets,
> + u64 bytes);
> +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode);
> +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix);
>
> -#endif /* MLX5_AM_H */
> +#endif /* NET_DIM_H */
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim
2018-01-04 20:21 ` [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim Andy Gospodarek
@ 2018-01-05 8:13 ` Tal Gilboa
0 siblings, 0 replies; 24+ messages in thread
From: Tal Gilboa @ 2018-01-05 8:13 UTC (permalink / raw)
To: Andy Gospodarek, netdev; +Cc: mchan, ogerlitz, Andy Gospodarek
Thanks for doing this, would make future changes easier.
On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> From: Andy Gospodarek <gospo@broadcom.com>
>
> Simplify the arguments net_dim() by formatting them into a struct
> net_dim_sample before calling the function.
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 00/10] net: create dynamic software irq moderation library
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
` (11 preceding siblings ...)
2018-01-04 21:37 ` Saeed Mahameed
@ 2018-01-05 8:14 ` Tal Gilboa
2018-01-05 13:48 ` Andy Gospodarek
12 siblings, 1 reply; 24+ messages in thread
From: Tal Gilboa @ 2018-01-05 8:14 UTC (permalink / raw)
To: Andy Gospodarek, netdev; +Cc: mchan, ogerlitz, Andy Gospodarek
Thanks Andy for your hard work. Looks great overall!
On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> From: Andy Gospodarek <gospo@broadcom.com>
>
> This converts the dynamic interrupt moderation library from the mlx5_en driver
> into a library so it can be used by any driver. The penultimatepatch in this
Had to look up "penultimatepatch " :), but aren't these two words?
> set adds support for interrupt moderation in the bnxt_en driver and the last
> patch creates an entry in the MAINTAINERS file.
>
> The main purpose of this code in the mlx5_en driver is to allow an
> administrator to make sure that default coalesce settings are optimized
> for low latency, but quickly adapt to handle high throughput traffic and
> optimize how many packets are received during each napi poll.
>
> For any new driver the following changes would be needed to use this
> library:
>
> - add elements in ring struct to track items needed by this library
> - create function that can be called to actually set coalesce settings
> for the driver
>
> Credit to Rob Rice and Lee Reed for doing some of the initial proof of
> concept and testing for this patch and Tal Gilboa and Or Gerlitz for their
> comments, etc on this set.
>
> Andy Gospodarek (10):
> net/mlx5e: move interrupt moderation structs to new file
> net/mlx5e: move interrupt moderation forward declarations
> net/mlx5e: remove rq references in mlx5e_rx_am
> net/mlx5e: move AM logic enums
> net/mlx5e: move generic functions to new file
> net/mlx5e: change Mellanox references in DIM code
> net: move dynamic interrpt coalescing code to include/linux
interrpt -> interrupt. The topic of the actual patch was fixed, only
left in the cover.
> net/dim: use struct net_dim_sample as arg to net_dim
> bnxt_en: add support for software dynamic interrupt moderation
> MAINTAINERS: add entry for Dynamic Interrupt Moderation
>
> MAINTAINERS | 5 +
> drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +-
> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 52 +++
> drivers/net/ethernet/broadcom/bnxt/bnxt.h | 34 +-
> drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 32 ++
> drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +
> drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en.h | 46 +--
> drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 49 +++
> .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
> drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 341 -------------------
> drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 +-
> drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 108 ++++++
> include/linux/mlx5/mlx5_ifc.h | 6 -
> include/linux/net_dim.h | 372 +++++++++++++++++++++
> 17 files changed, 693 insertions(+), 426 deletions(-)
> create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
> create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
> delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
> create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
mlx5/core/net_dim.h was removed from code. Please fix the cover.
> create mode 100644 include/linux/net_dim.h
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation
2018-01-04 22:16 ` Michael Chan
@ 2018-01-05 13:44 ` Andy Gospodarek
0 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-05 13:44 UTC (permalink / raw)
To: Michael Chan
Cc: Netdev, michael.chan@broadcom.com, talgi, ogerlitz, Andy Gospodarek
On Thu, Jan 04, 2018 at 02:16:26PM -0800, Michael Chan wrote:
> On Thu, Jan 4, 2018 at 12:21 PM, Andy Gospodarek <andy@greyhouse.net> wrote:
> > From: Andy Gospodarek <gospo@broadcom.com>
> >
> > This implements the changes needed for the bnxt_en driver to add support
> > for dynamic interrupt moderation per ring.
> >
> > This does add additional counters in the receive path, but testing shows
> > that any additional instructions are offset by throughput gain when the
> > default configuration is for low latency.
> >
> > Signed-off-by: Andy Gospodarek <gospo@broadcom.com>
> > Cc: Michael Chan <mchan@broadcom.com>
>
> Andy, looks good in general. I just have a few comments below. These
> minor issues can be cleaned up after merge if you want.
Thanks for the review -- not the first time you've seen it :-) -- and for
agreeing that we can cleanup after the merge. I'll need a v2, so I might as
well fix anything we want to fix now.
>
> ....
> > +int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi)
> > +{
> > + struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req_rx = {0};
> > + struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
> > + struct bnxt_coal coal;
> > + unsigned int grp_idx;
> > + int rc = 0;
> > +
> > + /* Tick values in micro seconds.
> > + * 1 coal_buf x bufs_per_record = 1 completion record.
> > + */
> > + memcpy(&coal, &bp->rx_coal, sizeof(struct bnxt_coal));
> > +
> > + coal.coal_ticks = cpr->rx_ring_coal.coal_ticks;
> > + coal.coal_bufs = cpr->rx_ring_coal.coal_bufs;
> > +
> > + if (!bnapi->rx_ring)
> > + return -ENODEV;
> > +
> > + bnxt_hwrm_cmd_hdr_init(bp, &req_rx,
> > + HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);
> > +
> > + bnxt_hwrm_set_coal_params(&coal, &req_rx);
> > +
> > + mutex_lock(&bp->hwrm_cmd_lock);
> > + grp_idx = bnapi->index;
> > +
> > + req_rx.ring_id = cpu_to_le16(bp->grp_info[grp_idx].cp_fw_ring_id);
> > +
> > + rc = _hwrm_send_message(bp, &req_rx, sizeof(req_rx),
> > + HWRM_CMD_TIMEOUT);
> > + mutex_unlock(&bp->hwrm_cmd_lock);
>
> You can use the hwrm_send_message() variant that does not require you
> to take the mutex. You only need this variant and take the mutex if
> you need to check the firmware reply.
>
OK, good to know. I'll consider whether or not it is important to check
the reply. I think I'd want to know if it failed, but I'm not sure what
I'd do were that error condition encountered....
> > + return rc;
> > +}
> > +
> > int bnxt_hwrm_set_coal(struct bnxt *bp)
> > {
> > int i, rc = 0;
> > @@ -5705,7 +5753,11 @@ static void bnxt_enable_napi(struct bnxt *bp)
> > int i;
> >
> > for (i = 0; i < bp->cp_nr_rings; i++) {
>
> We only need to enable this for every completion ring that has an RX
> ring. In some cases, for example when XDP is enabled, there will be a
> set of completion rings with only TX rings. So I think we can
> optimize this for completion rings with RX only.
Good call.
> > + struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
> > bp->bnapi[i]->in_reset = false;
> > +
> > + INIT_WORK(&cpr->am.work, bnxt_dim_work);
> > + cpr->am.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > napi_enable(&bp->bnapi[i]->napi);
> > }
> > }
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 00/10] net: create dynamic software irq moderation library
2018-01-05 8:14 ` Tal Gilboa
@ 2018-01-05 13:48 ` Andy Gospodarek
0 siblings, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-05 13:48 UTC (permalink / raw)
To: Tal Gilboa; +Cc: netdev, mchan, ogerlitz, Andy Gospodarek
On Fri, Jan 05, 2018 at 10:14:43AM +0200, Tal Gilboa wrote:
> Thanks Andy for your hard work. Looks great overall!
>
> On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> > From: Andy Gospodarek <gospo@broadcom.com>
> >
> > This converts the dynamic interrupt moderation library from the mlx5_en driver
> > into a library so it can be used by any driver. The penultimatepatch in this
> Had to look up "penultimatepatch " :), but aren't these two words?
>
> > set adds support for interrupt moderation in the bnxt_en driver and the last
> > patch creates an entry in the MAINTAINERS file.
> >
> > The main purpose of this code in the mlx5_en driver is to allow an
> > administrator to make sure that default coalesce settings are optimized
> > for low latency, but quickly adapt to handle high throughput traffic and
> > optimize how many packets are received during each napi poll.
> >
> > For any new driver the following changes would be needed to use this
> > library:
> >
> > - add elements in ring struct to track items needed by this library
> > - create function that can be called to actually set coalesce settings
> > for the driver
> >
> > Credit to Rob Rice and Lee Reed for doing some of the initial proof of
> > concept and testing for this patch and Tal Gilboa and Or Gerlitz for their
> > comments, etc on this set.
> >
> > Andy Gospodarek (10):
> > net/mlx5e: move interrupt moderation structs to new file
> > net/mlx5e: move interrupt moderation forward declarations
> > net/mlx5e: remove rq references in mlx5e_rx_am
> > net/mlx5e: move AM logic enums
> > net/mlx5e: move generic functions to new file
> > net/mlx5e: change Mellanox references in DIM code
> > net: move dynamic interrpt coalescing code to include/linux
> interrpt -> interrupt. The topic of the actual patch was fixed, only left in
> the cover.
I'm just going to run ispell on everything again. :-)
>
> > net/dim: use struct net_dim_sample as arg to net_dim
> > bnxt_en: add support for software dynamic interrupt moderation
> > MAINTAINERS: add entry for Dynamic Interrupt Moderation
> >
> > MAINTAINERS | 5 +
> > drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +-
> > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 52 +++
> > drivers/net/ethernet/broadcom/bnxt/bnxt.h | 34 +-
> > drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 32 ++
> > drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +
> > drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
> > drivers/net/ethernet/mellanox/mlx5/core/en.h | 46 +--
> > drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 49 +++
> > .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +-
> > drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +-
> > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
> > drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 341 -------------------
> > drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 10 +-
> > drivers/net/ethernet/mellanox/mlx5/core/net_dim.h | 108 ++++++
> > include/linux/mlx5/mlx5_ifc.h | 6 -
> > include/linux/net_dim.h | 372 +++++++++++++++++++++
> > 17 files changed, 693 insertions(+), 426 deletions(-)
> > create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
> > create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
> > delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c
> > create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> mlx5/core/net_dim.h was removed from code. Please fix the cover.
Yes, it's odd that this is there. I'll see if I can figure out why as this
file should have been deleted with patch "net: move dynamic interrpt coalescing
code to include/linux" but it looks like maybe it was not.
> > create mode 100644 include/linux/net_dim.h
> >
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 06/10] net/mlx5e: change Mellanox references in DIM code
2018-01-05 8:04 ` Tal Gilboa
@ 2018-01-05 13:55 ` Andy Gospodarek
2018-01-05 20:57 ` Andy Gospodarek
1 sibling, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-05 13:55 UTC (permalink / raw)
To: Tal Gilboa; +Cc: netdev, mchan, ogerlitz, Andy Gospodarek
On Fri, Jan 05, 2018 at 10:04:50AM +0200, Tal Gilboa wrote:
> On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> > From: Andy Gospodarek <gospo@broadcom.com>
> >
> > Change all mlx5_am* and MLX_AM* references to net_dim and NET_DIM,
> MLX_AM->MLX5_AM
>
> > cq_period_mode = enable ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> I'm not sure about this part. CQE/EQE based moderation is a feature in
> Mellanox's chips, which isn't necessarily coupled with adaptive moderation.
> net_dim lib should know which values to choose according to the selected
> mode, but I don't think mlx5 driver should use an enum from net_dim for
> enabling/disabling HW features. Another issue is that we use the enum value
> as an argument for the command to HW (0=EQE, 1=CQE). If someone would change
> the values it would break the HW feature. I think it would be safer to use
> the NET_DIM_XXX enum only when using functions from net_dim lib.
I've gone back and forth about when to do this (now vs later).
One of the future improments I'd planned was actually to allow profiles
to live in en_dim.c and bnxt_dim.c or have some additional profiles
in net_dim.h. This is specifially to address some different hardware
limits that might exist as hardware with a maximum that is smaller than
256 usecs (for example) might not find much benefit from how quickly
these existing profiles scale-up.
I'll play with this today for a bit and see what falls out. My
preference is not to change this for v2 not so as to not hold up this
set too long.
>
> > current_cq_period_mode = is_rx_cq ?
> > priv->channels.params.rx_cq_moderation.cq_period_mode :
> > priv->channels.params.tx_cq_moderation.cq_period_mode;
> > mode_changed = cq_period_mode != current_cq_period_mode;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE &&
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE &&
> > !MLX5_CAP_GEN(mdev, cq_period_start_from_cqe))
> > return -EOPNOTSUPP;
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > index 3aa1c90..edd4077 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > @@ -674,8 +674,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
> > wqe->data.lkey = rq->mkey_be;
> > }
> > - INIT_WORK(&rq->am.work, mlx5e_rx_am_work);
> > - rq->am.mode = params->rx_cq_moderation.cq_period_mode;
> > + INIT_WORK(&rq->dim.work, mlx5e_rx_dim_work);
> > + rq->dim.mode = params->rx_cq_moderation.cq_period_mode;
> > rq->page_cache.head = 0;
> > rq->page_cache.tail = 0;
> > @@ -919,7 +919,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
> > if (err)
> > goto err_destroy_rq;
> > - if (params->rx_am_enabled)
> > + if (params->rx_dim_enabled)
> > c->rq.state |= BIT(MLX5E_RQ_STATE_AM);
> > return 0;
> > @@ -952,7 +952,7 @@ static void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
> > static void mlx5e_close_rq(struct mlx5e_rq *rq)
> > {
> > - cancel_work_sync(&rq->am.work);
> > + cancel_work_sync(&rq->dim.work);
> > mlx5e_destroy_rq(rq);
> > mlx5e_free_rx_descs(rq);
> > mlx5e_free_rq(rq);
> > @@ -1565,7 +1565,7 @@ static void mlx5e_destroy_cq(struct mlx5e_cq *cq)
> > }
> > static int mlx5e_open_cq(struct mlx5e_channel *c,
> > - struct mlx5e_cq_moder moder,
> > + struct net_dim_cq_moder moder,
> > struct mlx5e_cq_param *param,
> > struct mlx5e_cq *cq)
> > {
> > @@ -1747,7 +1747,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
> > struct mlx5e_channel_param *cparam,
> > struct mlx5e_channel **cp)
> > {
> > - struct mlx5e_cq_moder icocq_moder = {0, 0};
> > + struct net_dim_cq_moder icocq_moder = {0, 0};
> > struct net_device *netdev = priv->netdev;
> > int cpu = mlx5e_get_cpu(priv, ix);
> > struct mlx5e_channel *c;
> > @@ -1999,7 +1999,7 @@ static void mlx5e_build_ico_cq_param(struct mlx5e_priv *priv,
> > mlx5e_build_common_cq_param(priv, param);
> > - param->cq_period_mode = MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + param->cq_period_mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > }
> > static void mlx5e_build_icosq_param(struct mlx5e_priv *priv,
> > @@ -4016,13 +4016,13 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > params->tx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > params->tx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC_FROM_CQE;
> > MLX5E_SET_PFLAG(params, MLX5E_PFLAG_TX_CQE_BASED_MODER,
> > params->tx_cq_moderation.cq_period_mode ==
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> > }
> > void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > @@ -4034,17 +4034,17 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > params->rx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > params->rx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE;
> > - if (params->rx_am_enabled)
> > + if (params->rx_dim_enabled)
> > params->rx_cq_moderation =
> > - mlx5e_am_get_def_profile(cq_period_mode);
> > + net_dim_get_def_profile(cq_period_mode);
> > MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_CQE_BASED_MODER,
> > params->rx_cq_moderation.cq_period_mode ==
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> > }
> > u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)
> > @@ -4100,9 +4100,9 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
> > /* CQ moderation params */
> > cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > - params->rx_am_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > + params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> > mlx5e_set_rx_cq_mode_params(params, cq_period_mode);
> > mlx5e_set_tx_cq_mode_params(params, cq_period_mode);
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > index c6a77f8..ccb038f 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > @@ -877,8 +877,8 @@ static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev,
> > struct mlx5e_params *params)
> > {
> > u8 cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
> > params->rq_wq_type = MLX5_WQ_TYPE_LINKED_LIST;
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > index 1849169..dae77a9 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > @@ -79,7 +79,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
> > mlx5e_cq_arm(&c->sq[i].cq);
> > if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
> > - mlx5e_rx_am(&c->rq.am,
> > + net_dim(&c->rq.dim,
> > c->rq.cq.event_ctr,
> > c->rq.stats.packets,
> > c->rq.stats.bytes);
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > index ca05f4e..00b9ae3 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > @@ -33,22 +33,22 @@
> > #include "en.h"
> > -#define MLX5E_PARAMS_AM_NUM_PROFILES 5
> > +#define NET_DIM_PARAMS_NUM_PROFILES 5
> > /* Adaptive moderation profiles */
> > -#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> > -#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
> > -#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
> > -
> > -/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
> > -#define MLX5_AM_EQE_PROFILES { \
> > - {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > +#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> > +#define NET_DIM_DEF_PROFILE_CQE 1
> > +#define NET_DIM_DEF_PROFILE_EQE 1
> > +
> > +/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
> > +#define NET_DIM_EQE_PROFILES { \
> > + {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > }
> > -#define MLX5_AM_CQE_PROFILES { \
> > +#define NET_DIM_CQE_PROFILES { \
> > {2, 256}, \
> > {8, 128}, \
> > {16, 64}, \
> > @@ -56,193 +56,193 @@
> > {64, 64} \
> > }
> > -static const struct mlx5e_cq_moder
> > -profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
> > - MLX5_AM_EQE_PROFILES,
> > - MLX5_AM_CQE_PROFILES,
> > +static const struct net_dim_cq_moder
> > +profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
> > + NET_DIM_EQE_PROFILES,
> > + NET_DIM_CQE_PROFILES,
> > };
> > -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
> > +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
> > {
> > - struct mlx5e_cq_moder cq_moder;
> > + struct net_dim_cq_moder cq_moder;
> > cq_moder = profile[cq_period_mode][ix];
> > cq_moder.cq_period_mode = cq_period_mode;
> > return cq_moder;
> > }
> > -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
> > +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
> > {
> > int default_profile_ix;
> > - if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
> > - else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
> > - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
> > + if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > + default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
> > + else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
> > + default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
> > - return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
> > + return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
> > }
> > -static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
> > +static bool net_dim_on_top(struct net_dim *dim)
> > {
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > return true;
> > - case MLX5E_AM_GOING_RIGHT:
> > - return (am->steps_left > 1) && (am->steps_right == 1);
> > - default: /* MLX5E_AM_GOING_LEFT */
> > - return (am->steps_right > 1) && (am->steps_left == 1);
> > + case NET_DIM_GOING_RIGHT:
> > + return (dim->steps_left > 1) && (dim->steps_right == 1);
> > + default: /* NET_DIM_GOING_LEFT */
> > + return (dim->steps_right > 1) && (dim->steps_left == 1);
> > }
> > }
> > -static void mlx5e_am_turn(struct mlx5e_rx_am *am)
> > +static void net_dim_turn(struct net_dim *dim)
> > {
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - am->tune_state = MLX5E_AM_GOING_LEFT;
> > - am->steps_left = 0;
> > + case NET_DIM_GOING_RIGHT:
> > + dim->tune_state = NET_DIM_GOING_LEFT;
> > + dim->steps_left = 0;
> > break;
> > - case MLX5E_AM_GOING_LEFT:
> > - am->tune_state = MLX5E_AM_GOING_RIGHT;
> > - am->steps_right = 0;
> > + case NET_DIM_GOING_LEFT:
> > + dim->tune_state = NET_DIM_GOING_RIGHT;
> > + dim->steps_right = 0;
> > break;
> > }
> > }
> > -static int mlx5e_am_step(struct mlx5e_rx_am *am)
> > +static int net_dim_step(struct net_dim *dim)
> > {
> > - if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
> > - return MLX5E_AM_TOO_TIRED;
> > + if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
> > + return NET_DIM_TOO_TIRED;
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
> > - return MLX5E_AM_ON_EDGE;
> > - am->profile_ix++;
> > - am->steps_right++;
> > + case NET_DIM_GOING_RIGHT:
> > + if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
> > + return NET_DIM_ON_EDGE;
> > + dim->profile_ix++;
> > + dim->steps_right++;
> > break;
> > - case MLX5E_AM_GOING_LEFT:
> > - if (am->profile_ix == 0)
> > - return MLX5E_AM_ON_EDGE;
> > - am->profile_ix--;
> > - am->steps_left++;
> > + case NET_DIM_GOING_LEFT:
> > + if (dim->profile_ix == 0)
> > + return NET_DIM_ON_EDGE;
> > + dim->profile_ix--;
> > + dim->steps_left++;
> > break;
> > }
> > - am->tired++;
> > - return MLX5E_AM_STEPPED;
> > + dim->tired++;
> > + return NET_DIM_STEPPED;
> > }
> > -static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
> > +static void net_dim_park_on_top(struct net_dim *dim)
> > {
> > - am->steps_right = 0;
> > - am->steps_left = 0;
> > - am->tired = 0;
> > - am->tune_state = MLX5E_AM_PARKING_ON_TOP;
> > + dim->steps_right = 0;
> > + dim->steps_left = 0;
> > + dim->tired = 0;
> > + dim->tune_state = NET_DIM_PARKING_ON_TOP;
> > }
> > -static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
> > +static void net_dim_park_tired(struct net_dim *dim)
> > {
> > - am->steps_right = 0;
> > - am->steps_left = 0;
> > - am->tune_state = MLX5E_AM_PARKING_TIRED;
> > + dim->steps_right = 0;
> > + dim->steps_left = 0;
> > + dim->tune_state = NET_DIM_PARKING_TIRED;
> > }
> > -static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
> > +static void net_dim_exit_parking(struct net_dim *dim)
> > {
> > - am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
> > - MLX5E_AM_GOING_RIGHT;
> > - mlx5e_am_step(am);
> > + dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
> > + NET_DIM_GOING_RIGHT;
> > + net_dim_step(dim);
> > }
> > #define IS_SIGNIFICANT_DIFF(val, ref) \
> > (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
> > -static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
> > - struct mlx5e_rx_am_stats *prev)
> > +static int net_dim_stats_compare(struct net_dim_stats *curr,
> > + struct net_dim_stats *prev)
> > {
> > if (!prev->bpms)
> > - return curr->bpms ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_SAME;
> > + return curr->bpms ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_SAME;
> > if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
> > - return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
> > - return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
> > - return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > - return MLX5E_AM_STATS_SAME;
> > + return NET_DIM_STATS_SAME;
> > }
> > -static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
> > - struct mlx5e_rx_am *am)
> > +static bool net_dim_decision(struct net_dim_stats *curr_stats,
> > + struct net_dim *dim)
> > {
> > - int prev_state = am->tune_state;
> > - int prev_ix = am->profile_ix;
> > + int prev_state = dim->tune_state;
> > + int prev_ix = dim->profile_ix;
> > int stats_res;
> > int step_res;
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> > - if (stats_res != MLX5E_AM_STATS_SAME)
> > - mlx5e_am_exit_parking(am);
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> > + if (stats_res != NET_DIM_STATS_SAME)
> > + net_dim_exit_parking(dim);
> > break;
> > - case MLX5E_AM_PARKING_TIRED:
> > - am->tired--;
> > - if (!am->tired)
> > - mlx5e_am_exit_parking(am);
> > + case NET_DIM_PARKING_TIRED:
> > + dim->tired--;
> > + if (!dim->tired)
> > + net_dim_exit_parking(dim);
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - case MLX5E_AM_GOING_LEFT:
> > - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> > - if (stats_res != MLX5E_AM_STATS_BETTER)
> > - mlx5e_am_turn(am);
> > + case NET_DIM_GOING_RIGHT:
> > + case NET_DIM_GOING_LEFT:
> > + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> > + if (stats_res != NET_DIM_STATS_BETTER)
> > + net_dim_turn(dim);
> > - if (mlx5e_am_on_top(am)) {
> > - mlx5e_am_park_on_top(am);
> > + if (net_dim_on_top(dim)) {
> > + net_dim_park_on_top(dim);
> > break;
> > }
> > - step_res = mlx5e_am_step(am);
> > + step_res = net_dim_step(dim);
> > switch (step_res) {
> > - case MLX5E_AM_ON_EDGE:
> > - mlx5e_am_park_on_top(am);
> > + case NET_DIM_ON_EDGE:
> > + net_dim_park_on_top(dim);
> > break;
> > - case MLX5E_AM_TOO_TIRED:
> > - mlx5e_am_park_tired(am);
> > + case NET_DIM_TOO_TIRED:
> > + net_dim_park_tired(dim);
> > break;
> > }
> > break;
> > }
> > - if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
> > - (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
> > - am->prev_stats = *curr_stats;
> > + if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
> > + (dim->tune_state != NET_DIM_PARKING_ON_TOP))
> > + dim->prev_stats = *curr_stats;
> > - return am->profile_ix != prev_ix;
> > + return dim->profile_ix != prev_ix;
> > }
> > -static void mlx5e_am_sample(u16 event_ctr,
> > - u64 packets,
> > - u64 bytes,
> > - struct mlx5e_rx_am_sample *s)
> > +static void net_dim_sample(u16 event_ctr,
> > + u64 packets,
> > + u64 bytes,
> > + struct net_dim_sample *s)
> > {
> > s->time = ktime_get();
> > s->pkt_ctr = packets;
> > @@ -250,13 +250,13 @@ static void mlx5e_am_sample(u16 event_ctr,
> > s->event_ctr = event_ctr;
> > }
> > -#define MLX5E_AM_NEVENTS 64
> > +#define NET_DIM_NEVENTS 64
> > #define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
> > #define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
> > -static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
> > - struct mlx5e_rx_am_sample *end,
> > - struct mlx5e_rx_am_stats *curr_stats)
> > +static void net_dim_calc_stats(struct net_dim_sample *start,
> > + struct net_dim_sample *end,
> > + struct net_dim_stats *curr_stats)
> > {
> > /* u32 holds up to 71 minutes, should be enough */
> > u32 delta_us = ktime_us_delta(end->time, start->time);
> > @@ -269,39 +269,39 @@ static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
> > curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
> > curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
> > - curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
> > + curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
> > delta_us);
> > }
> > -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> > - u16 event_ctr,
> > - u64 packets,
> > - u64 bytes)
> > +void net_dim(struct net_dim *dim,
> > + u16 event_ctr,
> > + u64 packets,
> > + u64 bytes)
> > {
> > - struct mlx5e_rx_am_sample end_sample;
> > - struct mlx5e_rx_am_stats curr_stats;
> > + struct net_dim_sample end_sample;
> > + struct net_dim_stats curr_stats;
> > u16 nevents;
> > - switch (am->state) {
> > - case MLX5E_AM_MEASURE_IN_PROGRESS:
> > + switch (dim->state) {
> > + case NET_DIM_MEASURE_IN_PROGRESS:
> > nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
> > - am->start_sample.event_ctr);
> > - if (nevents < MLX5E_AM_NEVENTS)
> > + dim->start_sample.event_ctr);
> > + if (nevents < NET_DIM_NEVENTS)
> > break;
> > - mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
> > - mlx5e_am_calc_stats(&am->start_sample, &end_sample,
> > + net_dim_sample(event_ctr, packets, bytes, &end_sample);
> > + net_dim_calc_stats(&dim->start_sample, &end_sample,
> > &curr_stats);
> > - if (mlx5e_am_decision(&curr_stats, am)) {
> > - am->state = MLX5E_AM_APPLY_NEW_PROFILE;
> > - schedule_work(&am->work);
> > + if (net_dim_decision(&curr_stats, dim)) {
> > + dim->state = NET_DIM_APPLY_NEW_PROFILE;
> > + schedule_work(&dim->work);
> > break;
> > }
> > /* fall through */
> > - case MLX5E_AM_START_MEASURE:
> > - mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
> > - am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
> > + case NET_DIM_START_MEASURE:
> > + net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);
> > + dim->state = NET_DIM_MEASURE_IN_PROGRESS;
> > break;
> > - case MLX5E_AM_APPLY_NEW_PROFILE:
> > + case NET_DIM_APPLY_NEW_PROFILE:
> > break;
> > }
> > }
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > index 5ce8e54..a775c12 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > @@ -31,32 +31,32 @@
> > * SOFTWARE.
> > */
> > -#ifndef MLX5_AM_H
> > -#define MLX5_AM_H
> > +#ifndef NET_DIM_H
> > +#define NET_DIM_H
> > -struct mlx5e_cq_moder {
> > +struct net_dim_cq_moder {
> > u16 usec;
> > u16 pkts;
> > u8 cq_period_mode;
> > };
> > -struct mlx5e_rx_am_sample {
> > +struct net_dim_sample {
> > ktime_t time;
> > u32 pkt_ctr;
> > u32 byte_ctr;
> > u16 event_ctr;
> > };
> > -struct mlx5e_rx_am_stats {
> > +struct net_dim_stats {
> > int ppms; /* packets per msec */
> > int bpms; /* bytes per msec */
> > int epms; /* events per msec */
> > };
> > -struct mlx5e_rx_am { /* Adaptive Moderation */
> > +struct net_dim { /* Adaptive Moderation */
> > u8 state;
> > - struct mlx5e_rx_am_stats prev_stats;
> > - struct mlx5e_rx_am_sample start_sample;
> > + struct net_dim_stats prev_stats;
> > + struct net_dim_sample start_sample;
> > struct work_struct work;
> > u8 profile_ix;
> > u8 mode;
> > @@ -67,43 +67,42 @@ struct mlx5e_rx_am { /* Adaptive Moderation */
> > };
> > enum {
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> > - MLX5_CQ_PERIOD_NUM_MODES
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> > + NET_DIM_CQ_PERIOD_NUM_MODES
> > };
> > /* Adaptive moderation logic */
> > enum {
> > - MLX5E_AM_START_MEASURE,
> > - MLX5E_AM_MEASURE_IN_PROGRESS,
> > - MLX5E_AM_APPLY_NEW_PROFILE,
> > + NET_DIM_START_MEASURE,
> > + NET_DIM_MEASURE_IN_PROGRESS,
> > + NET_DIM_APPLY_NEW_PROFILE,
> > };
> > enum {
> > - MLX5E_AM_PARKING_ON_TOP,
> > - MLX5E_AM_PARKING_TIRED,
> > - MLX5E_AM_GOING_RIGHT,
> > - MLX5E_AM_GOING_LEFT,
> > + NET_DIM_PARKING_ON_TOP,
> > + NET_DIM_PARKING_TIRED,
> > + NET_DIM_GOING_RIGHT,
> > + NET_DIM_GOING_LEFT,
> > };
> > enum {
> > - MLX5E_AM_STATS_WORSE,
> > - MLX5E_AM_STATS_SAME,
> > - MLX5E_AM_STATS_BETTER,
> > + NET_DIM_STATS_WORSE,
> > + NET_DIM_STATS_SAME,
> > + NET_DIM_STATS_BETTER,
> > };
> > enum {
> > - MLX5E_AM_STEPPED,
> > - MLX5E_AM_TOO_TIRED,
> > - MLX5E_AM_ON_EDGE,
> > + NET_DIM_STEPPED,
> > + NET_DIM_TOO_TIRED,
> > + NET_DIM_ON_EDGE,
> > };
> > -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> > - u16 event_ctr,
> > - u64 packets,
> > - u64 bytes);
> > -void mlx5e_rx_am_work(struct work_struct *work);
> > -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
> > -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
> > +void net_dim(struct net_dim *dim,
> > + u16 event_ctr,
> > + u64 packets,
> > + u64 bytes);
> > +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode);
> > +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix);
> > -#endif /* MLX5_AM_H */
> > +#endif /* NET_DIM_H */
> >
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [net-next 06/10] net/mlx5e: change Mellanox references in DIM code
2018-01-05 8:04 ` Tal Gilboa
2018-01-05 13:55 ` Andy Gospodarek
@ 2018-01-05 20:57 ` Andy Gospodarek
1 sibling, 0 replies; 24+ messages in thread
From: Andy Gospodarek @ 2018-01-05 20:57 UTC (permalink / raw)
To: Tal Gilboa; +Cc: netdev, mchan, ogerlitz, Andy Gospodarek
On Fri, Jan 05, 2018 at 10:04:50AM +0200, Tal Gilboa wrote:
> On 1/4/2018 10:21 PM, Andy Gospodarek wrote:
> > From: Andy Gospodarek <gospo@broadcom.com>
> >
> > Change all mlx5_am* and MLX_AM* references to net_dim and NET_DIM,
> MLX_AM->MLX5_AM
>
> > cq_period_mode = enable ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> I'm not sure about this part. CQE/EQE based moderation is a feature in
> Mellanox's chips, which isn't necessarily coupled with adaptive moderation.
> net_dim lib should know which values to choose according to the selected
> mode, but I don't think mlx5 driver should use an enum from net_dim for
> enabling/disabling HW features. Another issue is that we use the enum value
> as an argument for the command to HW (0=EQE, 1=CQE). If someone would change
> the values it would break the HW feature. I think it would be safer to use
> the NET_DIM_XXX enum only when using functions from net_dim lib.
[Please ignore my eariler response, I'm not sure I fully read/parsed what you
were saying. Sorry about that.]
I like your suggestion, so I'm going to refactor this a bit based on that. I
made all the other suggested changes, so this should be the last one....
>
> > current_cq_period_mode = is_rx_cq ?
> > priv->channels.params.rx_cq_moderation.cq_period_mode :
> > priv->channels.params.tx_cq_moderation.cq_period_mode;
> > mode_changed = cq_period_mode != current_cq_period_mode;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE &&
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE &&
> > !MLX5_CAP_GEN(mdev, cq_period_start_from_cqe))
> > return -EOPNOTSUPP;
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > index 3aa1c90..edd4077 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > @@ -674,8 +674,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
> > wqe->data.lkey = rq->mkey_be;
> > }
> > - INIT_WORK(&rq->am.work, mlx5e_rx_am_work);
> > - rq->am.mode = params->rx_cq_moderation.cq_period_mode;
> > + INIT_WORK(&rq->dim.work, mlx5e_rx_dim_work);
> > + rq->dim.mode = params->rx_cq_moderation.cq_period_mode;
> > rq->page_cache.head = 0;
> > rq->page_cache.tail = 0;
> > @@ -919,7 +919,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
> > if (err)
> > goto err_destroy_rq;
> > - if (params->rx_am_enabled)
> > + if (params->rx_dim_enabled)
> > c->rq.state |= BIT(MLX5E_RQ_STATE_AM);
> > return 0;
> > @@ -952,7 +952,7 @@ static void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
> > static void mlx5e_close_rq(struct mlx5e_rq *rq)
> > {
> > - cancel_work_sync(&rq->am.work);
> > + cancel_work_sync(&rq->dim.work);
> > mlx5e_destroy_rq(rq);
> > mlx5e_free_rx_descs(rq);
> > mlx5e_free_rq(rq);
> > @@ -1565,7 +1565,7 @@ static void mlx5e_destroy_cq(struct mlx5e_cq *cq)
> > }
> > static int mlx5e_open_cq(struct mlx5e_channel *c,
> > - struct mlx5e_cq_moder moder,
> > + struct net_dim_cq_moder moder,
> > struct mlx5e_cq_param *param,
> > struct mlx5e_cq *cq)
> > {
> > @@ -1747,7 +1747,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
> > struct mlx5e_channel_param *cparam,
> > struct mlx5e_channel **cp)
> > {
> > - struct mlx5e_cq_moder icocq_moder = {0, 0};
> > + struct net_dim_cq_moder icocq_moder = {0, 0};
> > struct net_device *netdev = priv->netdev;
> > int cpu = mlx5e_get_cpu(priv, ix);
> > struct mlx5e_channel *c;
> > @@ -1999,7 +1999,7 @@ static void mlx5e_build_ico_cq_param(struct mlx5e_priv *priv,
> > mlx5e_build_common_cq_param(priv, param);
> > - param->cq_period_mode = MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + param->cq_period_mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > }
> > static void mlx5e_build_icosq_param(struct mlx5e_priv *priv,
> > @@ -4016,13 +4016,13 @@ void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > params->tx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > params->tx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_USEC_FROM_CQE;
> > MLX5E_SET_PFLAG(params, MLX5E_PFLAG_TX_CQE_BASED_MODER,
> > params->tx_cq_moderation.cq_period_mode ==
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> > }
> > void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > @@ -4034,17 +4034,17 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)
> > params->rx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC;
> > - if (cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > + if (cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > params->rx_cq_moderation.usec =
> > MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_USEC_FROM_CQE;
> > - if (params->rx_am_enabled)
> > + if (params->rx_dim_enabled)
> > params->rx_cq_moderation =
> > - mlx5e_am_get_def_profile(cq_period_mode);
> > + net_dim_get_def_profile(cq_period_mode);
> > MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_CQE_BASED_MODER,
> > params->rx_cq_moderation.cq_period_mode ==
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE);
> > }
> > u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)
> > @@ -4100,9 +4100,9 @@ void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,
> > /* CQ moderation params */
> > cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > - params->rx_am_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > + params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
> > mlx5e_set_rx_cq_mode_params(params, cq_period_mode);
> > mlx5e_set_tx_cq_mode_params(params, cq_period_mode);
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > index c6a77f8..ccb038f 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> > @@ -877,8 +877,8 @@ static void mlx5e_build_rep_params(struct mlx5_core_dev *mdev,
> > struct mlx5e_params *params)
> > {
> > u8 cq_period_mode = MLX5_CAP_GEN(mdev, cq_period_start_from_cqe) ?
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE :
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
> > params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
> > params->rq_wq_type = MLX5_WQ_TYPE_LINKED_LIST;
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > index 1849169..dae77a9 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
> > @@ -79,7 +79,7 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget)
> > mlx5e_cq_arm(&c->sq[i].cq);
> > if (MLX5E_TEST_BIT(c->rq.state, MLX5E_RQ_STATE_AM))
> > - mlx5e_rx_am(&c->rq.am,
> > + net_dim(&c->rq.dim,
> > c->rq.cq.event_ctr,
> > c->rq.stats.packets,
> > c->rq.stats.bytes);
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > index ca05f4e..00b9ae3 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.c
> > @@ -33,22 +33,22 @@
> > #include "en.h"
> > -#define MLX5E_PARAMS_AM_NUM_PROFILES 5
> > +#define NET_DIM_PARAMS_NUM_PROFILES 5
> > /* Adaptive moderation profiles */
> > -#define MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> > -#define MLX5E_RX_AM_DEF_PROFILE_CQE 1
> > -#define MLX5E_RX_AM_DEF_PROFILE_EQE 1
> > -
> > -/* All profiles sizes must be MLX5E_PARAMS_AM_NUM_PROFILES */
> > -#define MLX5_AM_EQE_PROFILES { \
> > - {1, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {8, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {64, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {128, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > - {256, MLX5E_AM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > +#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
> > +#define NET_DIM_DEF_PROFILE_CQE 1
> > +#define NET_DIM_DEF_PROFILE_EQE 1
> > +
> > +/* All profiles sizes must be NET_PARAMS_DIM_NUM_PROFILES */
> > +#define NET_DIM_EQE_PROFILES { \
> > + {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > + {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
> > }
> > -#define MLX5_AM_CQE_PROFILES { \
> > +#define NET_DIM_CQE_PROFILES { \
> > {2, 256}, \
> > {8, 128}, \
> > {16, 64}, \
> > @@ -56,193 +56,193 @@
> > {64, 64} \
> > }
> > -static const struct mlx5e_cq_moder
> > -profile[MLX5_CQ_PERIOD_NUM_MODES][MLX5E_PARAMS_AM_NUM_PROFILES] = {
> > - MLX5_AM_EQE_PROFILES,
> > - MLX5_AM_CQE_PROFILES,
> > +static const struct net_dim_cq_moder
> > +profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
> > + NET_DIM_EQE_PROFILES,
> > + NET_DIM_CQE_PROFILES,
> > };
> > -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix)
> > +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
> > {
> > - struct mlx5e_cq_moder cq_moder;
> > + struct net_dim_cq_moder cq_moder;
> > cq_moder = profile[cq_period_mode][ix];
> > cq_moder.cq_period_mode = cq_period_mode;
> > return cq_moder;
> > }
> > -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode)
> > +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
> > {
> > int default_profile_ix;
> > - if (rx_cq_period_mode == MLX5_CQ_PERIOD_MODE_START_FROM_CQE)
> > - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_CQE;
> > - else /* MLX5_CQ_PERIOD_MODE_START_FROM_EQE */
> > - default_profile_ix = MLX5E_RX_AM_DEF_PROFILE_EQE;
> > + if (rx_cq_period_mode == NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE)
> > + default_profile_ix = NET_DIM_DEF_PROFILE_CQE;
> > + else /* NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE */
> > + default_profile_ix = NET_DIM_DEF_PROFILE_EQE;
> > - return mlx5e_am_get_profile(rx_cq_period_mode, default_profile_ix);
> > + return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
> > }
> > -static bool mlx5e_am_on_top(struct mlx5e_rx_am *am)
> > +static bool net_dim_on_top(struct net_dim *dim)
> > {
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > return true;
> > - case MLX5E_AM_GOING_RIGHT:
> > - return (am->steps_left > 1) && (am->steps_right == 1);
> > - default: /* MLX5E_AM_GOING_LEFT */
> > - return (am->steps_right > 1) && (am->steps_left == 1);
> > + case NET_DIM_GOING_RIGHT:
> > + return (dim->steps_left > 1) && (dim->steps_right == 1);
> > + default: /* NET_DIM_GOING_LEFT */
> > + return (dim->steps_right > 1) && (dim->steps_left == 1);
> > }
> > }
> > -static void mlx5e_am_turn(struct mlx5e_rx_am *am)
> > +static void net_dim_turn(struct net_dim *dim)
> > {
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - am->tune_state = MLX5E_AM_GOING_LEFT;
> > - am->steps_left = 0;
> > + case NET_DIM_GOING_RIGHT:
> > + dim->tune_state = NET_DIM_GOING_LEFT;
> > + dim->steps_left = 0;
> > break;
> > - case MLX5E_AM_GOING_LEFT:
> > - am->tune_state = MLX5E_AM_GOING_RIGHT;
> > - am->steps_right = 0;
> > + case NET_DIM_GOING_LEFT:
> > + dim->tune_state = NET_DIM_GOING_RIGHT;
> > + dim->steps_right = 0;
> > break;
> > }
> > }
> > -static int mlx5e_am_step(struct mlx5e_rx_am *am)
> > +static int net_dim_step(struct net_dim *dim)
> > {
> > - if (am->tired == (MLX5E_PARAMS_AM_NUM_PROFILES * 2))
> > - return MLX5E_AM_TOO_TIRED;
> > + if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
> > + return NET_DIM_TOO_TIRED;
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - case MLX5E_AM_PARKING_TIRED:
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + case NET_DIM_PARKING_TIRED:
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - if (am->profile_ix == (MLX5E_PARAMS_AM_NUM_PROFILES - 1))
> > - return MLX5E_AM_ON_EDGE;
> > - am->profile_ix++;
> > - am->steps_right++;
> > + case NET_DIM_GOING_RIGHT:
> > + if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
> > + return NET_DIM_ON_EDGE;
> > + dim->profile_ix++;
> > + dim->steps_right++;
> > break;
> > - case MLX5E_AM_GOING_LEFT:
> > - if (am->profile_ix == 0)
> > - return MLX5E_AM_ON_EDGE;
> > - am->profile_ix--;
> > - am->steps_left++;
> > + case NET_DIM_GOING_LEFT:
> > + if (dim->profile_ix == 0)
> > + return NET_DIM_ON_EDGE;
> > + dim->profile_ix--;
> > + dim->steps_left++;
> > break;
> > }
> > - am->tired++;
> > - return MLX5E_AM_STEPPED;
> > + dim->tired++;
> > + return NET_DIM_STEPPED;
> > }
> > -static void mlx5e_am_park_on_top(struct mlx5e_rx_am *am)
> > +static void net_dim_park_on_top(struct net_dim *dim)
> > {
> > - am->steps_right = 0;
> > - am->steps_left = 0;
> > - am->tired = 0;
> > - am->tune_state = MLX5E_AM_PARKING_ON_TOP;
> > + dim->steps_right = 0;
> > + dim->steps_left = 0;
> > + dim->tired = 0;
> > + dim->tune_state = NET_DIM_PARKING_ON_TOP;
> > }
> > -static void mlx5e_am_park_tired(struct mlx5e_rx_am *am)
> > +static void net_dim_park_tired(struct net_dim *dim)
> > {
> > - am->steps_right = 0;
> > - am->steps_left = 0;
> > - am->tune_state = MLX5E_AM_PARKING_TIRED;
> > + dim->steps_right = 0;
> > + dim->steps_left = 0;
> > + dim->tune_state = NET_DIM_PARKING_TIRED;
> > }
> > -static void mlx5e_am_exit_parking(struct mlx5e_rx_am *am)
> > +static void net_dim_exit_parking(struct net_dim *dim)
> > {
> > - am->tune_state = am->profile_ix ? MLX5E_AM_GOING_LEFT :
> > - MLX5E_AM_GOING_RIGHT;
> > - mlx5e_am_step(am);
> > + dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :
> > + NET_DIM_GOING_RIGHT;
> > + net_dim_step(dim);
> > }
> > #define IS_SIGNIFICANT_DIFF(val, ref) \
> > (((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */
> > -static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,
> > - struct mlx5e_rx_am_stats *prev)
> > +static int net_dim_stats_compare(struct net_dim_stats *curr,
> > + struct net_dim_stats *prev)
> > {
> > if (!prev->bpms)
> > - return curr->bpms ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_SAME;
> > + return curr->bpms ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_SAME;
> > if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
> > - return (curr->bpms > prev->bpms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
> > - return (curr->ppms > prev->ppms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
> > - return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
> > - MLX5E_AM_STATS_WORSE;
> > + return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER :
> > + NET_DIM_STATS_WORSE;
> > - return MLX5E_AM_STATS_SAME;
> > + return NET_DIM_STATS_SAME;
> > }
> > -static bool mlx5e_am_decision(struct mlx5e_rx_am_stats *curr_stats,
> > - struct mlx5e_rx_am *am)
> > +static bool net_dim_decision(struct net_dim_stats *curr_stats,
> > + struct net_dim *dim)
> > {
> > - int prev_state = am->tune_state;
> > - int prev_ix = am->profile_ix;
> > + int prev_state = dim->tune_state;
> > + int prev_ix = dim->profile_ix;
> > int stats_res;
> > int step_res;
> > - switch (am->tune_state) {
> > - case MLX5E_AM_PARKING_ON_TOP:
> > - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> > - if (stats_res != MLX5E_AM_STATS_SAME)
> > - mlx5e_am_exit_parking(am);
> > + switch (dim->tune_state) {
> > + case NET_DIM_PARKING_ON_TOP:
> > + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> > + if (stats_res != NET_DIM_STATS_SAME)
> > + net_dim_exit_parking(dim);
> > break;
> > - case MLX5E_AM_PARKING_TIRED:
> > - am->tired--;
> > - if (!am->tired)
> > - mlx5e_am_exit_parking(am);
> > + case NET_DIM_PARKING_TIRED:
> > + dim->tired--;
> > + if (!dim->tired)
> > + net_dim_exit_parking(dim);
> > break;
> > - case MLX5E_AM_GOING_RIGHT:
> > - case MLX5E_AM_GOING_LEFT:
> > - stats_res = mlx5e_am_stats_compare(curr_stats, &am->prev_stats);
> > - if (stats_res != MLX5E_AM_STATS_BETTER)
> > - mlx5e_am_turn(am);
> > + case NET_DIM_GOING_RIGHT:
> > + case NET_DIM_GOING_LEFT:
> > + stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
> > + if (stats_res != NET_DIM_STATS_BETTER)
> > + net_dim_turn(dim);
> > - if (mlx5e_am_on_top(am)) {
> > - mlx5e_am_park_on_top(am);
> > + if (net_dim_on_top(dim)) {
> > + net_dim_park_on_top(dim);
> > break;
> > }
> > - step_res = mlx5e_am_step(am);
> > + step_res = net_dim_step(dim);
> > switch (step_res) {
> > - case MLX5E_AM_ON_EDGE:
> > - mlx5e_am_park_on_top(am);
> > + case NET_DIM_ON_EDGE:
> > + net_dim_park_on_top(dim);
> > break;
> > - case MLX5E_AM_TOO_TIRED:
> > - mlx5e_am_park_tired(am);
> > + case NET_DIM_TOO_TIRED:
> > + net_dim_park_tired(dim);
> > break;
> > }
> > break;
> > }
> > - if ((prev_state != MLX5E_AM_PARKING_ON_TOP) ||
> > - (am->tune_state != MLX5E_AM_PARKING_ON_TOP))
> > - am->prev_stats = *curr_stats;
> > + if ((prev_state != NET_DIM_PARKING_ON_TOP) ||
> > + (dim->tune_state != NET_DIM_PARKING_ON_TOP))
> > + dim->prev_stats = *curr_stats;
> > - return am->profile_ix != prev_ix;
> > + return dim->profile_ix != prev_ix;
> > }
> > -static void mlx5e_am_sample(u16 event_ctr,
> > - u64 packets,
> > - u64 bytes,
> > - struct mlx5e_rx_am_sample *s)
> > +static void net_dim_sample(u16 event_ctr,
> > + u64 packets,
> > + u64 bytes,
> > + struct net_dim_sample *s)
> > {
> > s->time = ktime_get();
> > s->pkt_ctr = packets;
> > @@ -250,13 +250,13 @@ static void mlx5e_am_sample(u16 event_ctr,
> > s->event_ctr = event_ctr;
> > }
> > -#define MLX5E_AM_NEVENTS 64
> > +#define NET_DIM_NEVENTS 64
> > #define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
> > #define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))
> > -static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
> > - struct mlx5e_rx_am_sample *end,
> > - struct mlx5e_rx_am_stats *curr_stats)
> > +static void net_dim_calc_stats(struct net_dim_sample *start,
> > + struct net_dim_sample *end,
> > + struct net_dim_stats *curr_stats)
> > {
> > /* u32 holds up to 71 minutes, should be enough */
> > u32 delta_us = ktime_us_delta(end->time, start->time);
> > @@ -269,39 +269,39 @@ static void mlx5e_am_calc_stats(struct mlx5e_rx_am_sample *start,
> > curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
> > curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
> > - curr_stats->epms = DIV_ROUND_UP(MLX5E_AM_NEVENTS * USEC_PER_MSEC,
> > + curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC,
> > delta_us);
> > }
> > -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> > - u16 event_ctr,
> > - u64 packets,
> > - u64 bytes)
> > +void net_dim(struct net_dim *dim,
> > + u16 event_ctr,
> > + u64 packets,
> > + u64 bytes)
> > {
> > - struct mlx5e_rx_am_sample end_sample;
> > - struct mlx5e_rx_am_stats curr_stats;
> > + struct net_dim_sample end_sample;
> > + struct net_dim_stats curr_stats;
> > u16 nevents;
> > - switch (am->state) {
> > - case MLX5E_AM_MEASURE_IN_PROGRESS:
> > + switch (dim->state) {
> > + case NET_DIM_MEASURE_IN_PROGRESS:
> > nevents = BIT_GAP(BITS_PER_TYPE(u16), event_ctr,
> > - am->start_sample.event_ctr);
> > - if (nevents < MLX5E_AM_NEVENTS)
> > + dim->start_sample.event_ctr);
> > + if (nevents < NET_DIM_NEVENTS)
> > break;
> > - mlx5e_am_sample(event_ctr, packets, bytes, &end_sample);
> > - mlx5e_am_calc_stats(&am->start_sample, &end_sample,
> > + net_dim_sample(event_ctr, packets, bytes, &end_sample);
> > + net_dim_calc_stats(&dim->start_sample, &end_sample,
> > &curr_stats);
> > - if (mlx5e_am_decision(&curr_stats, am)) {
> > - am->state = MLX5E_AM_APPLY_NEW_PROFILE;
> > - schedule_work(&am->work);
> > + if (net_dim_decision(&curr_stats, dim)) {
> > + dim->state = NET_DIM_APPLY_NEW_PROFILE;
> > + schedule_work(&dim->work);
> > break;
> > }
> > /* fall through */
> > - case MLX5E_AM_START_MEASURE:
> > - mlx5e_am_sample(event_ctr, packets, bytes, &am->start_sample);
> > - am->state = MLX5E_AM_MEASURE_IN_PROGRESS;
> > + case NET_DIM_START_MEASURE:
> > + net_dim_sample(event_ctr, packets, bytes, &dim->start_sample);
> > + dim->state = NET_DIM_MEASURE_IN_PROGRESS;
> > break;
> > - case MLX5E_AM_APPLY_NEW_PROFILE:
> > + case NET_DIM_APPLY_NEW_PROFILE:
> > break;
> > }
> > }
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > index 5ce8e54..a775c12 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
> > @@ -31,32 +31,32 @@
> > * SOFTWARE.
> > */
> > -#ifndef MLX5_AM_H
> > -#define MLX5_AM_H
> > +#ifndef NET_DIM_H
> > +#define NET_DIM_H
> > -struct mlx5e_cq_moder {
> > +struct net_dim_cq_moder {
> > u16 usec;
> > u16 pkts;
> > u8 cq_period_mode;
> > };
> > -struct mlx5e_rx_am_sample {
> > +struct net_dim_sample {
> > ktime_t time;
> > u32 pkt_ctr;
> > u32 byte_ctr;
> > u16 event_ctr;
> > };
> > -struct mlx5e_rx_am_stats {
> > +struct net_dim_stats {
> > int ppms; /* packets per msec */
> > int bpms; /* bytes per msec */
> > int epms; /* events per msec */
> > };
> > -struct mlx5e_rx_am { /* Adaptive Moderation */
> > +struct net_dim { /* Adaptive Moderation */
> > u8 state;
> > - struct mlx5e_rx_am_stats prev_stats;
> > - struct mlx5e_rx_am_sample start_sample;
> > + struct net_dim_stats prev_stats;
> > + struct net_dim_sample start_sample;
> > struct work_struct work;
> > u8 profile_ix;
> > u8 mode;
> > @@ -67,43 +67,42 @@ struct mlx5e_rx_am { /* Adaptive Moderation */
> > };
> > enum {
> > - MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> > - MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> > - MLX5_CQ_PERIOD_NUM_MODES
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,
> > + NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,
> > + NET_DIM_CQ_PERIOD_NUM_MODES
> > };
> > /* Adaptive moderation logic */
> > enum {
> > - MLX5E_AM_START_MEASURE,
> > - MLX5E_AM_MEASURE_IN_PROGRESS,
> > - MLX5E_AM_APPLY_NEW_PROFILE,
> > + NET_DIM_START_MEASURE,
> > + NET_DIM_MEASURE_IN_PROGRESS,
> > + NET_DIM_APPLY_NEW_PROFILE,
> > };
> > enum {
> > - MLX5E_AM_PARKING_ON_TOP,
> > - MLX5E_AM_PARKING_TIRED,
> > - MLX5E_AM_GOING_RIGHT,
> > - MLX5E_AM_GOING_LEFT,
> > + NET_DIM_PARKING_ON_TOP,
> > + NET_DIM_PARKING_TIRED,
> > + NET_DIM_GOING_RIGHT,
> > + NET_DIM_GOING_LEFT,
> > };
> > enum {
> > - MLX5E_AM_STATS_WORSE,
> > - MLX5E_AM_STATS_SAME,
> > - MLX5E_AM_STATS_BETTER,
> > + NET_DIM_STATS_WORSE,
> > + NET_DIM_STATS_SAME,
> > + NET_DIM_STATS_BETTER,
> > };
> > enum {
> > - MLX5E_AM_STEPPED,
> > - MLX5E_AM_TOO_TIRED,
> > - MLX5E_AM_ON_EDGE,
> > + NET_DIM_STEPPED,
> > + NET_DIM_TOO_TIRED,
> > + NET_DIM_ON_EDGE,
> > };
> > -void mlx5e_rx_am(struct mlx5e_rx_am *am,
> > - u16 event_ctr,
> > - u64 packets,
> > - u64 bytes);
> > -void mlx5e_rx_am_work(struct work_struct *work);
> > -struct mlx5e_cq_moder mlx5e_am_get_def_profile(u8 rx_cq_period_mode);
> > -struct mlx5e_cq_moder mlx5e_am_get_profile(u8 cq_period_mode, int ix);
> > +void net_dim(struct net_dim *dim,
> > + u16 event_ctr,
> > + u64 packets,
> > + u64 bytes);
> > +struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode);
> > +struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix);
> > -#endif /* MLX5_AM_H */
> > +#endif /* NET_DIM_H */
> >
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2018-01-05 20:57 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-04 20:21 [net-next 00/10] net: create dynamic software irq moderation library Andy Gospodarek
2018-01-04 20:21 ` [net-next 01/10] net/mlx5e: move interrupt moderation structs to new file Andy Gospodarek
2018-01-04 20:21 ` [net-next 02/10] net/mlx5e: move interrupt moderation forward declarations Andy Gospodarek
2018-01-04 20:21 ` [net-next 03/10] net/mlx5e: remove rq references in mlx5e_rx_am Andy Gospodarek
2018-01-04 20:21 ` [net-next 04/10] net/mlx5e: move AM logic enums Andy Gospodarek
2018-01-04 20:21 ` [net-next 05/10] net/mlx5e: move generic functions to new file Andy Gospodarek
2018-01-04 20:21 ` [net-next 06/10] net/mlx5e: change Mellanox references in DIM code Andy Gospodarek
2018-01-05 8:04 ` Tal Gilboa
2018-01-05 13:55 ` Andy Gospodarek
2018-01-05 20:57 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 07/10] net: move dynamic interrupt coalescing code to include/linux Andy Gospodarek
2018-01-04 20:21 ` [net-next 08/10] net/dim: use struct net_dim_sample as arg to net_dim Andy Gospodarek
2018-01-05 8:13 ` Tal Gilboa
2018-01-04 20:21 ` [net-next 09/10] bnxt_en: add support for software dynamic interrupt moderation Andy Gospodarek
2018-01-04 22:16 ` Michael Chan
2018-01-05 13:44 ` Andy Gospodarek
2018-01-04 20:21 ` [net-next 10/10] MAINTAINERS: add entry for Dynamic Interrupt Moderation Andy Gospodarek
2018-01-04 22:36 ` Stephen Hemminger
2018-01-04 22:45 ` Andy Gospodarek
2018-01-04 20:37 ` [net-next 00/10] net: create dynamic software irq moderation library Or Gerlitz
2018-01-04 22:46 ` Andy Gospodarek
2018-01-04 21:37 ` Saeed Mahameed
2018-01-05 8:14 ` Tal Gilboa
2018-01-05 13:48 ` Andy Gospodarek
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.