CVS commit: pkgsrc/sysutils/xentools418

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Thu May 29 12:16:56 UTC 2025

Modified Files:
        pkgsrc/sysutils/xentools418: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xentools418/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
Note: this is needed on xentools, in addition to xenkernel, for the
pvshim kernel


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xentools418/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools418/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/xentools418/Makefile
diff -u pkgsrc/sysutils/xentools418/Makefile:1.6 pkgsrc/sysutils/xentools418/Makefile:1.7
--- pkgsrc/sysutils/xentools418/Makefile:1.6    Tue Sep 10 12:40:14 2024
+++ pkgsrc/sysutils/xentools418/Makefile        Thu May 29 12:16:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2024/09/10 12:40:14 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 2025/05/29 12:16:56 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
-#PKGREVISION=        1
+PKGREVISION=        1
 .include        "version.mk"
 PKGNAME=               xentools418-${VERSION:S/-//g}
 

Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.7 pkgsrc/sysutils/xentools418/distinfo:1.8
--- pkgsrc/sysutils/xentools418/distinfo:1.7    Thu May 22 14:14:37 2025
+++ pkgsrc/sysutils/xentools418/distinfo        Thu May 29 12:16:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2025/05/22 14:14:37 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2025/05/29 12:16:56 bouyer Exp $
 
 BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
@@ -66,5 +66,6 @@ SHA1 (patch-tools_qemu-xen_net_tap.c) = 
 SHA1 (patch-tools_xenpaging_xenpaging.c) = 3ade1afeb17210632ca350cdbb649f30d4697493
 SHA1 (patch-tools_xl_Makefile) = 76f401d3f3dddb4fd48cf386494583db658e56b0
 SHA1 (patch-xen_Makefile) = bba02be1c25c1a1cef44754602e073afc5de85eb
+SHA1 (patch-xen_arch_x86_traps.c) = 9548d6476e2fb5898d2958c10eaf2fd1e424d9c5
 SHA1 (patch-xen_common_libelf_libelf-loader.c) = 1b3d9e315aa6c218e6eec1cb9b5536956d5c689c
 SHA1 (patch-xen_include_Makefile) = 5bdd9f7e3eda76285fff1f8aa9c32d2fa9e4a837

Added files:

Index: pkgsrc/sysutils/xentools418/patches/patch-xen_arch_x86_traps.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-xen_arch_x86_traps.c:1.1
--- /dev/null   Thu May 29 12:16:56 2025
+++ pkgsrc/sysutils/xentools418/patches/patch-xen_arch_x86_traps.c      Thu May 29 12:16:56 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-xen_arch_x86_traps.c,v 1.1 2025/05/29 12:16:56 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 */