Mon Mar 25 15:28:13 2019 UTC ()
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


(bouyer)
diff -r1.4 -r1.5 pkgsrc/sysutils/xenkernel411/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/xenkernel411/distinfo
diff -r0 -r1.3 pkgsrc/sysutils/xenkernel411/patches/patch-zz-bouyer
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/xenkernel411/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel411/Attic/Makefile 2019/03/07 11:13:26 1.4
+++ pkgsrc/sysutils/xenkernel411/Attic/Makefile 2019/03/25 15:28:13 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2019/03/07 11:13:26 bouyer Exp $ 1# $NetBSD: Makefile,v 1.5 2019/03/25 15:28:13 bouyer Exp $
2 2
3VERSION= 4.11.1 3VERSION= 4.11.1
4PKGREVISION= 1 4PKGREVISION= 2
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xenkernel411-${VERSION} 6PKGNAME= xenkernel411-${VERSION}
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 8MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
9DIST_SUBDIR= xen411 9DIST_SUBDIR= xen411
10 10
11MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
12HOMEPAGE= http://xenproject.org/ 12HOMEPAGE= http://xenproject.org/
13COMMENT= Xen 4.11.x Kernel 13COMMENT= Xen 4.11.x Kernel
14 14
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17ONLY_FOR_PLATFORM= Linux-2.6*-x86_64 17ONLY_FOR_PLATFORM= Linux-2.6*-x86_64
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xenkernel411/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel411/Attic/distinfo 2019/03/07 11:13:26 1.3
+++ pkgsrc/sysutils/xenkernel411/Attic/distinfo 2019/03/25 15:28:13 1.4
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.3 2019/03/07 11:13:26 bouyer Exp $ 1$NetBSD: distinfo,v 1.4 2019/03/25 15:28:13 bouyer Exp $
2 2
3SHA1 (xen411/xen-4.11.1.tar.gz) = aeb45f3b05aaa73dd2ef3a0c533a975495b58c17 3SHA1 (xen411/xen-4.11.1.tar.gz) = aeb45f3b05aaa73dd2ef3a0c533a975495b58c17
4RMD160 (xen411/xen-4.11.1.tar.gz) = c0eaf57cfbd4f762e8367bcf88e99912d2089084 4RMD160 (xen411/xen-4.11.1.tar.gz) = c0eaf57cfbd4f762e8367bcf88e99912d2089084
5SHA512 (xen411/xen-4.11.1.tar.gz) = c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649 5SHA512 (xen411/xen-4.11.1.tar.gz) = c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
6Size (xen411/xen-4.11.1.tar.gz) = 25152217 bytes 6Size (xen411/xen-4.11.1.tar.gz) = 25152217 bytes
7SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65 7SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
8SHA1 (patch-XSA284) = dfab3d5f51cef2ac2e201988e2c8ffbe6066ad89 8SHA1 (patch-XSA284) = dfab3d5f51cef2ac2e201988e2c8ffbe6066ad89
9SHA1 (patch-XSA285) = 99b2864579d7a09b2d3c911f2d4f4bae23f9e42e 9SHA1 (patch-XSA285) = 99b2864579d7a09b2d3c911f2d4f4bae23f9e42e
10SHA1 (patch-XSA287) = 834156c50c47d683e64793a5e6874a21b2999b94 10SHA1 (patch-XSA287) = 834156c50c47d683e64793a5e6874a21b2999b94
11SHA1 (patch-XSA288) = 8551dc11ecb1a3912b5708b0db65533038f60390 11SHA1 (patch-XSA288) = 8551dc11ecb1a3912b5708b0db65533038f60390
12SHA1 (patch-XSA290-1) = 21bcc513e9ff1aa10fa62fcf1aca1e5f3558622c 12SHA1 (patch-XSA290-1) = 21bcc513e9ff1aa10fa62fcf1aca1e5f3558622c
13SHA1 (patch-XSA290-2) = be394879eeb98917690d284c10e04ee432e83df3 13SHA1 (patch-XSA290-2) = be394879eeb98917690d284c10e04ee432e83df3
14SHA1 (patch-XSA291) = 00b2949e1d2567e5d9bf823bdd69c31be2300800 14SHA1 (patch-XSA291) = 00b2949e1d2567e5d9bf823bdd69c31be2300800
15SHA1 (patch-XSA292) = a887098d4b38567d0c8ab3170c15a08b47cbe835 15SHA1 (patch-XSA292) = a887098d4b38567d0c8ab3170c15a08b47cbe835
16SHA1 (patch-XSA293-1) = 7e46dab8b44cc1b129e5717502e26094f96e67b9 16SHA1 (patch-XSA293-1) = 7e46dab8b44cc1b129e5717502e26094f96e67b9
17SHA1 (patch-XSA293-2) = 02eeb9533fa22ee99699319cc0194045fa26fef5 17SHA1 (patch-XSA293-2) = 02eeb9533fa22ee99699319cc0194045fa26fef5
18SHA1 (patch-XSA294) = 8f7dd8ba100c3b93cb6f48c72b403a3cf43c09e7 18SHA1 (patch-XSA294) = 8f7dd8ba100c3b93cb6f48c72b403a3cf43c09e7
19SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6 19SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
20SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac 20SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
21SHA1 (patch-xen_arch_x86_Rules.mk) = 0bedfc53a128a87b6a249ae04fbdf6a053bfb70b 21SHA1 (patch-xen_arch_x86_Rules.mk) = 0bedfc53a128a87b6a249ae04fbdf6a053bfb70b
22SHA1 (patch-xen_arch_x86_boot_build32.mk) = b82c20de9b86ddaa9d05bbc1ff28f970eb78473c 22SHA1 (patch-xen_arch_x86_boot_build32.mk) = b82c20de9b86ddaa9d05bbc1ff28f970eb78473c
23SHA1 (patch-xen_tools_symbols.c) = 6070b3b5ccc38a196283cfc1c52f5d87858beb18 23SHA1 (patch-xen_tools_symbols.c) = 6070b3b5ccc38a196283cfc1c52f5d87858beb18
 24SHA1 (patch-zz-bouyer) = bf11b2b81d5c81992c911f670e75dd3aec5ab609
File Added: pkgsrc/sysutils/xenkernel411/patches/Attic/patch-zz-bouyer
$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)