Skip to contentSkip to conversation

Tweak to the function return probe design

PATCH Ananth N Mavinakayanahalli 1 participant 1 message Jun 13, 2005 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

[email protected] wrote:

Hi Rusty,

Thanks for doing this. However...

Quoted 8 lines
(quoted diff) +8 -0
+
+		orig_ret_address = (unsigned long)ri->ret_addr;
+		recycle_rp_inst(ri);
+
+		if (orig_ret_address != (unsigned long) &kretprobe_trampoline)
+			/*
+			 * This is the real return address. Any other
+			 * instances associated with this task are for

Review

Quoted 10 lines
(quoted diff) +10 -0
+			 * other calls deeper on the call stack
+			 */
+			break;
+	}
+
+	BUG_ON(!orig_ret_address);
+	regs->nip = orig_ret_address;
+
+	unlock_kprobes();
+	preempt_enable_no_resched();
         ^^^^^^^

We don't need this here - on ppc64, we do a preempt_disable/enable in kprobe_exceptions_notify() and so this will cause a spurious preempt_enable().

Thanks,
Ananth