Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979f693d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

ratelimit: Use per ratelimit context locking 



I'd like to use printk_ratelimit() in atomic context, but that's
not possible right now due to the spinlock usage this commit
introduced more than a year ago:

  717115e1: printk ratelimiting rewrite

As a first step push the lock into the ratelimit state structure.
This allows us to deal with locking failures to be considered as an
event related to that state being too busy.

Also clean up the code a bit (without changing functionality):

 - tidy up the definitions

 - clean up the code flow

This also shrinks the code a tiny bit:

   text	   data	    bss	    dec	    hex	filename
    264	      0	      4	    268	    10c	ratelimit.o.before
    255	      0	      0	    255	     ff	ratelimit.o.after

( Whole-kernel data size got a bit larger, because we have
  two ratelimit-state data structures right now. )

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David S. Miller <davem@davemloft.net>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b8c7f1dc

include/linux/ratelimit.h

+20 −10
Original line number Diff line number Diff line 
#ifndef _LINUX_RATELIMIT_H

#define _LINUX_RATELIMIT_H



#include <linux/param.h>

#include <linux/spinlock_types.h>



#define DEFAULT_RATELIMIT_INTERVAL	(5 * HZ)

#define DEFAULT_RATELIMIT_BURST		10



struct ratelimit_state {

	spinlock_t	lock;		/* protect the state */



	int		interval;

	int		burst;

	int		printed;
@@ -13,8 +17,14 @@ struct ratelimit_state { 
	unsigned long	begin;

};



#define DEFINE_RATELIMIT_STATE(name, interval, burst)		\

		struct ratelimit_state name = {interval, burst,}

#define DEFINE_RATELIMIT_STATE(name, interval_init, burst_init)		\

									\

	struct ratelimit_state name = {					\

		.lock		= __SPIN_LOCK_UNLOCKED(name.lock),	\

		.interval	= interval_init,			\

		.burst		= burst_init,				\

	}



extern int __ratelimit(struct ratelimit_state *rs);

#endif
 


#endif /* _LINUX_RATELIMIT_H */

lib/ratelimit.c

+13 −16
Original line number Diff line number Diff line
@@ -7,15 +7,12 @@ 
 * parameter. Now every user can use their own standalone ratelimit_state.

 *

 * This file is released under the GPLv2.

 *

 */



#include <linux/kernel.h>

#include <linux/jiffies.h>

#include <linux/module.h>



static DEFINE_SPINLOCK(ratelimit_lock);



/*

 * __ratelimit - rate limiting

 * @rs: ratelimit_state data
@@ -26,11 +23,12 @@ static DEFINE_SPINLOCK(ratelimit_lock); 
int __ratelimit(struct ratelimit_state *rs)

{

	unsigned long flags;

	int ret;



	if (!rs->interval)

		return 1;



	spin_lock_irqsave(&ratelimit_lock, flags);

	spin_lock_irqsave(&rs->lock, flags);

	if (!rs->begin)

		rs->begin = jiffies;
@@ -42,16 +40,15 @@ int __ratelimit(struct ratelimit_state *rs) 
		rs->printed = 0;

		rs->missed  = 0;

	}

	if (rs->burst && rs->burst > rs->printed)

		goto print;



	if (rs->burst && rs->burst > rs->printed) {

		rs->printed++;

		ret = 1;

	} else {

		rs->missed++;

	spin_unlock_irqrestore(&ratelimit_lock, flags);

	return 0;

		ret = 0;

	}

	spin_unlock_irqrestore(&rs->lock, flags);



print:

	rs->printed++;

	spin_unlock_irqrestore(&ratelimit_lock, flags);

	return 1;

	return ret;

}

EXPORT_SYMBOL(__ratelimit);