Re: [PATCH] SPARC64: fix iommu sg chaining

[FUJITA Tomonori]

On Wed, 17 Oct 2007 12:58:40 +0200
Jens Axboe <jens.axboe@xxxxxxxxxx> wrote:

> On Wed, Oct 17 2007, David Miller wrote:
> > From: Jens Axboe <jens.axboe@xxxxxxxxxx>
> > Date: Wed, 17 Oct 2007 11:16:29 +0200
> > 
> > > On Wed, Oct 17 2007, David Miller wrote:
> > > > From: Jens Axboe <jens.axboe@xxxxxxxxxx>
> > > > Date: Wed, 17 Oct 2007 10:45:28 +0200
> > > > 
> > > > > Righto, it's invalid to call sg_next() on the last entry!
> > > > 
> > > > Unfortunately, that's what the sparc64 code wanted to do, this
> > > > transformation in the sparc64 sg chaining patch is not equilavent:
> > > > 
> > > > -	struct scatterlist *sg_end = sg + nelems;
> > > > +	struct scatterlist *sg_end = sg_last(sg, nelems);
> > > >  ...
> > > > -			while (sg < sg_end &&
> > > > +			while (sg != sg_end &&
> > > 
> > > Auch indeed. That'd probably be better as a
> > > 
> > >         do {
> > >                 ...
> > >         } while (sg != sg_end);
> > 
> > Ok, next bug, introduced by this change:
> > 
> > commit f565913ef8a8d0cfa46a1faaf8340cc357a46f3a
> > Author: Jens Axboe <jens.axboe@xxxxxxxxxx>
> > Date:   Fri Sep 21 10:44:19 2007 +0200
> > 
> >     block: convert to using sg helpers
> >     
> >     Convert the main rq mapper (blk_rq_map_sg()) to the sg helper setup.
> >     
> >     Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
> > 
> > Specifically this part:
> > 
> >  new_segment:
> > -			memset(&sg[nsegs],0,sizeof(struct scatterlist));
> > -			sg[nsegs].page = bvec->bv_page;
> > -			sg[nsegs].length = nbytes;
> > -			sg[nsegs].offset = bvec->bv_offset;
> > +			sg = next_sg;
> > +			next_sg = sg_next(sg);
> >  
> > +			sg->page = bvec->bv_page;
> > +			sg->length = nbytes;
> > +			sg->offset = bvec->bv_offset;
> > 
> > You can't remove that memset(), it's there for a reason.  The IOMMU
> > layers depended upon the code zero'ing out the whole scatterlist
> > struct, there might be more to it than page, length and offset :-)
> 
> I realize that, and I was pretty worried about this specific change. But
> there's only been one piece of fallout because if it until now - well
> two, with the sparc64 stuff.
> 
> The problem is that you cannot zero the entire sg entry, because then
> you'd potentially overwrite the chain pointer.
> 
> I'd propose just adding a
> 
>         sg_dma_address(sg) = 0;
>         sg_dma_len(sg) = 0;
> 
> there for now, or provide an arch_clear_sg_entry() helper if we need
> more killed.

Except for sparc64, the IOMMU implementations do something like this,
I think.

-
sparc64: zero out dma_length

zero out dma_length in the entry immediately following the last mapped
entry for unmap_sg.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
---
 arch/sparc64/kernel/iommu_common.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/sparc64/kernel/iommu_common.c b/arch/sparc64/kernel/iommu_common.c
index d7ca900..836455d 100644
--- a/arch/sparc64/kernel/iommu_common.c
+++ b/arch/sparc64/kernel/iommu_common.c
@@ -234,6 +234,11 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)
 	dma_sg->dma_address = dent_addr;
 	dma_sg->dma_length = dent_len;
 
+	if (dma_sg != sg) {
+		dma_sg = next_sg(dma_sg);
+		dma_sg->dma_length = 0;
+	}
+
 	return ((unsigned long) dent_addr +
 		(unsigned long) dent_len +
 		(IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;
-- 
1.5.2.4


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/