CVS commit: pkgsrc/sysutils/xenkernel411

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Mar 25 15:28:13 UTC 2019

Modified Files:
        pkgsrc/sysutils/xenkernel411: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xenkernel411/patches: patch-zz-bouyer

Log Message:
The ASSERT(oc > 0) bug is still here, it's just that it doens't show up
any more on my test server. So add back the workaround.
Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xenkernel411/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xenkernel411/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/sysutils/xenkernel411/patches/patch-zz-bouyer

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

Modified files:

Index: pkgsrc/sysutils/xenkernel411/Makefile
diff -u pkgsrc/sysutils/xenkernel411/Makefile:1.4 pkgsrc/sysutils/xenkernel411/Makefile:1.5
--- pkgsrc/sysutils/xenkernel411/Makefile:1.4   Thu Mar  7 11:13:26 2019
+++ pkgsrc/sysutils/xenkernel411/Makefile       Mon Mar 25 15:28:13 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/03/07 11:13:26 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/25 15:28:13 bouyer Exp $
 
 VERSION=       4.11.1
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      xen-${VERSION}
 PKGNAME=       xenkernel411-${VERSION}
 CATEGORIES=    sysutils

Index: pkgsrc/sysutils/xenkernel411/distinfo
diff -u pkgsrc/sysutils/xenkernel411/distinfo:1.3 pkgsrc/sysutils/xenkernel411/distinfo:1.4
--- pkgsrc/sysutils/xenkernel411/distinfo:1.3   Thu Mar  7 11:13:26 2019
+++ pkgsrc/sysutils/xenkernel411/distinfo       Mon Mar 25 15:28:13 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/03/07 11:13:26 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2019/03/25 15:28:13 bouyer Exp $
 
 SHA1 (xen411/xen-4.11.1.tar.gz) = aeb45f3b05aaa73dd2ef3a0c533a975495b58c17
 RMD160 (xen411/xen-4.11.1.tar.gz) = c0eaf57cfbd4f762e8367bcf88e99912d2089084
@@ -21,3 +21,4 @@ SHA1 (patch-xen_Rules.mk) = c743dc63f51f
 SHA1 (patch-xen_arch_x86_Rules.mk) = 0bedfc53a128a87b6a249ae04fbdf6a053bfb70b
 SHA1 (patch-xen_arch_x86_boot_build32.mk) = b82c20de9b86ddaa9d05bbc1ff28f970eb78473c
 SHA1 (patch-xen_tools_symbols.c) = 6070b3b5ccc38a196283cfc1c52f5d87858beb18
+SHA1 (patch-zz-bouyer) = bf11b2b81d5c81992c911f670e75dd3aec5ab609

Added files:

Index: pkgsrc/sysutils/xenkernel411/patches/patch-zz-bouyer
diff -u /dev/null pkgsrc/sysutils/xenkernel411/patches/patch-zz-bouyer:1.3
--- /dev/null   Mon Mar 25 15:28:13 2019
+++ pkgsrc/sysutils/xenkernel411/patches/patch-zz-bouyer        Mon Mar 25 15:28:13 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-zz-bouyer,v 1.3 2019/03/25 15:28:13 bouyer Exp $
+Dirty hack to avoid assert failure. This has been discussed on xen-devel
+but no solution has been found so far.
+The box producing http://www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/
+is running with this patch; the printk has fired but the
+hypervisor keeps running.
+
+--- xen/arch/x86/mm.c.orig     2018-07-19 10:32:07.000000000 +0200
++++ xen/arch/x86/mm.c  2018-07-21 20:47:47.000000000 +0200
+@@ -674,7 +674,12 @@
+     typeof(pg->linear_pt_count) oc;
+ 
+     oc = arch_fetch_and_add(&pg->linear_pt_count, -1);
+-    ASSERT(oc > 0);
++    if (oc <= 0) {
++            gdprintk(XENLOG_WARNING,
++                 "mm.c:dec_linear_entries(): oc %d would fail assert\n", oc);
++          pg->linear_pt_count = 0;
++    }
++    /* ASSERT(oc > 0); */
+ }
+ 
+ static bool inc_linear_uses(struct page_info *pg)