Skip to content

Commit

Permalink
net/mlx5e: Move dynamic interrupt coalescing code to include/linux
Browse files Browse the repository at this point in the history 
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>
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andy Gospodarek authored and David S. Miller committed Jan 10, 2018
1 parent 9a31742 commit 4c4dbb4
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 134 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
#include <linux/rhashtable.h>
#include <net/switchdev.h>
#include <net/xdp.h>
#include <linux/net_dim.h>
#include "wq.h"
#include "mlx5_core.h"
#include "en_stats.h"
#include "net_dim.h"

#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)

Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
* SOFTWARE.
*/

#include <linux/net_dim.h>
#include "en.h"

void mlx5e_rx_dim_work(struct work_struct *work)
Expand Down
108 changes: 0 additions & 108 deletions drivers/net/ethernet/mellanox/mlx5/core/net_dim.h
View file

This file was deleted.

118 changes: 94 additions & 24 deletions ...net/ethernet/mellanox/mlx5/core/net_dim.c → include/linux/net_dim.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,74 @@
* SOFTWARE.
*/

#include "en.h"
#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 */
Expand Down Expand Up @@ -62,7 +129,8 @@ profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
NET_DIM_CQE_PROFILES,
};

struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
static inline struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode,
int ix)
{
struct net_dim_cq_moder cq_moder;

Expand All @@ -71,7 +139,7 @@ struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)
return cq_moder;
}

struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
static inline struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
{
int default_profile_ix;

Expand All @@ -83,7 +151,7 @@ struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)
return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);
}

static bool net_dim_on_top(struct net_dim *dim)
static inline bool net_dim_on_top(struct net_dim *dim)
{
switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP:
Expand All @@ -96,7 +164,7 @@ static bool net_dim_on_top(struct net_dim *dim)
}
}

static void net_dim_turn(struct net_dim *dim)
static inline void net_dim_turn(struct net_dim *dim)
{
switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP:
Expand All @@ -113,7 +181,7 @@ static void net_dim_turn(struct net_dim *dim)
}
}

static int net_dim_step(struct net_dim *dim)
static inline int net_dim_step(struct net_dim *dim)
{
if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
return NET_DIM_TOO_TIRED;
Expand All @@ -140,22 +208,22 @@ static int net_dim_step(struct net_dim *dim)
return NET_DIM_STEPPED;
}

static void net_dim_park_on_top(struct net_dim *dim)
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 void net_dim_park_tired(struct net_dim *dim)
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 void net_dim_exit_parking(struct net_dim *dim)
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;
Expand All @@ -165,8 +233,8 @@ static void net_dim_exit_parking(struct net_dim *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)
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 :
Expand All @@ -187,8 +255,8 @@ static int net_dim_stats_compare(struct net_dim_stats *curr,
return NET_DIM_STATS_SAME;
}

static bool net_dim_decision(struct net_dim_stats *curr_stats,
struct net_dim *dim)
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;
Expand Down Expand Up @@ -239,10 +307,10 @@ static bool net_dim_decision(struct net_dim_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)
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;
Expand All @@ -254,9 +322,9 @@ static void net_dim_sample(u16 event_ctr,
#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)
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);
Expand All @@ -273,10 +341,10 @@ static void net_dim_calc_stats(struct net_dim_sample *start,
delta_us);
}

void net_dim(struct net_dim *dim,
u16 event_ctr,
u64 packets,
u64 bytes)
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;
Expand Down Expand Up @@ -305,3 +373,5 @@ void net_dim(struct net_dim *dim,
break;
}
}

#endif /* NET_DIM_H */

0 comments on commit 4c4dbb4

Please sign in to comment.