c2594bc37f
rs->begin in ratelimit is set in two cases. 1) when rs->begin was not initialized 2) when rs->interval was passed For case #2, current ratelimit sets the begin to 0. This incurrs improper suppression. The begin value will be set in the next ratelimit call by 1). Then the time interval check will be always false, and rs->printed will not be initialized. Although enough time passed, ratelimit may return 0 if rs->printed is not less than rs->burst. To reset interval properly, begin should be jiffies rather than 0. For an example code below: static DEFINE_RATELIMIT_STATE(mylimit, 1, 1); for (i = 1; i <= 10; i++) { if (__ratelimit(&mylimit)) printk("ratelimit test count %d\n", i); msleep(3000); } test result in the current code shows suppression even there is 3 seconds sleep. [ 78.391148] ratelimit test count 1 [ 81.295988] ratelimit test count 2 [ 87.315981] ratelimit test count 4 [ 93.336267] ratelimit test count 6 [ 99.356031] ratelimit test count 8 [ 105.376367] ratelimit test count 10 Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
67 lines
1.5 KiB
C
67 lines
1.5 KiB
C
/*
|
|
* ratelimit.c - Do something with rate limit.
|
|
*
|
|
* Isolated from kernel/printk.c by Dave Young <hidave.darkstar@gmail.com>
|
|
*
|
|
* 2008-05-01 rewrite the function and use a ratelimit_state data struct as
|
|
* parameter. Now every user can use their own standalone ratelimit_state.
|
|
*
|
|
* This file is released under the GPLv2.
|
|
*/
|
|
|
|
#include <linux/ratelimit.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/export.h>
|
|
|
|
/*
|
|
* __ratelimit - rate limiting
|
|
* @rs: ratelimit_state data
|
|
* @func: name of calling function
|
|
*
|
|
* This enforces a rate limit: not more than @rs->burst callbacks
|
|
* in every @rs->interval
|
|
*
|
|
* RETURNS:
|
|
* 0 means callbacks will be suppressed.
|
|
* 1 means go ahead and do it.
|
|
*/
|
|
int ___ratelimit(struct ratelimit_state *rs, const char *func)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
if (!rs->interval)
|
|
return 1;
|
|
|
|
/*
|
|
* If we contend on this state's lock then almost
|
|
* by definition we are too busy to print a message,
|
|
* in addition to the one that will be printed by
|
|
* the entity that is holding the lock already:
|
|
*/
|
|
if (!raw_spin_trylock_irqsave(&rs->lock, flags))
|
|
return 0;
|
|
|
|
if (!rs->begin)
|
|
rs->begin = jiffies;
|
|
|
|
if (time_is_before_jiffies(rs->begin + rs->interval)) {
|
|
if (rs->missed)
|
|
printk(KERN_WARNING "%s: %d callbacks suppressed\n",
|
|
func, rs->missed);
|
|
rs->begin = jiffies;
|
|
rs->printed = 0;
|
|
rs->missed = 0;
|
|
}
|
|
if (rs->burst && rs->burst > rs->printed) {
|
|
rs->printed++;
|
|
ret = 1;
|
|
} else {
|
|
rs->missed++;
|
|
ret = 0;
|
|
}
|
|
raw_spin_unlock_irqrestore(&rs->lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(___ratelimit);
|