From owner-p4-projects@FreeBSD.ORG  Tue Mar 21 03:00:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3800916A423; Tue, 21 Mar 2006 03:00:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EA9E516A420
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 03:00:03 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 974FF43D45
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 03:00:03 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L303eh094331
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 03:00:03 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L303kD094328
	for perforce@freebsd.org; Tue, 21 Mar 2006 03:00:03 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 21 Mar 2006 03:00:03 GMT
Message-Id: <200603210300.k2L303kD094328@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93678 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Mar 2006 03:00:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=93678

Change 93678 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 02:59:36

	handle non page-aligned reads that straddle physical pages

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#3 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#3 (text+ko) ====

@@ -89,20 +89,34 @@
 hvd_startio(struct hvd_softc *sc, struct bio *bp)
 {
 	u_int r;
-	int len;
+	int len, rlen, wlen;
+	uint64_t page_off;
+
 	r = H_EOK;
+	len = 0;
+
+	page_off = bp->bio_offset & PAGE_MASK;
+
 
         switch (bp->bio_cmd) {
         case BIO_READ:
-		for (len = 0; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) {
-			int rlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len;
+		if (bp->bio_length > (PAGE_SIZE - page_off)) {
+			len = rlen = (PAGE_SIZE - page_off);
+			r = hv_sim_read(bp->bio_offset, vtophys((char *)bp->bio_data), rlen);
+		}
+		for (; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) {
+			rlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len;
 			r = hv_sim_read(bp->bio_offset + len, vtophys((char *)bp->bio_data + len), rlen);
 
 		}
                 break;
         case BIO_WRITE:
-		for (len = 0; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) {
-			int wlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len;
+		if (bp->bio_length > (PAGE_SIZE - page_off)) {
+			len = wlen = (PAGE_SIZE - page_off);
+			r = hv_sim_write(bp->bio_offset, vtophys((char *)bp->bio_data), wlen);
+		}
+		for (; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) {
+			wlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len;
 			r = hv_sim_write(bp->bio_offset + len, vtophys((char *)bp->bio_data + len), wlen);
 		}
                 break;