Commit 86e4ca66 authored by David S. Miller's avatar David S. Miller
Browse files

bug.h: Move ratelimit warn interfaces to ratelimit.h 



As reported by Ingo Molnar, we still have configuration combinations
where use of the WARN_RATELIMIT interfaces break the build because
dependencies don't get met.

Instead of going down the long road of trying to make it so that
ratelimit.h can get included by kernel.h or asm-generic/bug.h,
just move the interface into ratelimit.h and make users have
to include that.

Reported-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
parent 90e62474

include/asm-generic/bug.h

+0 −40
Original line number Diff line number Diff line
@@ -162,46 +162,6 @@ extern void warn_slowpath_null(const char *file, const int line); 
	unlikely(__ret_warn_once);				\

})



#ifdef CONFIG_PRINTK



#define WARN_ON_RATELIMIT(condition, state)			\

		WARN_ON((condition) && __ratelimit(state))



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = 0;						\

	if (unlikely(__ratelimit(state)))			\

		rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	static DEFINE_RATELIMIT_STATE(_rs,			\

				      DEFAULT_RATELIMIT_INTERVAL,	\

				      DEFAULT_RATELIMIT_BURST);	\

	__WARN_RATELIMIT(condition, &_rs, format);		\

})



#else



#define WARN_ON_RATELIMIT(condition, state)			\

	WARN_ON(condition)



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#endif



/*

 * WARN_ON_SMP() is for cases that the warning is either

 * meaningless for !SMP or may even cause failures.

include/linux/ratelimit.h

+40 −0
Original line number Diff line number Diff line
@@ -41,4 +41,44 @@ extern struct ratelimit_state printk_ratelimit_state; 
extern int ___ratelimit(struct ratelimit_state *rs, const char *func);

#define __ratelimit(state) ___ratelimit(state, __func__)



#ifdef CONFIG_PRINTK



#define WARN_ON_RATELIMIT(condition, state)			\

		WARN_ON((condition) && __ratelimit(state))



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = 0;						\

	if (unlikely(__ratelimit(state)))			\

		rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	static DEFINE_RATELIMIT_STATE(_rs,			\

				      DEFAULT_RATELIMIT_INTERVAL,	\

				      DEFAULT_RATELIMIT_BURST);	\

	__WARN_RATELIMIT(condition, &_rs, format);		\

})



#else



#define WARN_ON_RATELIMIT(condition, state)			\

	WARN_ON(condition)



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#endif



#endif /* _LINUX_RATELIMIT_H */

net/core/filter.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/unaligned.h>

#include <linux/filter.h>

#include <linux/reciprocal_div.h>

#include <linux/ratelimit.h>



/* No hurry in this branch */

static void *__load_pointer(const struct sk_buff *skb, int k, unsigned int size)

CRA Git | Maintained and supported by SUSTech CRA and CCSE