Skip to content

Commit 25426b7

Browse files
hiroa-kidavem330
authored andcommitted
bql: Avoid unneeded limit decrement.
When below pattern is observed, TIME dql_queued() dql_completed() | a) initial state | | b) X bytes queued V c) Y bytes queued d) X bytes completed e) Z bytes queued f) Y bytes completed a) dql->limit has already some value and there is no in-flight packet. b) X bytes queued. c) Y bytes queued and excess limit. d) X bytes completed and dql->prev_ovlimit is set and also dql->prev_num_queued is set Y. e) Z bytes queued. f) Y bytes completed. inprogress and prev_inprogress are true. At f), according to the comment, all_prev_completed becomes true and limit should be increased. But POSDIFF() ignores (completed == dql->prev_num_queued) case, so limit is decreased. Signed-off-by: Hiroaki SHIMODA <[email protected]> Cc: Tom Herbert <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Denys Fedoryshchenko <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0cfd32b commit 25426b7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/dynamic_queue_limits.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
#include <linux/dynamic_queue_limits.h>
1212

1313
#define POSDIFF(A, B) ((int)((A) - (B)) > 0 ? (A) - (B) : 0)
14+
#define AFTER_EQ(A, B) ((int)((A) - (B)) >= 0)
1415

1516
/* Records completed count and recalculates the queue limit */
1617
void dql_completed(struct dql *dql, unsigned int count)
1718
{
1819
unsigned int inprogress, prev_inprogress, limit;
19-
unsigned int ovlimit, all_prev_completed, completed;
20+
unsigned int ovlimit, completed;
21+
bool all_prev_completed;
2022

2123
/* Can't complete more than what's in queue */
2224
BUG_ON(count > dql->num_queued - dql->num_completed);
@@ -26,7 +28,7 @@ void dql_completed(struct dql *dql, unsigned int count)
2628
ovlimit = POSDIFF(dql->num_queued - dql->num_completed, limit);
2729
inprogress = dql->num_queued - completed;
2830
prev_inprogress = dql->prev_num_queued - dql->num_completed;
29-
all_prev_completed = POSDIFF(completed, dql->prev_num_queued);
31+
all_prev_completed = AFTER_EQ(completed, dql->prev_num_queued);
3032

3133
if ((ovlimit && !inprogress) ||
3234
(dql->prev_ovlimit && all_prev_completed)) {

0 commit comments

Comments
 (0)