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

Commit 99219a3f authored by bibo,mao's avatar bibo,mao Committed by Linus Torvalds
Browse files

[PATCH] kretprobe spinlock deadlock patch 



kprobe_flush_task() possibly calls kfree function during holding
kretprobe_lock spinlock, if kfree function is probed by kretprobe that will
incur spinlock deadlock.  This patch moves kfree function out scope of
kretprobe_lock.

Signed-off-by: default avatarbibo, mao <bibo.mao@intel.com>
Signed-off-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2aa85a0

arch/i386/kernel/kprobes.c

+7 −2
Original line number Diff line number Diff line
@@ -396,11 +396,12 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
fastcall void *__kprobes trampoline_handler(struct pt_regs *regs)

{

	struct kretprobe_instance *ri = NULL;

	struct hlist_head *head;

	struct hlist_head *head, empty_rp;

	struct hlist_node *node, *tmp;

	unsigned long flags, orig_ret_address = 0;

	unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;



	INIT_HLIST_HEAD(&empty_rp);

	spin_lock_irqsave(&kretprobe_lock, flags);

	head = kretprobe_inst_table_head(current);
@@ -429,7 +430,7 @@ fastcall void *__kprobes trampoline_handler(struct pt_regs *regs) 
		}



		orig_ret_address = (unsigned long)ri->ret_addr;

		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (orig_ret_address != trampoline_address)

			/*
@@ -444,6 +445,10 @@ fastcall void *__kprobes trampoline_handler(struct pt_regs *regs) 


	spin_unlock_irqrestore(&kretprobe_lock, flags);



	hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		kfree(ri);

	}

	return (void*)orig_ret_address;

}

arch/ia64/kernel/kprobes.c

+7 −2
Original line number Diff line number Diff line
@@ -338,12 +338,13 @@ static void kretprobe_trampoline(void) 
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)

{

	struct kretprobe_instance *ri = NULL;

	struct hlist_head *head;

	struct hlist_head *head, empty_rp;

	struct hlist_node *node, *tmp;

	unsigned long flags, orig_ret_address = 0;

	unsigned long trampoline_address =

		((struct fnptr *)kretprobe_trampoline)->ip;



	INIT_HLIST_HEAD(&empty_rp);

	spin_lock_irqsave(&kretprobe_lock, flags);

	head = kretprobe_inst_table_head(current);
@@ -369,7 +370,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
			ri->rp->handler(ri, regs);



		orig_ret_address = (unsigned long)ri->ret_addr;

		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (orig_ret_address != trampoline_address)

			/*
@@ -387,6 +388,10 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
	spin_unlock_irqrestore(&kretprobe_lock, flags);

	preempt_enable_no_resched();



	hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		kfree(ri);

	}

	/*

	 * By returning a non-zero value, we are telling

	 * kprobe_handler() that we don't want the post_handler

arch/powerpc/kernel/kprobes.c

+7 −2
Original line number Diff line number Diff line
@@ -260,11 +260,12 @@ void kretprobe_trampoline_holder(void) 
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)

{

	struct kretprobe_instance *ri = NULL;

	struct hlist_head *head;

	struct hlist_head *head, empty_rp;

	struct hlist_node *node, *tmp;

	unsigned long flags, orig_ret_address = 0;

	unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;



	INIT_HLIST_HEAD(&empty_rp);

	spin_lock_irqsave(&kretprobe_lock, flags);

	head = kretprobe_inst_table_head(current);
@@ -290,7 +291,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
			ri->rp->handler(ri, regs);



		orig_ret_address = (unsigned long)ri->ret_addr;

		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (orig_ret_address != trampoline_address)

			/*
@@ -308,6 +309,10 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
	spin_unlock_irqrestore(&kretprobe_lock, flags);

	preempt_enable_no_resched();



	hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		kfree(ri);

	}

	/*

	 * By returning a non-zero value, we are telling

	 * kprobe_handler() that we don't want the post_handler

arch/s390/kernel/kprobes.c

+7 −2
Original line number Diff line number Diff line
@@ -369,11 +369,12 @@ void __kprobes kretprobe_trampoline_holder(void) 
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)

{

	struct kretprobe_instance *ri = NULL;

	struct hlist_head *head;

	struct hlist_head *head, empty_rp;

	struct hlist_node *node, *tmp;

	unsigned long flags, orig_ret_address = 0;

	unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;



	INIT_HLIST_HEAD(&empty_rp);

	spin_lock_irqsave(&kretprobe_lock, flags);

	head = kretprobe_inst_table_head(current);
@@ -399,7 +400,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
			ri->rp->handler(ri, regs);



		orig_ret_address = (unsigned long)ri->ret_addr;

		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (orig_ret_address != trampoline_address) {

			/*
@@ -417,6 +418,10 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
	spin_unlock_irqrestore(&kretprobe_lock, flags);

	preempt_enable_no_resched();



	hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		kfree(ri);

	}

	/*

	 * By returning a non-zero value, we are telling

	 * kprobe_handler() that we don't want the post_handler

arch/x86_64/kernel/kprobes.c

+7 −2
Original line number Diff line number Diff line
@@ -405,11 +405,12 @@ int __kprobes kprobe_handler(struct pt_regs *regs) 
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)

{

	struct kretprobe_instance *ri = NULL;

	struct hlist_head *head;

	struct hlist_head *head, empty_rp;

	struct hlist_node *node, *tmp;

	unsigned long flags, orig_ret_address = 0;

	unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline;



	INIT_HLIST_HEAD(&empty_rp);

	spin_lock_irqsave(&kretprobe_lock, flags);

	head = kretprobe_inst_table_head(current);
@@ -435,7 +436,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
			ri->rp->handler(ri, regs);



		orig_ret_address = (unsigned long)ri->ret_addr;

		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (orig_ret_address != trampoline_address)

			/*
@@ -453,6 +454,10 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
	spin_unlock_irqrestore(&kretprobe_lock, flags);

	preempt_enable_no_resched();



	hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		kfree(ri);

	}

	/*

	 * By returning a non-zero value, we are telling

	 * kprobe_handler() that we don't want the post_handler