Commit 851cf6e7 authored by Andrew Jones's avatar Andrew Jones Committed by H. Peter Anvin
Browse files

jump_label: Split jumplabel ratelimit 



Commit b2029520 ("perf, core: Rate limit
perf_sched_events jump_label patching") introduced rate limiting
for jump label disabling. The changes were made in the jump label code
in order to be more widely available and to keep things tidier. This is
all fine, except now jump_label.h includes linux/workqueue.h, which
makes it impossible to include jump_label.h from anything that
workqueue.h needs. For example, it's now impossible to include
jump_label.h from asm/spinlock.h, which is done in proposed
pv-ticketlock patches. This patch splits out the rate limiting related
changes from jump_label.h into a new file, jump_label_ratelimit.h, to
resolve the issue.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Link: http://lkml.kernel.org/r/1376058122-8248-10-git-send-email-raghavendra.kt@linux.vnet.ibm.com


Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarRaghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 4a1ed4ca

include/linux/jump_label.h

+1 −27
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 


#include <linux/types.h>

#include <linux/compiler.h>

#include <linux/workqueue.h>



#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
@@ -61,12 +60,6 @@ struct static_key { 
#endif

};



struct static_key_deferred {

	struct static_key key;

	unsigned long timeout;

	struct delayed_work work;

};



# include <asm/jump_label.h>

# define HAVE_JUMP_LABEL

#endif	/* CC_HAVE_ASM_GOTO && CONFIG_JUMP_LABEL */
@@ -78,6 +71,7 @@ enum jump_label_type { 


struct module;



#include <linux/atomic.h>

#ifdef HAVE_JUMP_LABEL



#define JUMP_LABEL_TRUE_BRANCH 1UL
@@ -119,10 +113,7 @@ extern void arch_jump_label_transform_static(struct jump_entry *entry, 
extern int jump_label_text_reserved(void *start, void *end);

extern void static_key_slow_inc(struct static_key *key);

extern void static_key_slow_dec(struct static_key *key);

extern void static_key_slow_dec_deferred(struct static_key_deferred *key);

extern void jump_label_apply_nops(struct module *mod);

extern void

jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);



#define STATIC_KEY_INIT_TRUE ((struct static_key) \

	{ .enabled = ATOMIC_INIT(1), .entries = (void *)1 })
@@ -131,8 +122,6 @@ jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl); 


#else  /* !HAVE_JUMP_LABEL */



#include <linux/atomic.h>



struct static_key {

	atomic_t enabled;

};
@@ -141,10 +130,6 @@ static __always_inline void jump_label_init(void) 
{

}



struct static_key_deferred {

	struct static_key  key;

};



static __always_inline bool static_key_false(struct static_key *key)

{

	if (unlikely(atomic_read(&key->enabled)) > 0)
@@ -169,11 +154,6 @@ static inline void static_key_slow_dec(struct static_key *key) 
	atomic_dec(&key->enabled);

}



static inline void static_key_slow_dec_deferred(struct static_key_deferred *key)

{

	static_key_slow_dec(&key->key);

}



static inline int jump_label_text_reserved(void *start, void *end)

{

	return 0;
@@ -187,12 +167,6 @@ static inline int jump_label_apply_nops(struct module *mod) 
	return 0;

}



static inline void

jump_label_rate_limit(struct static_key_deferred *key,

		unsigned long rl)

{

}



#define STATIC_KEY_INIT_TRUE ((struct static_key) \

		{ .enabled = ATOMIC_INIT(1) })

#define STATIC_KEY_INIT_FALSE ((struct static_key) \

include/linux/jump_label_ratelimit.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_JUMP_LABEL_RATELIMIT_H

#define _LINUX_JUMP_LABEL_RATELIMIT_H



#include <linux/jump_label.h>

#include <linux/workqueue.h>



#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)

struct static_key_deferred {

	struct static_key key;

	unsigned long timeout;

	struct delayed_work work;

};

#endif



#ifdef HAVE_JUMP_LABEL

extern void static_key_slow_dec_deferred(struct static_key_deferred *key);

extern void

jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);



#else	/* !HAVE_JUMP_LABEL */

struct static_key_deferred {

	struct static_key  key;

};

static inline void static_key_slow_dec_deferred(struct static_key_deferred *key)

{

	static_key_slow_dec(&key->key);

}

static inline void

jump_label_rate_limit(struct static_key_deferred *key,

		unsigned long rl)

{

}

#endif	/* HAVE_JUMP_LABEL */

#endif	/* _LINUX_JUMP_LABEL_RATELIMIT_H */

include/linux/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct perf_guest_info_callbacks { 
#include <linux/cpu.h>

#include <linux/irq_work.h>

#include <linux/static_key.h>

#include <linux/jump_label_ratelimit.h>

#include <linux/atomic.h>

#include <linux/sysfs.h>

#include <linux/perf_regs.h>

kernel/jump_label.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/sort.h>

#include <linux/err.h>

#include <linux/static_key.h>

#include <linux/jump_label_ratelimit.h>



#ifdef HAVE_JUMP_LABEL

CRA Git | Maintained and supported by SUSTech CRA and CCSE