Module Name: src
Committed By: jym
Date: Thu May 26 22:26:52 UTC 2011
Modified Files:
src/sys/arch/x86/include [jym-xensuspend]: pmap.h
src/sys/arch/xen/xen [jym-xensuspend]: xbdback_xenbus.c xengnt.c
Log Message:
Pull-up some modifications from -current to my branch.
To generate a diff of this commit:
cvs rdiff -u -r1.21.2.9 -r1.21.2.10 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.24.2.4 -r1.24.2.5 src/sys/arch/xen/xen/xbdback_xenbus.c
cvs rdiff -u -r1.13.2.5 -r1.13.2.6 src/sys/arch/xen/xen/xengnt.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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.21.2.9 src/sys/arch/x86/include/pmap.h:1.21.2.10
--- src/sys/arch/x86/include/pmap.h:1.21.2.9 Mon May 2 22:49:57 2011
+++ src/sys/arch/x86/include/pmap.h Thu May 26 22:26:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.21.2.9 2011/05/02 22:49:57 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.21.2.10 2011/05/26 22:26:52 jym Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -378,13 +378,11 @@
void pmap_unmap_recursive_entries(void);
#endif /* PAE */
+#include <sys/bitops.h>
+
#define XPTE_MASK L1_FRAME
-/* XPTE_SHIFT = L1_SHIFT - log2(sizeof(pt_entry_t)) */
-#if defined(__x86_64__) || defined(PAE)
-#define XPTE_SHIFT 9
-#else
-#define XPTE_SHIFT 10
-#endif
+/* Selects the index of a PTE in (A)PTE_BASE */
+#define XPTE_SHIFT (L1_SHIFT - ilog2(sizeof(pt_entry_t)))
/* PTE access inline fuctions */
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.24.2.4 src/sys/arch/xen/xen/xbdback_xenbus.c:1.24.2.5
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.24.2.4 Mon May 2 22:49:59 2011
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Thu May 26 22:26:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.24.2.4 2011/05/02 22:49:59 jym Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.24.2.5 2011/05/26 22:26:52 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.24.2.4 2011/05/02 22:49:59 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.24.2.5 2011/05/26 22:26:52 jym Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -34,6 +34,7 @@
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/kernel.h>
+#include <sys/atomic.h>
#include <sys/conf.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
@@ -143,7 +144,7 @@
grant_handle_t xbdi_ring_handle; /* to unmap the ring */
vaddr_t xbdi_ring_va; /* to unmap the ring */
/* disconnection must be postponed until all I/O is done */
- volatile unsigned xbdi_refcnt;
+ int xbdi_refcnt;
/*
* State for I/O processing/coalescing follows; this has to
* live here instead of on the stack because of the
@@ -167,13 +168,10 @@
uint xbdi_pendingreqs; /* number of I/O in fly */
};
/* Manipulation of the above reference count. */
-/* [email protected]: not MP-safe, and move the i386 asm elsewhere. */
-#define xbdi_get(xbdip) (++(xbdip)->xbdi_refcnt)
+#define xbdi_get(xbdip) atomic_inc_uint(&(xbdip)->xbdi_refcnt)
#define xbdi_put(xbdip) \
do { \
- __asm volatile("decl %0" \
- : "=m"((xbdip)->xbdi_refcnt) : "m"((xbdip)->xbdi_refcnt)); \
- if (0 == (xbdip)->xbdi_refcnt) \
+ if (atomic_dec_uint_nv(&(xbdip)->xbdi_refcnt) == 0) \
xbdback_finish_disconnect(xbdip); \
} while (/* CONSTCOND */ 0)
@@ -875,7 +873,6 @@
blkif_request_t *req = &xbdi->xbdi_xen_req;
blkif_x86_32_request_t *req32;
blkif_x86_64_request_t *req64;
- int i;
(void)obj;
if (xbdi->xbdi_ring.ring_n.req_cons != xbdi->xbdi_req_prod) {
@@ -893,8 +890,6 @@
req->handle = req32->handle;
req->id = req32->id;
req->sector_number = req32->sector_number;
- for (i = 0; i < req->nr_segments; i++)
- req->seg[i] = req32->seg[i];
break;
case XBDIP_64:
@@ -905,8 +900,6 @@
req->handle = req64->handle;
req->id = req64->id;
req->sector_number = req64->sector_number;
- for (i = 0; i < req->nr_segments; i++)
- req->seg[i] = req64->seg[i];
break;
}
XENPRINTF(("xbdback op %d req_cons 0x%x req_prod 0x%x "
@@ -1021,17 +1014,24 @@
static void *
xbdback_co_io(struct xbdback_instance *xbdi, void *obj)
{
- int error;
+ int i, error;
+ blkif_request_t *req;
+ blkif_x86_32_request_t *req32;
+ blkif_x86_64_request_t *req64;
(void)obj;
- if (xbdi->xbdi_xen_req.nr_segments < 1 ||
- xbdi->xbdi_xen_req.nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST ) {
+
+ /* some sanity checks */
+ req = &xbdi->xbdi_xen_req;
+ if (req->nr_segments < 1 ||
+ req->nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST) {
printf("xbdback_io domain %d: %d segments\n",
xbdi->xbdi_domid, xbdi->xbdi_xen_req.nr_segments);
error = EINVAL;
goto end;
}
- if (xbdi->xbdi_xen_req.operation == BLKIF_OP_WRITE) {
+
+ if (req->operation == BLKIF_OP_WRITE) {
if (xbdi->xbdi_ro) {
error = EROFS;
goto end;
@@ -1040,6 +1040,25 @@
xbdi->xbdi_segno = 0;
+ /* copy request segments */
+ switch(xbdi->xbdi_proto) {
+ case XBDIP_NATIVE:
+ /* already copied in xbdback_co_main_loop */
+ break;
+ case XBDIP_32:
+ req32 = RING_GET_REQUEST(&xbdi->xbdi_ring.ring_32,
+ xbdi->xbdi_ring.ring_n.req_cons);
+ for (i = 0; i < req->nr_segments; i++)
+ req->seg[i] = req32->seg[i];
+ break;
+ case XBDIP_64:
+ req64 = RING_GET_REQUEST(&xbdi->xbdi_ring.ring_64,
+ xbdi->xbdi_ring.ring_n.req_cons);
+ for (i = 0; i < req->nr_segments; i++)
+ req->seg[i] = req64->seg[i];
+ break;
+ }
+
xbdi->xbdi_cont = xbdback_co_io_gotreq;
return xbdback_pool_get(&xbdback_request_pool, xbdi);
end:
Index: src/sys/arch/xen/xen/xengnt.c
diff -u src/sys/arch/xen/xen/xengnt.c:1.13.2.5 src/sys/arch/xen/xen/xengnt.c:1.13.2.6
--- src/sys/arch/xen/xen/xengnt.c:1.13.2.5 Sun Oct 24 22:48:23 2010
+++ src/sys/arch/xen/xen/xengnt.c Thu May 26 22:26:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xengnt.c,v 1.13.2.5 2010/10/24 22:48:23 jym Exp $ */
+/* $NetBSD: xengnt.c,v 1.13.2.6 2011/05/26 22:26:52 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.13.2.5 2010/10/24 22:48:23 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.13.2.6 2011/05/26 22:26:52 jym Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -235,7 +235,8 @@
gnt_entries[last_gnt_entry] = XENGNT_NO_ENTRY;
splx(s);
KASSERT(entry != XENGNT_NO_ENTRY);
- KASSERT(last_gnt_entry >= 0 && last_gnt_entry <= gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
+ KASSERT(last_gnt_entry >= 0);
+ KASSERT(last_gnt_entry <= gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
return entry;
}
@@ -247,7 +248,8 @@
{
int s = splvm();
KASSERT(gnt_entries[last_gnt_entry] == XENGNT_NO_ENTRY);
- KASSERT(last_gnt_entry >= 0 && last_gnt_entry <= gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
+ KASSERT(last_gnt_entry >= 0);
+ KASSERT(last_gnt_entry <= gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE);
gnt_entries[last_gnt_entry] = entry;
last_gnt_entry++;
splx(s);
