CVS commit: pkgsrc/sysutils/xenkernel418

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue May 27 17:22:17 UTC 2025

Modified Files:
        pkgsrc/sysutils/xenkernel418: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xenkernel418/patches: patch-xen_arch_x86_traps.c

Log Message:
Add upstream patch fixing dr6 handling; making the atf dbregs_* tests
pass again on xen PV guests
bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xenkernel418/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xenkernel418/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_traps.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xenkernel418/Makefile
diff -u pkgsrc/sysutils/xenkernel418/Makefile:1.3 pkgsrc/sysutils/xenkernel418/Makefile:1.4
--- pkgsrc/sysutils/xenkernel418/Makefile:1.3   Sat Dec 21 16:01:47 2024
+++ pkgsrc/sysutils/xenkernel418/Makefile       Tue May 27 17:22:16 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2024/12/21 16:01:47 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2025/05/27 17:22:16 bouyer Exp $
 # VERSION is set in version.mk as it is shared with other packages
-#PKGREVISION=        1
+PKGREVISION=        1
 
 XENKERNEL:=
 .include        "../../sysutils/xentools418/version.mk"

Index: pkgsrc/sysutils/xenkernel418/distinfo
diff -u pkgsrc/sysutils/xenkernel418/distinfo:1.6 pkgsrc/sysutils/xenkernel418/distinfo:1.7
--- pkgsrc/sysutils/xenkernel418/distinfo:1.6   Thu May 22 14:14:37 2025
+++ pkgsrc/sysutils/xenkernel418/distinfo       Tue May 27 17:22:16 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2025/05/22 14:14:37 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2025/05/27 17:22:16 bouyer Exp $
 
 BLAKE2s (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = 8d81589710484a72bf576abf9328ec50b490f4bf8254efa19531809ad8fc8a8c
 SHA512 (xen418/xen-0b8f769d00bcfcda65d9f6d0729cfdc6cb336d12.tar.gz) = e22c205b553f57da08f1916edb8f334c0b11984be0fe270f1a19bfabe60b9ff95e918eebaaf4ca2fa62c97b73b37568e6a7a455c7077da5a8475c4c5170ab113
@@ -10,4 +10,5 @@ SHA1 (patch-xen_arch_x86_Rules.mk) = b0b
 SHA1 (patch-xen_arch_x86_boot_build32.lds) = 9157f22876085254844f720853761a2cd0f4876e
 SHA1 (patch-xen_arch_x86_extable.c) = f64b956be1167901a60bf9be1abd98dbfaffb100
 SHA1 (patch-xen_arch_x86_mm_p2m.c) = 6e9b84dc8448eca9677f184e720bbfcb3c6d314e
+SHA1 (patch-xen_arch_x86_traps.c) = 9548d6476e2fb5898d2958c10eaf2fd1e424d9c5
 SHA1 (patch-xen_tools_check-endbr.sh) = a7268ee5ff11f21fdc5b0bc213498a1923b693be

Added files:

Index: pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_traps.c
diff -u /dev/null pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_traps.c:1.1
--- /dev/null   Tue May 27 17:22:17 2025
+++ pkgsrc/sysutils/xenkernel418/patches/patch-xen_arch_x86_traps.c     Tue May 27 17:22:17 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-xen_arch_x86_traps.c,v 1.1 2025/05/27 17:22:17 bouyer Exp $
+
+Pull in upstream commit d965e2ee07c56c341d8896852550914d87ea5374
+ x86/pv: Fix breakpoint reporting
+
+ x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the
+ previously latched breakpoint bits.
+
+ The combination of do_debug()'s manual call to x86_merge_dr6() for external
+ debuggers, and pv_inject_DB() calling pv_inject_event(), results in two
+ x86_merge_dr6() calls.
+
+ Feed the same pending_dbg in the second time.  This makes pv_inject_event()'s
+ update of dr6 effectively a no-op, retaining the correct breakpoint bits.
+
+--- xen/arch/x86/traps.c.orig  2025-05-26 22:44:28.709656168 +0200
++++ xen/arch/x86/traps.c       2025-05-26 22:45:24.128811203 +0200
+@@ -2064,7 +2064,7 @@
+         return;
+     }
+ 
+-    pv_inject_DB(0 /* N/A, already merged */);
++    pv_inject_DB(dr6 ^ X86_DR6_DEFAULT);
+ }
+ 
+ /* SAF-1-safe */