Module Name: src
Committed By: jdolecek
Date: Mon Apr 20 14:11:05 UTC 2020
Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c
Log Message:
do not retry when xen_shm_map() fails after having returned error for it,
it corrupts the ring; just go to next request
should fix the problem with ZFS causing failscade when req fails,
reported by Brian Buhrow on port-xen
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/xen/xen/xbdback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.81 src/sys/arch/xen/xen/xbdback_xenbus.c:1.82
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.81 Mon Apr 20 03:00:33 2020
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Mon Apr 20 14:11:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.81 2020/04/20 03:00:33 msaitoh Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.82 2020/04/20 14:11:04 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.81 2020/04/20 03:00:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.82 2020/04/20 14:11:04 jdolecek Exp $");
#include <sys/atomic.h>
#include <sys/buf.h>
@@ -1804,7 +1804,8 @@ xbdback_map_shm(struct xbdback_io *xbd_i
SLIST_INSERT_HEAD(&xbdi->xbdi_va_free, xbd_io->xio_xv, xv_next);
xbd_io->xio_xv = NULL;
xbdi->xbdi_io = NULL;
- xbdi->xbdi_cont = xbdi->xbdi_cont_aux;
+ // do not retry
+ xbdi->xbdi_cont = xbdback_co_main_incr;
return xbdi;
}
}
