Blame SOURCES/gdb-rhbz1854784-powerpc-remove-region-limit-dawr-6of7.patch

599b31
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
599b31
From: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
599b31
Date: Wed, 7 Jul 2021 19:05:04 -0400
599b31
Subject: gdb-rhbz1854784-powerpc-remove-region-limit-dawr-6of7.patch
599b31
599b31
;; Backport "[PowerPC] Always clear watchpoint with PTRACE_SET_DEBUGREG"
599b31
;; (Pedro Franco de Carvalho, RH BZ 1854784)
599b31
599b31
This patches changes low_prepare_to_resume in the ppc linux native target
599b31
to always clear the watchpoint when the old PTRACE_SET_DEBUGREG interface
599b31
is used, even if another watchpoint GDB requested to the target is
599b31
written right after using the same call.
599b31
599b31
The reason for this is that there were some older kernel versions for
599b31
which overwriting a watchpoint with PTRACE_SET_DEBUGREG would not
599b31
re-activate the watchpoint if it was previouly disabled following a hit.
599b31
This happened when the kernel was configured with CONFIG_HW_BREAKPOINT on
599b31
and uses perf events to install watchpoints.
599b31
599b31
Previously, the ppc linux native target would immediately remove or
599b31
insert watchpoints following a request from the upper layers.  This was
599b31
changed in commit 227c0bf4b3dd0cf65dceb58e729e9da81b38b5a7 to fix other
599b31
issues, which caused watchpoint requests to be applied to the inferior
599b31
only in low_prepare_to_resume, right before the inferior is resumed.
599b31
599b31
Usually, but maybe not always, after a hit, GDB will remove the
599b31
watchpoint, resume the inferior for a single-step, possibly report the
599b31
watchpoint hit to the user, and then re-insert the watchpoint before the
599b31
inferior is next resumed.  In this case there would be no problems, but
599b31
since I can't guarantee that there aren't other paths in GDB that allow
599b31
the user to set a new watchpoint after the first one hit, and after its
599b31
deletion by GDB, but before the inferior is resumed, there is a chance
599b31
that PTRACE_SET_DEBUGREG could be called directly without the watchpoint
599b31
first having been cleared, which could cause a false negative with the
599b31
older kernel versions.
599b31
599b31
This issue would affect kernel versions starting from this commit:
599b31
599b31
5aae8a53708025d4e718f0d2e7c2f766779ddc71
599b31
599b31
Up to the fix in this commit:
599b31
599b31
a53fd61ac2f411745471c1c877d5e072fbbf0e5c
599b31
599b31
gdb/ChangeLog:
599b31
599b31
	PR breakpoints/26385
599b31
	* ppc-linux-nat.c (ppc_linux_nat_target::low_prepare_to_resume):
599b31
	Always clear watchpoint with PTRACE_SET_DEBUGREG.
599b31
599b31
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
599b31
--- a/gdb/ppc-linux-nat.c
599b31
+++ b/gdb/ppc-linux-nat.c
599b31
@@ -2922,20 +2922,23 @@ ppc_linux_nat_target::low_prepare_to_resume (struct lwp_info *lp)
599b31
     {
599b31
       gdb_assert (m_dreg_interface.debugreg_p ());
599b31
 
599b31
-      /* Passing 0 to PTRACE_SET_DEBUGREG will clear the
599b31
-	 watchpoint.  */
599b31
-      long wp = 0;
599b31
+      /* Passing 0 to PTRACE_SET_DEBUGREG will clear the watchpoint.  We
599b31
+	 always clear the watchpoint instead of just overwriting it, in
599b31
+	 case there is a request for a new watchpoint, because on some
599b31
+	 older kernel versions and configurations simply overwriting the
599b31
+	 watchpoint after it was hit would not re-enable it.  */
599b31
+      if (ptrace (PTRACE_SET_DEBUGREG, lp->ptid.lwp (), 0, 0) < 0)
599b31
+	perror_with_name (_("Error clearing hardware watchpoint"));
599b31
 
599b31
       /* GDB requested a watchpoint to be installed.  */
599b31
       if (process_it != m_process_info.end ()
599b31
 	  && process_it->second.requested_wp_val.has_value ())
599b31
-	wp = *(process_it->second.requested_wp_val);
599b31
-
599b31
-      long ret = ptrace (PTRACE_SET_DEBUGREG, lp->ptid.lwp (),
599b31
-			 0, wp);
599b31
+	{
599b31
+	  long wp = *(process_it->second.requested_wp_val);
599b31
 
599b31
-      if (ret < 0)
599b31
-	perror_with_name (_("Error setting hardware watchpoint"));
599b31
+	  if (ptrace (PTRACE_SET_DEBUGREG, lp->ptid.lwp (), 0, wp) < 0)
599b31
+	    perror_with_name (_("Error setting hardware watchpoint"));
599b31
+	}
599b31
     }
599b31
 
599b31
   lp_arch_info->debug_regs_stale = false;