public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "bibo,mao" <bibo.mao@intel.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
	Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
	"Keshavamurthy, Anil S" <anil.s.keshavamurthy@intel.com>,
	Prasanna S Panchamukhi <prasanna@in.ibm.com>,
	Masami Hiramatsu <hiramatu@sdl.hitachi.co.jp>
Subject: [PATCH] kretprobe spinlock recursive remove
Date: Tue, 21 Mar 2006 17:52:56 +0800	[thread overview]
Message-ID: <441FCCF8.1060300@intel.com> (raw)

In recent linux kernel version, kretprobe in IA32 is implemented in 
kretprobe_trampoline. And break trap code is removed from 
retprobe_trampoline, instead trampoline_handler is called directly. 
Currently if kretprobe hander hit one trap which causes another 
kretprobe, there will be SPINLOCK recursive bug. This patch fixes this, 
and will skip trap during kretprobe handler execution. This patch is 
based on 2.6.16-rc6-mm2.

--- arch/i386/kernel/kprobes.c.bak	2006-03-21 10:35:34.000000000 +0800
+++ arch/i386/kernel/kprobes.c	2006-03-21 10:37:44.000000000 +0800
@@ -390,8 +390,11 @@ fastcall void *__kprobes trampoline_hand
  			/* another task is sharing our hash bucket */
                          continue;

-		if (ri->rp && ri->rp->handler)
+		if (ri->rp && ri->rp->handler){
+			__get_cpu_var(current_kprobe) = &ri->rp->kp;
  			ri->rp->handler(ri, regs);
+			__get_cpu_var(current_kprobe) = NULL;
+		}

  		orig_ret_address = (unsigned long)ri->ret_addr;
  		recycle_rp_inst(ri);

             reply	other threads:[~2006-03-21 10:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-21  9:52 bibo,mao [this message]
2006-03-21 10:14 ` [PATCH] kretprobe spinlock recursive remove Andrew Morton
2006-03-21 11:19   ` bibo,mao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=441FCCF8.1060300@intel.com \
    --to=bibo.mao@intel.com \
    --cc=akpm@osdl.org \
    --cc=ananth@in.ibm.com \
    --cc=anil.s.keshavamurthy@intel.com \
    --cc=hiramatu@sdl.hitachi.co.jp \
    --cc=linux-kernel@vger.kernel.org \
    --cc=prasanna@in.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox