redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: hns3: change the time interval of int_gl calculating 

Since we change the update rate of int_gl from every interrupt to every
one hundred interrupts, the old way to get time interval by int_gl value
is not accurate. This patch calculates the time interval using the jiffies
value.

Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Fuyun Liang 2018-03-21 15:49:26 +08:00 committed by David S. Miller
parent cd9d187b07
commit a95e1f8666
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -2406,15 +2406,15 @@ out:
static bool hns3_get_new_int_gl(struct hns3_enet_ring_group *ring_group) static bool hns3_get_new_int_gl(struct hns3_enet_ring_group *ring_group)
{ {
#define HNS3_RX_ULTRA_PACKET_RATE 40000 struct hns3_enet_tqp_vector *tqp_vector =
ring_group->ring->tqp_vector;
enum hns3_flow_level_range new_flow_level; enum hns3_flow_level_range new_flow_level;
struct hns3_enet_tqp_vector *tqp_vector; int packets_per_msecs;
int packets_per_secs; int bytes_per_msecs;
int bytes_per_usecs; u32 time_passed_ms;
u16 new_int_gl; u16 new_int_gl;
int usecs;
if (!ring_group->coal.int_gl) if (!ring_group->coal.int_gl || !tqp_vector->last_jiffies)
return false; return false;
if (ring_group->total_packets == 0) { if (ring_group->total_packets == 0) {
@ -2431,33 +2431,44 @@ static bool hns3_get_new_int_gl(struct hns3_enet_ring_group *ring_group)
*/ */
new_flow_level = ring_group->coal.flow_level; new_flow_level = ring_group->coal.flow_level;
new_int_gl = ring_group->coal.int_gl; new_int_gl = ring_group->coal.int_gl;
tqp_vector = ring_group->ring->tqp_vector; time_passed_ms =
usecs = (ring_group->coal.int_gl << 1); jiffies_to_msecs(jiffies - tqp_vector->last_jiffies);
bytes_per_usecs = ring_group->total_bytes / usecs;
/* 1000000 microseconds */ if (!time_passed_ms)
packets_per_secs = ring_group->total_packets * 1000000 / usecs; return false;
do_div(ring_group->total_packets, time_passed_ms);
packets_per_msecs = ring_group->total_packets;
do_div(ring_group->total_bytes, time_passed_ms);
bytes_per_msecs = ring_group->total_bytes;
#define HNS3_RX_LOW_BYTE_RATE 10000
#define HNS3_RX_MID_BYTE_RATE 20000
switch (new_flow_level) { switch (new_flow_level) {
case HNS3_FLOW_LOW: case HNS3_FLOW_LOW:
if (bytes_per_usecs > 10) if (bytes_per_msecs > HNS3_RX_LOW_BYTE_RATE)
new_flow_level = HNS3_FLOW_MID; new_flow_level = HNS3_FLOW_MID;
break; break;
case HNS3_FLOW_MID: case HNS3_FLOW_MID:
if (bytes_per_usecs > 20) if (bytes_per_msecs > HNS3_RX_MID_BYTE_RATE)
new_flow_level = HNS3_FLOW_HIGH; new_flow_level = HNS3_FLOW_HIGH;
else if (bytes_per_usecs <= 10) else if (bytes_per_msecs <= HNS3_RX_LOW_BYTE_RATE)
new_flow_level = HNS3_FLOW_LOW; new_flow_level = HNS3_FLOW_LOW;
break; break;
case HNS3_FLOW_HIGH: case HNS3_FLOW_HIGH:
case HNS3_FLOW_ULTRA: case HNS3_FLOW_ULTRA:
default: default:
if (bytes_per_usecs <= 20) if (bytes_per_msecs <= HNS3_RX_MID_BYTE_RATE)
new_flow_level = HNS3_FLOW_MID; new_flow_level = HNS3_FLOW_MID;
break; break;
} }
if ((packets_per_secs > HNS3_RX_ULTRA_PACKET_RATE) && #define HNS3_RX_ULTRA_PACKET_RATE 40
(&tqp_vector->rx_group == ring_group))
if (packets_per_msecs > HNS3_RX_ULTRA_PACKET_RATE &&
&tqp_vector->rx_group == ring_group)
new_flow_level = HNS3_FLOW_ULTRA; new_flow_level = HNS3_FLOW_ULTRA;
switch (new_flow_level) { switch (new_flow_level) {
@ -2512,6 +2523,7 @@ static void hns3_update_new_int_gl(struct hns3_enet_tqp_vector *tqp_vector)
tx_group->coal.int_gl); tx_group->coal.int_gl);
} }
tqp_vector->last_jiffies = jiffies;
tqp_vector->int_adapt_down = HNS3_INT_ADAPT_DOWN_START; tqp_vector->int_adapt_down = HNS3_INT_ADAPT_DOWN_START;
} }

1
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
View File

@ -499,6 +499,7 @@ struct hns3_enet_tqp_vector {
/* when 0 should adjust interrupt coalesce parameter */ /* when 0 should adjust interrupt coalesce parameter */
u8 int_adapt_down; u8 int_adapt_down;
unsigned long last_jiffies;
} ____cacheline_internodealigned_in_smp; } ____cacheline_internodealigned_in_smp;
enum hns3_udp_tnl_type { enum hns3_udp_tnl_type {