Skip to contentSkip to conversation

arm64: hw_breakpoint: use target state to determine ABI behaviour

PATCH New Will Deacon 2 participants 4 messages Sep 15, 2015 – Sep 16, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: hw_breakpoint: use target state to determine ABI behaviour

The arm64 hw_breakpoint interface is slightly less flexible than its 32-bit counterpart, thanks to some changes in the architecture rendering unaligned watchpoint addresses obselete for AArch64.

However, in a multi-arch environment (i.e. debugging a 32-bit target with a 64-bit GDB under a 64-bit kernel), we need to provide a feature compatible interface to GDB in order for debugging to function correctly.

This patch adds a new helper, is_compat_bp, to our hw_breakpoint implementation which changes the interface behaviour based on the architecture of the debug target as opposed to the debugger itself. This allows debugged to function as expected for multi-arch configurations without relying on deprecated architectural behaviours when debugging native applications.

Cc Yao Qi <[email protected]>
Cc Catalin Marinas <[email protected]>
---
 arch/arm64/kernel/hw_breakpoint.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm64/kernel/hw_breakpoint.c +8 -2
index bba85c8f8037..2926c3dd6479 100644
@@ -163,6 +163,12 @@ enum hw_breakpoint_ops {
 	HW_BREAKPOINT_RESTORE
 };
 
+static int is_compat_bp(struct perf_event *bp)
+{
+	struct task_struct *tsk = bp->hw.target;
+	return tsk && is_compat_thread(task_thread_info(tsk));
+}
+
 /**
  * hw_breakpoint_slot_setup - Find and setup a perf slot according to
  *			      operations
@@ -420,7 +426,7 @@ static int arch_build_bp_info(struct perf_event *bp)
 	 * Watchpoints can be of length 1, 2, 4 or 8 bytes.
 	 */
 	if (info->ctrl.type == ARM_BREAKPOINT_EXECUTE) {
-		if (is_compat_task()) {
+		if (is_compat_bp(bp)) {
 			if (info->ctrl.len != ARM_BREAKPOINT_LEN_2 &&
 			    info->ctrl.len != ARM_BREAKPOINT_LEN_4)
 				return -EINVAL;
@@ -477,7 +483,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
 	 * AArch32 tasks expect some simple alignment fixups, so emulate
 	 * that here.
 	 */
-	if (is_compat_task()) {
+	if (is_compat_bp(bp)) {
 		if (info->ctrl.len == ARM_BREAKPOINT_LEN_8)
 			alignment_mask = 0x7;
 		else
Signature · 1 line
2.1.4
maintainer
#1 lore raw

PATCH 1/1 arm64: hw_breakpoint: use target state to determine ABI behaviour

arch/arm64/kernel/hw_breakpoint.c enum hw_breakpoint_ops { · line 170

Quoted 13 lines · Will Deacon
arch/arm64/kernel/hw_breakpoint.c +5 -0
index bba85c8f8037..2926c3dd6479 100644
@@ -163,6 +163,12 @@ enum hw_breakpoint_ops {
 	HW_BREAKPOINT_RESTORE
 };
 
+static int is_compat_bp(struct perf_event *bp)
+{
+	struct task_struct *tsk = bp->hw.target;
+	return tsk && is_compat_thread(task_thread_info(tsk));
+}

What are the conditions for tsk == NULL?

Signature · 1 line
Catalin
#2 lore raw

PATCH 1/1 arm64: hw_breakpoint: use target state to determine ABI behaviour

Quoted 9 lines · Catalin Marinas
Quoted 8 lines · Will Deacon
arch/arm64/kernel/hw_breakpoint.c +0 -0
index bba85c8f8037..2926c3dd6479 100644
@@ -163,6 +163,12 @@ enum hw_breakpoint_ops {
 	HW_BREAKPOINT_RESTORE
 };
 
Quoted 7 lines

arch/arm64/kernel/hw_breakpoint.c enum hw_breakpoint_ops { · line 170

Quoted 5 lines
arch/arm64/kernel/hw_breakpoint.c +5 -0
+static int is_compat_bp(struct perf_event *bp)
+{
+	struct task_struct *tsk = bp->hw.target;
+	return tsk && is_compat_thread(task_thread_info(tsk));
+}

What are the conditions for tsk == NULL?

If you create a per-cpu breakpoint (i.e. a breakpoint that isn't affine to a task), then the target is NULL. These can only be created by the perf_event_open syscall, not from ptrace.

Will

maintainer
#3 lore raw

PATCH 1/1 arm64: hw_breakpoint: use target state to determine ABI behaviour

Quoted 18 lines · Will Deacon
Quoted 9 lines · Catalin Marinas
Quoted 8 lines · Will Deacon
arch/arm64/kernel/hw_breakpoint.c +0 -0
index bba85c8f8037..2926c3dd6479 100644
@@ -163,6 +163,12 @@ enum hw_breakpoint_ops {
 	HW_BREAKPOINT_RESTORE
 };
 
Quoted 7 lines

arch/arm64/kernel/hw_breakpoint.c enum hw_breakpoint_ops { · line 170

Quoted 5 lines
arch/arm64/kernel/hw_breakpoint.c +5 -0
+static int is_compat_bp(struct perf_event *bp)
+{
+	struct task_struct *tsk = bp->hw.target;
+	return tsk && is_compat_thread(task_thread_info(tsk));
+}

What are the conditions for tsk == NULL?

Quoted 3 lines

If you create a per-cpu breakpoint (i.e. a breakpoint that isn't affine to a task), then the target is NULL. These can only be created by the perf_event_open syscall, not from ptrace.

OK, so can sys_perf_event_open() be called from a compat task? If that's the case, is_compat_bp() should do:

	if (tsk)
		return is_compat_thread(task_thread_info(tsk));
	else
		return is_compat_task();

and a comment on why this is (not) needed. Your patch changes the current code behaviour when tsk == NULL.

Signature · 1 line
Catalin