From owner-svn-src-head@FreeBSD.ORG Tue Sep 2 09:30:16 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6605D264; Tue, 2 Sep 2014 09:30:16 +0000 (UTC) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [IPv6:2a00:1450:400c:c00::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E1751300; Tue, 2 Sep 2014 09:30:15 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id b13so6463015wgh.13 for ; Tue, 02 Sep 2014 02:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Gfqz1ep3pKJyc2dPyZnIAyN9Cexd4LPyiPF25D1XurQ=; b=EQeewgfng8BHJetZqcnvXZ8vyGwjRTE5BohY7SkbCtq5/gHTMUFa2Y9v43ekWNtbVN dANL6L/y8pVx2rMQvcmnAPB8Wl4BTFp/zh7kP2QRCvhh3uTcH/fsunDxb3P6ha2wZagq wMT3Y+oeCWf2lx+tPdcYzos5Zs/m9RmssVCsXKhq62noM/AOhYdeNHnOlwyWVCo2DpbO 6x3kC10I3tVb3h+diD1VWz0Q83Tx9IaTl4AJ3Q7N+n+TbWOHKe5rXEs7Wl2VFsW8E7pY 4UuEO7ohnXms+CI1D9Z94j59jnT76eFRjL/6uXpbXcc82js9Gcmwy6xzZCffHLwZuRIy NGQA== X-Received: by 10.180.12.173 with SMTP id z13mr3739489wib.53.1409650213344; Tue, 02 Sep 2014 02:30:13 -0700 (PDT) Received: from [172.16.1.30] (124.Red-83-33-238.dynamicIP.rima-tde.net. [83.33.238.124]) by mx.google.com with ESMTPSA id kw2sm8193706wjb.30.2014.09.02.02.30.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 02:30:12 -0700 (PDT) Sender: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= Message-ID: <54058E1E.4050907@FreeBSD.org> Date: Tue, 02 Sep 2014 11:30:06 +0200 From: =?windows-1252?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Alexander Motin , John-Mark Gurney Subject: Re: svn commit: r269814 - head/sys/dev/xen/blkfront References: <53e8e31e.2179.30c1c657@svn.freebsd.org> <53FF7386.3050804@FreeBSD.org> <20140828184515.GV71691@funkthat.com> <53FF7BC4.6050801@FreeBSD.org> <5400BDC7.7020902@FreeBSD.org> In-Reply-To: <5400BDC7.7020902@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2014 09:30:16 -0000 El 29/08/14 a les 19.52, Roger Pau Monné ha escrit: > El 28/08/14 a les 20.58, Alexander Motin ha escrit: >> On 28.08.2014 21:45, John-Mark Gurney wrote: >>> Alexander Motin wrote this message on Thu, Aug 28, 2014 at 21:23 +0300: >>>> Hi, Roger. >>>> >>>> It looks to me like this commit does not work as it should. I got >>>> problem when I just tried `newfs /dev/ada0 ; mount /dev/ada0 /mnt`. >>>> Somehow newfs does not produce valid filesystem. Problem is reliably >>>> repeatable and reverting this commit fixes it. >>>> >>>> I found at least one possible cause there: If original data buffer is >>>> unmapped, misaligned and not physically contiguous, then present x86 >>>> bus_dmamap_load_bio() implementation will process each physically >>>> contiguous segment separately. Due to the misalignment first and last >>>> physical segments may have size not multiple to 512 bytes. Since each >>>> segment processed separately, they are not joined together, and >>>> xbd_queue_cb() is getting segments not multiple to 512 bytes. Attempt to >>>> convert them to exact number of sectors in the driver cause data corruption. >>> >>> Are you sure this isn't a problem w/ the tag not properly specifying >>> the correct alignement? >> >> I don't know how to specify it stronger then this: >> error = bus_dma_tag_create( >> bus_get_dma_tag(sc->xbd_dev), /* parent */ >> 512, PAGE_SIZE, /* algnmnt, boundary */ >> BUS_SPACE_MAXADDR, /* lowaddr */ >> BUS_SPACE_MAXADDR, /* highaddr */ >> NULL, NULL, /* filter, filterarg */ >> sc->xbd_max_request_size, >> sc->xbd_max_request_segments, >> PAGE_SIZE, /* maxsegsize */ >> BUS_DMA_ALLOCNOW, /* flags */ >> busdma_lock_mutex, /* lockfunc */ >> &sc->xbd_io_lock, /* lockarg */ >> &sc->xbd_io_dmat); >> >>> Also, I don't think there is a way for busdma >>> to say that you MUST have a segment be a multiple of 512, though you >>> could use a 512 boundary, but that would force all segments to only be >>> 512 bytes... >> >> As I understand, that is mandatory requirement for this "hardware". >> Alike 4K alignment requirement also exist at least for SDHCI, and IIRC >> UHCI/OHCI hardware. Even AHCI requires both segment addresses and >> lengths to be even. >> >> I may be wrong, but I think it is quite likely that hardware that >> requires segment address alignment quite likely will have the same >> requirements for segments length. Hello, I have the following fix, which makes sure the total length and the size of each segment is aligned. I'm not very knowledgeable of the busdma code, so someone has to review it. Roger. --- diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index d1c75f8..688f559 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -620,6 +620,8 @@ bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, segs = dmat->segments; if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) { + /* Make sure buflen is aligned */ + buflen = roundup2(buflen, dmat->common.alignment); _bus_dmamap_count_phys(dmat, map, buf, buflen, flags); if (map->pagesneeded != 0) { error = _bus_dmamap_reserve_pages(dmat, map, flags); @@ -634,6 +636,7 @@ bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, if (((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) && map->pagesneeded != 0 && bus_dma_run_filter(&dmat->common, curaddr)) { + sgsize = roundup2(sgsize, dmat->common.alignment); sgsize = MIN(sgsize, PAGE_SIZE); curaddr = add_bounce_page(dmat, map, 0, curaddr, sgsize);