Skip to content

L
linux
Commit 449986ea authored by Tal Gilboa's avatar Tal Gilboa Committed by Saeed Mahameed
Browse files
Options

linux/dim: Remove "net" prefix from internal DIM members 

Only renaming functions and structs which aren't used by an external code.
Signed-off-by: default avatarTal Gilboa <talgi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 0e58983d
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 87 deletions
include/linux/dim.h
View file @ 449986ea
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/module.h> #include <linux/module.h>
#define NET_DIM_NEVENTS 64 #define DIM_NEVENTS 64
/* more than 10% difference */ /* more than 10% difference */
#define IS_SIGNIFICANT_DIFF(val, ref) \ #define IS_SIGNIFICANT_DIFF(val, ref) \
...@@ -27,7 +27,7 @@ struct net_dim_sample { ...@@ -27,7 +27,7 @@ struct net_dim_sample {
u16 event_ctr; u16 event_ctr;
}; };
struct net_dim_stats { struct dim_stats {
int ppms; /* packets per msec */ int ppms; /* packets per msec */
int bpms; /* bytes per msec */ int bpms; /* bytes per msec */
int epms; /* events per msec */ int epms; /* events per msec */
...@@ -35,7 +35,7 @@ struct net_dim_stats { ...@@ -35,7 +35,7 @@ struct net_dim_stats {
struct net_dim { /* Dynamic Interrupt Moderation */ struct net_dim { /* Dynamic Interrupt Moderation */
u8 state; u8 state;
struct net_dim_stats prev_stats; struct dim_stats prev_stats;
struct net_dim_sample start_sample; struct net_dim_sample start_sample;
struct work_struct work; struct work_struct work;
u8 profile_ix; u8 profile_ix;
...@@ -59,67 +59,67 @@ enum { ...@@ -59,67 +59,67 @@ enum {
}; };
enum { enum {
NET_DIM_PARKING_ON_TOP, DIM_PARKING_ON_TOP,
NET_DIM_PARKING_TIRED, DIM_PARKING_TIRED,
NET_DIM_GOING_RIGHT, DIM_GOING_RIGHT,
NET_DIM_GOING_LEFT, DIM_GOING_LEFT,
}; };
enum { enum {
NET_DIM_STATS_WORSE, DIM_STATS_WORSE,
NET_DIM_STATS_SAME, DIM_STATS_SAME,
NET_DIM_STATS_BETTER, DIM_STATS_BETTER,
}; };
enum { enum {
NET_DIM_STEPPED, DIM_STEPPED,
NET_DIM_TOO_TIRED, DIM_TOO_TIRED,
NET_DIM_ON_EDGE, DIM_ON_EDGE,
}; };
static inline bool net_dim_on_top(struct net_dim *net_dim) static inline bool dim_on_top(struct net_dim *dim)
{ {
switch (net_dim->tune_state) { switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP: case DIM_PARKING_ON_TOP:
case NET_DIM_PARKING_TIRED: case DIM_PARKING_TIRED:
return true; return true;
case NET_DIM_GOING_RIGHT: case DIM_GOING_RIGHT:
return (net_dim->steps_left > 1) && (net_dim->steps_right == 1); return (dim->steps_left > 1) && (dim->steps_right == 1);
default: /* NET_DIM_GOING_LEFT */ default: /* DIM_GOING_LEFT */
return (net_dim->steps_right > 1) && (net_dim->steps_left == 1); return (dim->steps_right > 1) && (dim->steps_left == 1);
} }
} }
static inline void net_dim_turn(struct net_dim *net_dim) static inline void dim_turn(struct net_dim *dim)
{ {
switch (net_dim->tune_state) { switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP: case DIM_PARKING_ON_TOP:
case NET_DIM_PARKING_TIRED: case DIM_PARKING_TIRED:
break; break;
case NET_DIM_GOING_RIGHT: case DIM_GOING_RIGHT:
net_dim->tune_state = NET_DIM_GOING_LEFT; dim->tune_state = DIM_GOING_LEFT;
net_dim->steps_left = 0; dim->steps_left = 0;
break; break;
case NET_DIM_GOING_LEFT: case DIM_GOING_LEFT:
net_dim->tune_state = NET_DIM_GOING_RIGHT; dim->tune_state = DIM_GOING_RIGHT;
net_dim->steps_right = 0; dim->steps_right = 0;
break; break;
} }
} }
static inline void net_dim_park_on_top(struct net_dim *net_dim) static inline void dim_park_on_top(struct net_dim *dim)
{ {
net_dim->steps_right = 0; dim->steps_right = 0;
net_dim->steps_left = 0; dim->steps_left = 0;
net_dim->tired = 0; dim->tired = 0;
net_dim->tune_state = NET_DIM_PARKING_ON_TOP; dim->tune_state = DIM_PARKING_ON_TOP;
} }
static inline void net_dim_park_tired(struct net_dim *net_dim) static inline void dim_park_tired(struct net_dim *dim)
{ {
net_dim->steps_right = 0; dim->steps_right = 0;
net_dim->steps_left = 0; dim->steps_left = 0;
net_dim->tune_state = NET_DIM_PARKING_TIRED; dim->tune_state = DIM_PARKING_TIRED;
} }
static inline void static inline void
...@@ -132,8 +132,8 @@ net_dim_sample(u16 event_ctr, u64 packets, u64 bytes, struct net_dim_sample *s) ...@@ -132,8 +132,8 @@ net_dim_sample(u16 event_ctr, u64 packets, u64 bytes, struct net_dim_sample *s)
} }
static inline void static inline void
net_dim_calc_stats(struct net_dim_sample *start, struct net_dim_sample *end, dim_calc_stats(struct net_dim_sample *start, struct net_dim_sample *end,
struct net_dim_stats *curr_stats) struct dim_stats *curr_stats)
{ {
/* u32 holds up to 71 minutes, should be enough */ /* u32 holds up to 71 minutes, should be enough */
u32 delta_us = ktime_us_delta(end->time, start->time); u32 delta_us = ktime_us_delta(end->time, start->time);
...@@ -146,7 +146,7 @@ net_dim_calc_stats(struct net_dim_sample *start, struct net_dim_sample *end, ...@@ -146,7 +146,7 @@ net_dim_calc_stats(struct net_dim_sample *start, struct net_dim_sample *end,
curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us); 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->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
curr_stats->epms = DIV_ROUND_UP(NET_DIM_NEVENTS * USEC_PER_MSEC, curr_stats->epms = DIV_ROUND_UP(DIM_NEVENTS * USEC_PER_MSEC,
delta_us); delta_us);
} }
......
include/linux/net_dim.h
View file @ 449986ea
...@@ -128,67 +128,67 @@ net_dim_get_def_tx_moderation(u8 cq_period_mode) ...@@ -128,67 +128,67 @@ net_dim_get_def_tx_moderation(u8 cq_period_mode)
static inline 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)) if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))
return NET_DIM_TOO_TIRED; return DIM_TOO_TIRED;
switch (dim->tune_state) { switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP: case DIM_PARKING_ON_TOP:
case NET_DIM_PARKING_TIRED: case DIM_PARKING_TIRED:
break; break;
case NET_DIM_GOING_RIGHT: case DIM_GOING_RIGHT:
if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1)) if (dim->profile_ix == (NET_DIM_PARAMS_NUM_PROFILES - 1))
return NET_DIM_ON_EDGE; return DIM_ON_EDGE;
dim->profile_ix++; dim->profile_ix++;
dim->steps_right++; dim->steps_right++;
break; break;
case NET_DIM_GOING_LEFT: case DIM_GOING_LEFT:
if (dim->profile_ix == 0) if (dim->profile_ix == 0)
return NET_DIM_ON_EDGE; return DIM_ON_EDGE;
dim->profile_ix--; dim->profile_ix--;
dim->steps_left++; dim->steps_left++;
break; break;
} }
dim->tired++; dim->tired++;
return NET_DIM_STEPPED; return DIM_STEPPED;
} }
static inline 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 : dim->tune_state = dim->profile_ix ? DIM_GOING_LEFT :
NET_DIM_GOING_RIGHT; DIM_GOING_RIGHT;
net_dim_step(dim); net_dim_step(dim);
} }
static inline int net_dim_stats_compare(struct net_dim_stats *curr, static inline int net_dim_stats_compare(struct dim_stats *curr,
struct net_dim_stats *prev) struct dim_stats *prev)
{ {
if (!prev->bpms) if (!prev->bpms)
return curr->bpms ? NET_DIM_STATS_BETTER : return curr->bpms ? DIM_STATS_BETTER :
NET_DIM_STATS_SAME; DIM_STATS_SAME;
if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms)) if (IS_SIGNIFICANT_DIFF(curr->bpms, prev->bpms))
return (curr->bpms > prev->bpms) ? NET_DIM_STATS_BETTER : return (curr->bpms > prev->bpms) ? DIM_STATS_BETTER :
NET_DIM_STATS_WORSE; DIM_STATS_WORSE;
if (!prev->ppms) if (!prev->ppms)
return curr->ppms ? NET_DIM_STATS_BETTER : return curr->ppms ? DIM_STATS_BETTER :
NET_DIM_STATS_SAME; DIM_STATS_SAME;
if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms)) if (IS_SIGNIFICANT_DIFF(curr->ppms, prev->ppms))
return (curr->ppms > prev->ppms) ? NET_DIM_STATS_BETTER : return (curr->ppms > prev->ppms) ? DIM_STATS_BETTER :
NET_DIM_STATS_WORSE; DIM_STATS_WORSE;
if (!prev->epms) if (!prev->epms)
return NET_DIM_STATS_SAME; return DIM_STATS_SAME;
if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms)) if (IS_SIGNIFICANT_DIFF(curr->epms, prev->epms))
return (curr->epms < prev->epms) ? NET_DIM_STATS_BETTER : return (curr->epms < prev->epms) ? DIM_STATS_BETTER :
NET_DIM_STATS_WORSE; DIM_STATS_WORSE;
return NET_DIM_STATS_SAME; return DIM_STATS_SAME;
} }
static inline bool net_dim_decision(struct net_dim_stats *curr_stats, static inline bool net_dim_decision(struct dim_stats *curr_stats,
struct net_dim *dim) struct net_dim *dim)
{ {
int prev_state = dim->tune_state; int prev_state = dim->tune_state;
...@@ -197,44 +197,44 @@ static inline bool net_dim_decision(struct net_dim_stats *curr_stats, ...@@ -197,44 +197,44 @@ static inline bool net_dim_decision(struct net_dim_stats *curr_stats,
int step_res; int step_res;
switch (dim->tune_state) { switch (dim->tune_state) {
case NET_DIM_PARKING_ON_TOP: case DIM_PARKING_ON_TOP:
stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats); stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
if (stats_res != NET_DIM_STATS_SAME) if (stats_res != DIM_STATS_SAME)
net_dim_exit_parking(dim); net_dim_exit_parking(dim);
break; break;
case NET_DIM_PARKING_TIRED: case DIM_PARKING_TIRED:
dim->tired--; dim->tired--;
if (!dim->tired) if (!dim->tired)
net_dim_exit_parking(dim); net_dim_exit_parking(dim);
break; break;
case NET_DIM_GOING_RIGHT: case DIM_GOING_RIGHT:
case NET_DIM_GOING_LEFT: case DIM_GOING_LEFT:
stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats); stats_res = net_dim_stats_compare(curr_stats, &dim->prev_stats);
if (stats_res != NET_DIM_STATS_BETTER) if (stats_res != DIM_STATS_BETTER)
net_dim_turn(dim); dim_turn(dim);
if (net_dim_on_top(dim)) { if (dim_on_top(dim)) {
net_dim_park_on_top(dim); dim_park_on_top(dim);
break; break;
} }
step_res = net_dim_step(dim); step_res = net_dim_step(dim);
switch (step_res) { switch (step_res) {
case NET_DIM_ON_EDGE: case DIM_ON_EDGE:
net_dim_park_on_top(dim); dim_park_on_top(dim);
break; break;
case NET_DIM_TOO_TIRED: case DIM_TOO_TIRED:
net_dim_park_tired(dim); dim_park_tired(dim);
break; break;
} }
break; break;
} }
if ((prev_state != NET_DIM_PARKING_ON_TOP) || if (prev_state != DIM_PARKING_ON_TOP ||
(dim->tune_state != NET_DIM_PARKING_ON_TOP)) dim->tune_state != DIM_PARKING_ON_TOP)
dim->prev_stats = *curr_stats; dim->prev_stats = *curr_stats;
return dim->profile_ix != prev_ix; return dim->profile_ix != prev_ix;
...@@ -243,7 +243,7 @@ static inline bool net_dim_decision(struct net_dim_stats *curr_stats, ...@@ -243,7 +243,7 @@ static inline bool net_dim_decision(struct net_dim_stats *curr_stats,
static inline void net_dim(struct net_dim *dim, static inline void net_dim(struct net_dim *dim,
struct net_dim_sample end_sample) struct net_dim_sample end_sample)
{ {
struct net_dim_stats curr_stats; struct dim_stats curr_stats;
u16 nevents; u16 nevents;
switch (dim->state) { switch (dim->state) {
...@@ -251,10 +251,9 @@ static inline void net_dim(struct net_dim *dim, ...@@ -251,10 +251,9 @@ static inline void net_dim(struct net_dim *dim,
nevents = BIT_GAP(BITS_PER_TYPE(u16), nevents = BIT_GAP(BITS_PER_TYPE(u16),
end_sample.event_ctr, end_sample.event_ctr,
dim->start_sample.event_ctr); dim->start_sample.event_ctr);
if (nevents < NET_DIM_NEVENTS) if (nevents < DIM_NEVENTS)
break; break;
net_dim_calc_stats(&dim->start_sample, &end_sample, dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats);
&curr_stats);
if (net_dim_decision(&curr_stats, dim)) { if (net_dim_decision(&curr_stats, dim)) {
dim->state = NET_DIM_APPLY_NEW_PROFILE; dim->state = NET_DIM_APPLY_NEW_PROFILE;
schedule_work(&dim->work); schedule_work(&dim->work);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7