block subsystem related crash with latest -git
Subsystems (48)
Re: [bug] ata subsystem related crash with latest -git
In reply to Benny HalevyQuoted 12 lines · Benny Halevy
Quoted 11 lines · Jens Axboe
Quoted 10 lines · Jens Axboe
Quoted 9 lines · Benny Halevy
Review static inline struct scatterlist *sg_last(struct scatterlist *sgl, · line 100
Quoted 8 lines
(quoted diff) +2
-0return sg; }@@ -83,6 +96,9 @@ static inline struct scatterlist *sg_last(struct scatterlist *sgl, ret = sg; #endif +#ifdef CONFIG_DEBUG_SG + BUG_ON(sgl[0].sg_magic != SG_MAGIC);can it also do BUG_ON(!sg_is_last(sg))?
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
That would make sense, definitely. I'll add that.
BUG_ON(!sg_is_last(ret));it should be, not sg. That's what I merged.
right. of course.
OK, that found something interesting - mapping a request may shrink it, so we need to update the end marker to move it earlier in the list. Basically just a
if (sg)
__sg_mark_end(sg);at the bottom of blk_rq_map_sg(). Updated patch below, booted on other machines now as well without incident.
arch/alpha/kernel/pci_iommu.c +1 -1
@@ -465,7 +465,7 @@ EXPORT_SYMBOL(pci_free_consistent);Write dma_length of each leader with the combined lengths of the mergable followers. */ -#define SG_ENT_VIRT_ADDRESS (SG ) (page_address((SG)->page) + (SG)->offset) +#define SG_ENT_VIRT_ADDRESS (SG ) (page_address(sg_page((SG)) + (SG)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) __pa(SG_ENT_VIRT_ADDRESS(SG)) static void
arch/arm/common/dmabounce.c +1 -1
@@ -442,7 +442,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (dir ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { -struct page *page = sg->page; +struct page *page =sg_page (sg);unsigned int offset = sg->offset;unsigned int length = sg->length;void *ptr =page_address (page) + offset;
arch/blackfin/kernel/dma-mapping.c +1 -1
@@ -160,7 +160,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (direction ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { - sg->dma_address = (dma_addr_t)(page_address (sg->page) + + sg->dma_address = (dma_addr_t)(page_address (sg_page (sg)) + sg->offset); invalidate_dcache_range(sg_dma_address(sg),
arch/ia64/hp/common/sba_iommu.c +1 -1
@@ -246,7 +246,7 @@ static int reserve_sba_gart = 1; static SBA_INLINE void sba_mark_invalid(struct ioc *, dma_addr_t, size_t); static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t); -#define sba_sg_address (sg) (page_address((sg)->page) + (sg)->offset) +#define sba_sg_address (sg) (page_address(sg_page((sg)) + (sg)->offset))#ifdef FULL_VALID_PDIR static u64 prefetch_spill_page;
arch/ia64/hp/sim/simscsi.c +2 -2
@@ -131,7 +131,7 @@ simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset) stat.fd = desc[sc->device->id];scsi_for_each_sg (sc, sl,scsi_sg_count (sc), i) { - req.addr =__pa (page_address (sl->page) + sl->offset); + req.addr =__pa (page_address (sg_page (sl)) + sl->offset); req.len = sl->length;if (DBG ) printk("simscsi_sg_%s @ %lx (off %lx) use_sg=%d len=%d\n",
@@ -212,7 +212,7 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len)if (!len)break ; thislen =min (len, slp->length); -memcpy (page_address (slp->page) + slp->offset, buf, thislen); +memcpy (page_address (sg_page (slp)) + slp->offset, buf, thislen); len -= thislen; } }
arch/ia64/sn/pci/pci_dma.c +1 -1
@@ -16,7 +16,7 @@#include <asm/sn/pcidev.h> #include <asm/sn/sn_sal.h> -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))/**
arch/m68k/kernel/dma.c +1 -1
@@ -121,7 +121,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,int i;for (i =0 ; i < nents; sg++, i++) { - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset;dma_sync_single_for_device (dev, sg->dma_address, sg->length, dir); }return nents;
arch/mips/mm/dma-default.c +4 -4
@@ -165,7 +165,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,for (i =0 ; i < nents; i++, sg++) {unsigned long addr; - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (!plat_device_is_coherent (dev) && addr)__dma_sync (addr + sg->offset, sg->length, direction); sg->dma_address = plat_map_dma_mem(dev,
@@ -223,7 +223,7 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,for (i =0 ; i < nhwentries; i++, sg++) {if (!plat_device_is_coherent (dev) && direction !=DMA_TO_DEVICE ) { - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (addr)__dma_sync (addr + sg->offset, sg->length, direction);
@@ -304,7 +304,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (cpu_is_noncoherent_r10000 (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
@@ -322,7 +322,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (!plat_device_is_coherent (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
arch/powerpc/kernel/dma_64.c +1 -1
@@ -161,7 +161,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (page_to_phys (sg->page) + sg->offset) | + sg->dma_address = (page_to_phys (sg_page (sg)) + sg->offset) | dma_direct_offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -102,7 +102,7 @@ static int ibmebus_map_sg(struct device *dev,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (dma_addr_t )page_address (sg->page) + sg->dma_address = (dma_addr_t )page_address (sg_page (sg)) + sg->offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/iommu.c +1 -1
@@ -307,7 +307,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,continue ; }/* Allocate iommu entries for that segment */ - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (sg_page (s)) + s->offset; npages =iommu_num_pages (vaddr, slen); entry =iommu_range_alloc (tbl, npages, &handle, mask >>IOMMU_PAGE_SHIFT ,0 );
arch/powerpc/platforms/ps3/system-bus.c +1 -1
@@ -629,7 +629,7 @@ static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,for_each_sg (sgl, sg, nents, i) {int result =ps3_dma_map (dev->d_region, -page_to_phys (sg->page) + sg->offset, sg->length, +page_to_phys (sg_page (sg)) + sg->offset, sg->length, &sg->dma_address,0 );if (result) {
arch/sparc/kernel/ioport.c +8 -8
@@ -727,9 +727,9 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );/* IIep is write-through, not flushing. */ for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL ); sg->dvma_address = -virt_to_phys (page_address (sg->page)) + sg->offset; +virt_to_phys (page_address (sg_page (sg))) + sg->offset; sg->dvma_length = sg->length; }return nents;
@@ -748,9 +748,9 @@ void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -798,9 +798,9 @@ void pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sgl, intBUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -814,9 +814,9 @@ void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sgl,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
arch/sparc/mm/io-unit.c +1 -1
@@ -144,7 +144,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_busspin_lock_irqsave (&iounit->lock, flags);while (sz !=0 ) { --sz; - sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc/mm/iommu.c +4 -4
@@ -238,7 +238,7 @@ static void iommu_get_scsi_sgl_noflush(struct scatterlist *sg, int sz, struct sbwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -252,7 +252,7 @@ static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbuwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -273,7 +273,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu* XXX Is this a good assumption? * XXX What if someone else unmaps it here and races us? */ -if ((page = (unsigned long )page_address (sg->page)) !=0 ) { +if ((page = (unsigned long )page_address (sg_page (sg))) !=0 ) {for (i =0 ; i < n; i++) {if (page != oldpage) {/* Already flushed? */ flush_page_for_dma (page);
@@ -283,7 +283,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu } } - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
arch/sparc/mm/sun4c.c +1 -1
@@ -1228,7 +1228,7 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus * {while (sz !=0 ) { --sz; - sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc64/kernel/iommu.c +2 -2
@@ -473,7 +473,7 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static void fill_sg(iopte_t *iopte, struct scatterlist *sg, int nused, int nelems,
@@ -566,7 +566,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4u_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/sparc64/kernel/iommu_common.c +6 -6
@@ -73,7 +73,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, daddr = dma_sg->dma_address; sglen = sg->length; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);while (dlen >0 ) {unsigned long paddr;
@@ -123,7 +123,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, sg =sg_next (sg);if (--nents <=0 )break ; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); sglen = sg->length; }if (dlen <0 ) {
@@ -191,7 +191,7 @@ void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npprintk ("sg(%d): page_addr(%p) off(%x) length(%x) " "dma_address[%016x] dma_length[%016x]\n" , i, -page_address (sg->page), sg->offset, +page_address (sg_page (sg)), sg->offset, sg->length, sg->dma_address, sg->dma_length); }
@@ -207,15 +207,15 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)unsigned long prev;u32 dent_addr, dent_len; - prev = (unsigned long ) (page_address (sg->page) + sg->offset); + prev = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); prev += (unsigned long ) (dent_len = sg->length); - dent_addr = (u32) ((unsigned long )(page_address (sg->page) + sg->offset) + dent_addr = (u32) ((unsigned long )(page_address (sg_page (sg)) + sg->offset) & (IO_PAGE_SIZE -1UL ));while (--nents) {unsigned long addr; sg =sg_next (sg); - addr = (unsigned long ) (page_address (sg->page) + sg->offset); + addr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);if (!VCONTIG (prev, addr)) { dma_sg->dma_address = dent_addr; dma_sg->dma_length = dent_len;
arch/sparc64/kernel/ldc.c +1 -1
@@ -2057,7 +2057,7 @@ static void fill_cookies(struct cookie_state *sp, unsigned long pa,static int sg_count_one (struct scatterlist *sg) { -unsigned long base =page_to_pfn (sg->page) <<PAGE_SHIFT ; +unsigned long base =page_to_pfn (sg_page (sg)) <<PAGE_SHIFT ;long len = sg->length;if ((sg->offset | len) & (8UL -1 ))
arch/sparc64/kernel/pci_sun4v.c +2 -2
@@ -366,7 +366,7 @@ static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static long fill_sg(long entry, struct device *dev, struct scatterlist *sg,
@@ -478,7 +478,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4v_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/um/drivers/ubd_kern.c +1 -1
@@ -1115,7 +1115,7 @@ static void do_ubd_request(struct request_queue *q) }prepare_request (req, io_req, (unsigned long long ) req->sector <<9 , - sg->offset, sg->length, sg->page); + sg->offset, sg->length,sg_page (sg)); last_sectors = sg->length >>9 ; n = os_write_file(thread_fd, &io_req,
arch/x86/kernel/pci-calgary_64.c +8 -4
@@ -411,8 +411,10 @@ static int calgary_nontranslate_map_sg(struct device* dev,int i;for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +struct page *p =sg_page (s); + +BUG_ON (!p); + s->dma_address =virt_to_bus (page_address (p) + s->offset); s->dma_length = s->length; }return nelems;
@@ -432,9 +434,11 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,return calgary_nontranslate_map_sg (dev, sg, nelems, direction);for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); +struct page *p =sg_page (s); + +BUG_ON (!p); - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (p) + s->offset; npages =num_dma_pages (vaddr, s->length); entry =iommu_range_alloc (tbl, npages);
arch/x86/kernel/pci-gart_64.c +2 -2
@@ -302,7 +302,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,#endif for_each_sg (sg, s, nents, i) { -unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;if (nonforced_iommu (dev, addr, s->length)) { addr =dma_map_area (dev, addr, s->length, dir);if (addr == bad_dma_address) {
@@ -397,7 +397,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, start_sg = sgmap = sg; ps =NULL ;/* shut up gcc */ for_each_sg (sg, s, nents, i) { -dma_addr_t addr =page_to_phys (s->page) + s->offset; +dma_addr_t addr =page_to_phys (sg_page (s)) + s->offset; s->dma_address = addr;BUG_ON (s->length ==0 );
arch/x86/kernel/pci-nommu_64.c +2 -2
@@ -62,8 +62,8 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,int i;for_each_sg (sg, s, nents, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +BUG_ON (!sg_page (s)); + s->dma_address =virt_to_bus (page_address (sg_page (s)) +s->offset);if (!check_addr ("map_sg" , hwdev, s->dma_address, s->length))return 0 ; s->dma_length = s->length;
block/ll_rw_blk.c +6 -2
@@ -1354,8 +1354,9 @@ new_segment:else sg =sg_next (sg); -memset (sg,0 ,sizeof (*sg)); - sg->page = bvec->bv_page; +sg_dma_len (sg) =0 ; +sg_dma_address (sg) =0 ; +sg_set_page (sg, bvec->bv_page); sg->length = nbytes; sg->offset = bvec->bv_offset; nsegs++;
@@ -1363,6 +1364,9 @@ new_segment: bvprv = bvec; }/* segments in rq */ +if (sg) +__sg_mark_end (sg); +return nsegs; }
crypto/digest.c +1 -1
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,return 0 ;for (;;) { -struct page *pg = sg->page; +struct page *pg =sg_page (sg);unsigned int offset = sg->offset;unsigned int l = sg->length;
crypto/hmac.c +2 -1
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg, desc.flags = pdesc->flags &CRYPTO_TFM_REQ_MAY_SLEEP ;sg_set_buf (sg1, ipad, bs); - sg1[1 ].page = (void *)sg; + +sg_set_page (&sg[1 ], (void *) sg); sg1[1 ].length =0 ;sg_set_buf (sg2, opad, bs + ds);
crypto/scatterwalk.c +1 -1
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,if (out) {struct page *page; - page = walk->sg->page + ((walk->offset -1 ) >>PAGE_SHIFT ); + page =sg_page (walk->sg) + ((walk->offset -1 ) >>PAGE_SHIFT );flush_dcache_page (page); }
crypto/scatterwalk.h +3 -3
@@ -22,13 +22,13 @@static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg) { -return (++sg)->length ? sg : (void *)sg->page; +return (++sg)->length ? sg : (void *)sg_page (sg); }static inline unsigned long scatterwalk_samebuf (struct scatter_walk *walk_in,struct scatter_walk *walk_out) { -return !(((walk_in->sg->page - walk_out->sg->page) <<PAGE_SHIFT ) + +return !(((sg_page (walk_in->sg) -sg_page (walk_out->sg)) <<PAGE_SHIFT ) + (int )(walk_in->offset - walk_out->offset)); }
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,static inline struct page *scatterwalk_page (struct scatter_walk *walk) { -return walk->sg->page + (walk->offset >>PAGE_SHIFT ); +return sg_page (walk->sg) + (walk->offset >>PAGE_SHIFT ); }static inline void scatterwalk_unmap (void *vaddr,int out)
crypto/tcrypt.c +2 -2
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc, goto out; } - q =kmap (sg[0 ].page) + sg[0 ].offset; + q =kmap (sg_page (&sg[0 ])) + sg[0 ].offset;hexdump (q, cipher_tv[i].rlen); printk("%s\n",
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc, temp =0 ;for (k =0 ; k < cipher_tv[i].np; k++) {printk ("page %u\n" , k); - q =kmap (sg[k].page) + sg[k].offset; + q =kmap (sg_page (&sg[k])) + sg[k].offset;hexdump (q, cipher_tv[i].tap[k]); printk("%s\n", memcmp(q, cipher_tv[i].result + temp,
crypto/xcbc.c +1 -1
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, do { - struct page *pg = sg[i].page; + struct page *pg = sg_page(&sg[i]); unsigned int offset = sg[i].offset; unsigned int slen = sg[i].length;
drivers/ata/libata-core.c +5 -5
@@ -4296,7 +4296,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc)sg_last (sg, qc->orig_n_elem)->length += qc->pad_len;if (pad_buf) {struct scatterlist *psg = &qc->pad_sgent; -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (addr + psg->offset, pad_buf, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4686,11 +4686,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)* data in this function or read data in ata_sg_clean. */ offset = lsg->offset + lsg->length - qc->pad_len; - psg->page =nth_page (lsg->page, offset >>PAGE_SHIFT ); +sg_set_page (psg,nth_page (sg_page (lsg), offset >>PAGE_SHIFT )); psg->offset =offset_in_page (offset);if (qc->tf.flags &ATA_TFLAG_WRITE ) { -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (pad_buf, addr + psg->offset, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4836,7 +4836,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ; - page = qc->cursg->page; + page =sg_page (qc->cursg); offset = qc->cursg->offset + qc->cursg_ofs;/* get the current page and offset */
@@ -4988,7 +4988,7 @@ next_sg: sg = qc->cursg; - page = sg->page; + page =sg_page (sg); offset = sg->offset + qc->cursg_ofs;/* get the current page and offset */
drivers/ata/libata-scsi.c +1 -1
@@ -1544,7 +1544,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)struct scatterlist *sg =scsi_sglist (cmd);if (sg) { - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; buflen = sg->length; }else { buf =NULL ;
drivers/block/cciss.c +2 -2
@@ -2610,7 +2610,7 @@ static void do_cciss_request(struct request_queue *q) (int)creq->nr_sectors);#endif /* CCISS_DEBUG */ -memset (tmp_sg,0 ,sizeof (tmp_sg)); +sg_init_table (tmp_sg,MAXSGENTRIES ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* get the DMA records for the setup */
@@ -2621,7 +2621,7 @@ static void do_cciss_request(struct request_queue *q)for (i =0 ; i < seg; i++) { c->SG[i].Len = tmp_sg[i].length; - temp64.val = (__u64 )pci_map_page (h->pdev, tmp_sg[i].page, + temp64.val = (__u64 )pci_map_page (h->pdev,sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); c->SG[i].Addr.lower = temp64.val32.lower;
drivers/block/cpqarray.c +2 -1
@@ -918,6 +918,7 @@ queue_next:DBGPX ( printk("sector=%d, nr_sectors=%d\n", creq->sector, creq->nr_sectors); ); +sg_init_table (tmp_sg,SG_MAX ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* Now do all the DMA Mappings */
@@ -929,7 +930,7 @@ DBGPX( { c->req.sg[i].size = tmp_sg[i].length; c->req.sg[i].addr = (__u32 )pci_map_page (h->pci_dev, - tmp_sg[i].page, +sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); }
drivers/block/cryptoloop.c +8 -4
@@ -26,6 +26,7 @@#include <linux/crypto.h> #include <linux/blkdev.h> #include <linux/loop.h> +#include <linux/scatterlist.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -119,14 +120,17 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, .tfm = tfm, .flags = CRYPTO_TFM_REQ_MAY_SLEEP, }; -struct scatterlist sg_out = {NULL , }; -struct scatterlist sg_in = {NULL , }; +struct scatterlist sg_out; +struct scatterlist sg_in;encdec_cbc_t encdecfunc;struct page *in_page, *out_page;unsigned in_offs, out_offs;int err; +sg_init_table (&sg_out,1 ); +sg_init_table (&sg_in,1 ); +if (cmd ==READ ) { in_page = raw_page; in_offs = raw_off;
@@ -146,11 +150,11 @@ cryptoloop_transfer(struct loop_device *lo, int cmd,u32 iv[4 ] = {0 , }; iv[0 ] =cpu_to_le32 (IV &0xffffffff ); - sg_in.page = in_page; +sg_set_page (&sg_in, in_page); sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = out_page; +sg_set_page (&sg_out, out_page); sg_out.offset = out_offs; sg_out.length = sz;
drivers/block/ub.c +5 -3
@@ -25,6 +25,7 @@#include <linux/usb_usual.h> #include <linux/blkdev.h> #include <linux/timer.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #define DRV_NAME "ub"
@@ -656,6 +657,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)if ((cmd =ub_get_cmd (lun)) ==NULL )return -1 ;memset (cmd,0 ,sizeof (struct ub_scsi_cmd )); +sg_init_table (cmd->sgv,UB_MAX_REQ_SG );blkdev_dequeue_request (rq);
@@ -1310,7 +1312,7 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) pipe = sc->send_bulk_pipe; sc->last_pipe = pipe;usb_fill_bulk_urb (&sc->work_urb, sc->dev, pipe, -page_address (sg->page) + sg->offset, sg->length, +page_address (sg_page (sg)) + sg->offset, sg->length, ub_urb_complete, sc); sc->work_urb.actual_length =0 ; sc->work_urb.error_count =0 ;
@@ -1427,7 +1429,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd) scmd->state =UB_CMDST_INIT ; scmd->nsg =1 ; sg = &scmd->sgv[0 ]; - sg->page =virt_to_page (sc->top_sense); +sg_set_page (sg,virt_to_page (sc->top_sense)); sg->offset = (unsigned long )sc->top_sense & (PAGE_SIZE -1 ); sg->length =UB_SENSE_SIZE ; scmd->len =UB_SENSE_SIZE ;
@@ -1863,7 +1865,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, cmd->state =UB_CMDST_INIT ; cmd->nsg =1 ; sg = &cmd->sgv[0 ]; - sg->page =virt_to_page (p); +sg_set_page (sg,virt_to_page (p)); sg->offset = (unsigned long )p & (PAGE_SIZE -1 ); sg->length =8 ; cmd->len =8 ;
drivers/ide/cris/ide-cris.c +2 -2
@@ -934,11 +934,11 @@ static int cris_ide_build_dmatable (ide_drive_t *drive)* than two possibly non-adjacent physical 4kB pages. */ /* group sequential buffers into one large buffer */ - addr =page_to_phys (sg->page) + sg->offset; + addr =page_to_phys (sg_page (sg)) + sg->offset; size =sg_dma_len (sg);while (--i) { sg =sg_next (sg); -if ((addr + size) !=page_to_phys (sg->page) + sg->offset) +if ((addr + size) !=page_to_phys (sg_page (sg)) + sg->offset)break ; size +=sg_dma_len (sg); }
drivers/ide/ide-probe.c +3 -1
@@ -1337,12 +1337,14 @@ static int hwif_init(ide_hwif_t *hwif)if (!hwif->sg_max_nents) hwif->sg_max_nents =PRD_ENTRIES ; - hwif->sg_table =kzalloc (sizeof (struct scatterlist )*hwif->sg_max_nents, + hwif->sg_table =kmalloc (sizeof (struct scatterlist )*hwif->sg_max_nents,GFP_KERNEL );if (!hwif->sg_table) {printk (KERN_ERR "%s: unable to allocate SG table.\n" , hwif->name); goto out; } + +sg_init_table (hwif->sg_table, hwif->sg_max_nents);if (init_irq (hwif) ==0 ) goto done;
drivers/ide/ide-taskfile.c +1 -1
@@ -278,7 +278,7 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) hwif->cursg = sg; } - page = cursg->page; + page =sg_page (cursg); offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */
drivers/ide/mips/au1xxx-ide.c +2 -2
@@ -276,7 +276,7 @@ static int auide_build_dmatable(ide_drive_t *drive)if (iswrite) {if (!put_source_flags (ahwif->tx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
@@ -285,7 +285,7 @@ static int auide_build_dmatable(ide_drive_t *drive) }else {if (!put_dest_flags (ahwif->rx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
drivers/ieee1394/dma.c +1 -1
@@ -111,7 +111,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,unsigned long va = (unsigned long )dma->kvirt + (i <<PAGE_SHIFT ); - dma->sglist[i].page =vmalloc_to_page ((void *)va); +sg_set_page (&dma->sglist[i],vmalloc_to_page ((void *)va)); dma->sglist[i].length =PAGE_SIZE ; }
drivers/ieee1394/sbp2.c +1 -1
@@ -1466,7 +1466,7 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, cmd->dma_size = sgpnt[0 ].length; cmd->dma_type =CMD_DMA_PAGE ; cmd->cmd_dma =dma_map_page (hi->host->device.parent, - sgpnt[0 ].page, sgpnt[0 ].offset, +sg_page (&sgpnt[0 ]), sgpnt[0 ].offset, cmd->dma_size, cmd->dma_dir); orb->data_descriptor_lo = cmd->cmd_dma;
drivers/infiniband/core/umem.c +7 -4
@@ -55,9 +55,11 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dib_dma_unmap_sg (dev, chunk->page_list, chunk->nents,DMA_BIDIRECTIONAL );for (i =0 ; i < chunk->nents; ++i) { +struct page *page =sg_page (&chunk->page_list[i]); +if (umem->writable && dirty) -set_page_dirty_lock (chunk->page_list[i].page); -put_page (chunk->page_list[i].page); +set_page_dirty_lock (page); +put_page (page); }kfree (chunk);
@@ -164,11 +166,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, } chunk->nents =min_t (int, ret,IB_UMEM_MAX_PAGE_CHUNK ); +sg_init_table (chunk->page_list, chunk->nents);for (i =0 ; i < chunk->nents; ++i) {if (vma_list && !is_vm_hugetlb_page (vma_list[i + off])) umem->hugetlb =0 ; - chunk->page_list[i].page = page_list[i + off]; +sg_set_page (&chunk->page_list[i], page_list[i + off]); chunk->page_list[i].offset =0 ; chunk->page_list[i].length =PAGE_SIZE ; }
@@ -179,7 +182,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, DMA_BIDIRECTIONAL);if (chunk->nmap <=0 ) {for (i =0 ; i < chunk->nents; ++i) -put_page (chunk->page_list[i].page); +put_page (sg_page (&chunk->page_list[i]));kfree (chunk); ret = -ENOMEM ;
drivers/infiniband/hw/ipath/ipath_dma.c +2 -2
@@ -108,7 +108,7 @@ static int ipath_map_sg(struct ib_device *dev, struct scatterlist *sgl,BUG_ON (!valid_dma_direction (direction));for_each_sg (sgl, sg, nents, i) { - addr = (u64 )page_address (sg->page); + addr = (u64 )page_address (sg_page (sg));/* TODO: handle highmem pages */ if (!addr) { ret =0 ;
@@ -127,7 +127,7 @@ static void ipath_unmap_sg(struct ib_device *dev,static u64 ipath_sg_dma_address (struct ib_device *dev,struct scatterlist *sg) { -u64 addr = (u64 )page_address (sg->page); +u64 addr = (u64 )page_address (sg_page (sg));if (addr) addr += sg->offset;
drivers/infiniband/hw/ipath/ipath_mr.c +1 -1
@@ -225,7 +225,7 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,for (i =0 ; i < chunk->nents; i++) {void *vaddr; - vaddr =page_address (chunk->page_list[i].page); + vaddr =page_address (sg_page (&chunk->page_list[i]));if (!vaddr) { ret =ERR_PTR (-EINVAL ); goto bail;
drivers/infiniband/hw/mthca/mthca_memfree.c +15 -9
@@ -71,7 +71,7 @@ static void mthca_free_icm_pages(struct mthca_dev *dev, struct mthca_icm_chunk * PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -81,7 +81,7 @@ static void mthca_free_icm_coherent(struct mthca_dev *dev, struct mthca_icm_chunfor (i =0 ; i < chunk->npages; ++i) {dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); } }
@@ -107,10 +107,13 @@ void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm, int coherent)static int mthca_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -157,6 +160,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MTHCA_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -304,7 +308,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj, dma_addr_t *dma_h* so if we found the page, dma_handle has already * been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
@@ -445,6 +449,7 @@ static u64 mthca_uarc_virt(struct mthca_dev *dev, struct mthca_uar *uar, int pagint mthca_map_user_db (struct mthca_dev *dev,struct mthca_uar *uar,struct mthca_user_db_table *db_tab,int index,u64 uaddr) { +struct page *pages[1 ];int ret =0 ;u8 status;int i;
@@ -472,16 +477,17 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, } ret =get_user_pages (current, current->mm, uaddr &PAGE_MASK ,1 ,1 ,0 , - &db_tab->page[i].mem.page,NULL ); + pages,NULL );if (ret <0 ) goto out; +sg_set_page (&db_tab->page[i].mem, pages[0 ]); db_tab->page[i].mem.length =MTHCA_ICM_PAGE_SIZE ; db_tab->page[i].mem.offset = uaddr & ~PAGE_MASK ; ret =pci_map_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE );if (ret <0 ) { -put_page (db_tab->page[i].mem.page); +put_page (pages[0 ]); goto out; }
@@ -491,7 +497,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, ret = -EINVAL ;if (ret) {pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); goto out; }
@@ -557,7 +563,7 @@ void mthca_cleanup_user_db_tab(struct mthca_dev *dev, struct mthca_uar *uar,if (db_tab->page[i].uvirt) {mthca_UNMAP_ICM (dev,mthca_uarc_virt (dev, uar, i),1 , &status);pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); } }
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -131,7 +131,7 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, data->size, i) { - from =kmap_atomic (sg->page,KM_USER0 ); + from =kmap_atomic (sg_page (sg),KM_USER0 );memcpy (p, from + sg->offset, sg->length);
@@ -191,7 +191,7 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, sg_size, i) { - to =kmap_atomic (sg->page,KM_SOFTIRQ0 ); + to =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 );memcpy (to + sg->offset, p, sg->length);
@@ -300,7 +300,7 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,for_each_sg (sgl, sg, data->dma_nents, i) {/* iser_dbg("Checking sg iobuf [%d]: phys=0x%08lX " "offset: %ld sz: %ld\n", i, -(unsigned long)page_to_phys(sg->page), +(unsigned long)page_to_phys(sg_page(sg)), (unsigned long)sg->offset, (unsigned long)sg->length); */ end_addr = ib_sg_dma_address(ibdev, sg) +
@@ -336,7 +336,7 @@ static void iser_data_buf_dump(struct iser_data_buf *data,iser_err ("sg[%d] dma_addr:0x%lX page:0x%p " "off:0x%x sz:0x%x dma_len:0x%x\n" , i, (unsigned long )ib_sg_dma_address (ibdev, sg), - sg->page, sg->offset, +sg_page (sg), sg->offset, sg->length,ib_sg_dma_len (ibdev, sg)); }
drivers/md/dm-crypt.c +11 -10
@@ -346,16 +346,17 @@ static int crypt_convert(struct crypt_config *cc, ctx->idx_out < ctx->bio_out->bi_vcnt) {struct bio_vec *bv_in =bio_iovec_idx (ctx->bio_in, ctx->idx_in);struct bio_vec *bv_out =bio_iovec_idx (ctx->bio_out, ctx->idx_out); -struct scatterlist sg_in = { - .page = bv_in->bv_page, - .offset = bv_in->bv_offset + ctx->offset_in, - .length =1 <<SECTOR_SHIFT - }; -struct scatterlist sg_out = { - .page = bv_out->bv_page, - .offset = bv_out->bv_offset + ctx->offset_out, - .length =1 <<SECTOR_SHIFT - }; +struct scatterlist sg_in, sg_out; + +sg_init_table (&sg_in,1 ); +sg_set_page (&sg_in, bv_in->bv_page); + sg_in.offset = bv_in->bv_offset + ctx->offset_in; + sg_in.length =1 <<SECTOR_SHIFT ; + +sg_init_table (&sg_out,1 ); +sg_set_page (&sg_out, bv_out->bv_page); + sg_out.offset = bv_out->bv_offset + ctx->offset_out; + sg_out.length =1 <<SECTOR_SHIFT ; ctx->offset_in += sg_in.length;if (ctx->offset_in >= bv_in->bv_len) {
drivers/media/common/saa7146_core.c +2 -1
@@ -112,12 +112,13 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/media/video/ivtv/ivtv-udma.c +2 -2
@@ -63,10 +63,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_infomemcpy (page_address (dma->bouncemap[map_offset]) + offset, src, len);kunmap_atomic (src,KM_BOUNCE_READ );local_irq_restore (flags); - dma->SGlist[map_offset].page = dma->bouncemap[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->bouncemap[map_offset]); }else { - dma->SGlist[map_offset].page = dma->map[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->map[map_offset]); } offset =0 ; map_offset++;
drivers/media/video/videobuf-dma-sg.c +5 -3
@@ -60,12 +60,13 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
@@ -86,13 +87,14 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) sglist =kcalloc (nr_pages,sizeof (*sglist),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);if (NULL == pages[0 ]) goto nopage;if (PageHighMem (pages[0 ]))/* DMA to highmem pages might not work */ goto highmem; - sglist[0 ].page = pages[0 ]; +sg_set_page (&sglist[0 ], pages[0 ]); sglist[0 ].offset = offset; sglist[0 ].length =PAGE_SIZE - offset;for (i =1 ; i < nr_pages; i++) {
@@ -100,7 +102,7 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) goto nopage;if (PageHighMem (pages[i])) goto highmem; - sglist[i].page = pages[i]; +sg_set_page (&sglist[i], pages[i]); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/mmc/card/queue.c +8 -7
@@ -13,6 +13,7 @@#include <linux/blkdev.h> #include <linux/freezer.h> #include <linux/kthread.h> +#include <linux/scatterlist.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h>
@@ -153,19 +154,21 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lockblk_queue_max_hw_segments (mq->queue, bouncesz /512 );blk_queue_max_segment_size (mq->queue, bouncesz); - mq->sg =kzalloc (sizeof (struct scatterlist ), + mq->sg =kmalloc (sizeof (struct scatterlist ),GFP_KERNEL );if (!mq->sg) { ret = -ENOMEM ; goto cleanup_queue; } +sg_init_table (mq->sg,1 ); - mq->bounce_sg =kzalloc (sizeof (struct scatterlist ) * + mq->bounce_sg =kmalloc (sizeof (struct scatterlist ) * bouncesz /512 ,GFP_KERNEL );if (!mq->bounce_sg) { ret = -ENOMEM ; goto cleanup_queue; } + sg_init_table(mq->bounce_sg, bouncesz / 512); } }#endif
@@ -302,12 +305,12 @@ static void copy_sg(struct scatterlist *dst, unsigned int dst_len,BUG_ON (dst_len ==0 );if (dst_size ==0 ) { - dst_buf =page_address (dst->page) + dst->offset; + dst_buf =page_address (sg_page (dst)) + dst->offset; dst_size = dst->length; }if (src_size ==0 ) { - src_buf =page_address (src->page) + src->offset; + src_buf =page_address (sg_page (src)) + src->offset; src_size = src->length; }
@@ -353,9 +356,7 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq)return 1 ; } - mq->sg[0 ].page =virt_to_page (mq->bounce_buf); - mq->sg[0 ].offset =offset_in_page (mq->bounce_buf); - mq->sg[0 ].length =0 ; +sg_init_one (mq->sg, mq->bounce_buf,0 );while (sg_len) { mq->sg[0 ].length += mq->bounce_sg[sg_len -1 ].length;
drivers/mmc/host/at91_mci.c +4 -4
@@ -149,7 +149,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data sg = &data->sg[i]; - sgbuffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + sgbuffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; amount =min (size, sg->length); size -= amount;
@@ -226,7 +226,7 @@ static void at91_mci_pre_dma_read(struct at91mci_host *host) sg = &data->sg[host->transfer_index++];pr_debug ("sg = %p\n" , sg); - sg->dma_address =dma_map_page (NULL , sg->page, sg->offset, sg->length,DMA_FROM_DEVICE ); + sg->dma_address =dma_map_page (NULL ,sg_page (sg), sg->offset, sg->length,DMA_FROM_DEVICE );pr_debug ("dma address = %08X, length = %d\n" , sg->dma_address, sg->length);
@@ -283,7 +283,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)int index;/* Swap the contents of the buffer */ - buffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset;pr_debug ("buffer = %p, length = %d\n" , buffer, sg->length);for (index =0 ; index < (sg->length /4 ); index++)
@@ -292,7 +292,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); } -flush_dcache_page (sg->page); +flush_dcache_page (sg_page (sg)); }/* Is there another transfer to trigger? */
drivers/mmc/host/au1xmmc.c +4 -4
@@ -340,7 +340,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)/* This is the pointer to the data buffer */ sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len = data->sg[host->pio.index].length - host->pio.offset;
@@ -400,7 +400,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)if (host->pio.index < host->dma.len) { sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len =sg_dma_len (&data->sg[host->pio.index]) - host->pio.offset;
@@ -613,13 +613,13 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)if (host->flags &HOST_F_XMIT ){ ret =au1xxx_dbdma_put_source_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }else { ret =au1xxx_dbdma_put_dest_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }
drivers/mmc/host/imxmmc.c +1 -1
@@ -262,7 +262,7 @@ static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data) }/* Convert back to virtual address */ - host->data_ptr = (u16 *)(page_address (data->sg->page) + data->sg->offset); + host->data_ptr = (u16 *)(page_address (sg_page (data->sg)) + data->sg->offset); host->data_cnt =0 ;clear_bit (IMXMCI_PEND_DMA_DATA_b, &host->pending_events);
drivers/mmc/host/mmc_spi.c +4 -4
@@ -813,7 +813,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, && dir == DMA_FROM_DEVICE) dir =DMA_BIDIRECTIONAL ; - dma_addr =dma_map_page (dma_dev, sg->page,0 , + dma_addr =dma_map_page (dma_dev,sg_page (sg),0 ,PAGE_SIZE , dir);if (direction ==DMA_TO_DEVICE ) t->tx_dma = dma_addr + sg->offset;
@@ -822,7 +822,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, }/* allow pio too; we don't allow highmem */ - kmap_addr =kmap (sg->page); + kmap_addr =kmap (sg_page (sg));if (direction ==DMA_TO_DEVICE ) t->tx_buf = kmap_addr + sg->offset;else
@@ -855,8 +855,8 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,/* discard mappings */ if (direction ==DMA_FROM_DEVICE ) -flush_kernel_dcache_page (sg->page); -kunmap (sg->page); +flush_kernel_dcache_page (sg_page (sg)); +kunmap (sg_page (sg));if (dma_dev)dma_unmap_page (dma_dev, dma_addr,PAGE_SIZE , dir);
drivers/mmc/host/omap.c +2 -2
@@ -24,10 +24,10 @@#include <linux/mmc/host.h> #include <linux/mmc/card.h> #include <linux/clk.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/scatterlist.h> #include <asm/mach-types.h> #include <asm/arch/board.h>
@@ -383,7 +383,7 @@ mmc_omap_sg_to_buf(struct mmc_omap_host *host) sg = host->data->sg + host->sg_idx; host->buffer_bytes_left = sg->length; - host->buffer =page_address (sg->page) + sg->offset; + host->buffer =page_address (sg_page (sg)) + sg->offset;if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; }
drivers/mmc/host/sdhci.c +1 -1
@@ -231,7 +231,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host)static inline char *sdhci_sg_to_buffer (struct sdhci_host * host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline int sdhci_next_sg (struct sdhci_host * host)
drivers/mmc/host/tifm_sd.c +4 -4
@@ -192,7 +192,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt);
@@ -241,18 +241,18 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt); p_cnt =min (p_cnt, t_size);if (r_data->flags &MMC_DATA_WRITE ) -tifm_sd_copy_page (host->bounce_buf.page, +tifm_sd_copy_page (sg_page (&host->bounce_buf), r_data->blksz - t_size, pg, p_off, p_cnt);else if (r_data->flags &MMC_DATA_READ ) -tifm_sd_copy_page (pg, p_off, host->bounce_buf.page, +tifm_sd_copy_page (pg, p_off,sg_page (&host->bounce_buf), r_data->blksz - t_size, p_cnt); t_size -= p_cnt;
drivers/mmc/host/wbsd.c +3 -3
@@ -269,7 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host *host)static inline char *wbsd_sg_to_buffer (struct wbsd_host *host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline void wbsd_sg_to_dma (struct wbsd_host *host,struct mmc_data *data)
@@ -283,7 +283,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (dmabuf, sgbuf, sg[i].length); dmabuf += sg[i].length; }
@@ -300,7 +300,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (sgbuf, dmabuf, sg[i].length); dmabuf += sg[i].length; }
drivers/net/mlx4/icm.c +9 -5
@@ -60,7 +60,7 @@ static void mlx4_free_icm_pages(struct mlx4_dev *dev, struct mlx4_icm_chunk *chu PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -70,7 +70,7 @@ static void mlx4_free_icm_coherent(struct mlx4_dev *dev, struct mlx4_icm_chunk *for (i =0 ; i < chunk->npages; ++i)dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); }
@@ -95,10 +95,13 @@ void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent)static int mlx4_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -145,6 +148,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MLX4_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -334,7 +338,7 @@ void *mlx4_table_find(struct mlx4_icm_table *table, int obj, dma_addr_t *dma_han* been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
drivers/net/ppp_mppe.c +2 -4
@@ -55,7 +55,7 @@#include <linux/mm.h> #include <linux/ppp_defs.h> #include <linux/ppp-comp.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include "ppp_mppe.h"
@@ -68,9 +68,7 @@ MODULE_VERSION("1.0.2");static unsigned int setup_sg (struct scatterlist *sg,const void *address,unsigned int length) { - sg[0 ].page =virt_to_page (address); - sg[0 ].offset =offset_in_page (address); - sg[0 ].length = length; +sg_init_one (sg, address, length);return length; }
drivers/scsi/3w-9xxx.c +2 -2
@@ -1840,7 +1840,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, (scsi_bufflen(srb) < TW_MIN_SGL_LENGTH)) {if (srb->sc_data_direction ==DMA_TO_DEVICE || srb->sc_data_direction ==DMA_BIDIRECTIONAL ) {struct scatterlist *sg =scsi_sglist (srb); -char *buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; +char *buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (tw_dev->generic_buffer_virt[request_id], buf, sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 ); }
@@ -1919,7 +1919,7 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int rechar *buf;unsigned long flags =0 ;local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buf, tw_dev->generic_buffer_virt[request_id], sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/3w-xxxx.c +1 -1
@@ -1469,7 +1469,7 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,struct scatterlist *sg =scsi_sglist (cmd);local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len);memcpy (buf, data, transfer_len);
drivers/scsi/NCR5380.c +2 -2
@@ -298,7 +298,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.buffers_residual = cmd->use_sg -1 ; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset; cmd->SCp.this_residual = cmd->SCp.buffer->length; }else {
@@ -2143,7 +2143,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ++cmd->SCp.buffer; --cmd->SCp.buffers_residual; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset;dprintk (NDEBUG_INFORMATION , ("scsi%d : %d bytes and %d buffers left\n" , instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual)); }
drivers/scsi/NCR53c406a.c +2 -2
@@ -875,7 +875,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_write (page_address (sg->page) + sg->offset, +NCR53c406a_pio_write (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
@@ -897,7 +897,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_read (page_address (sg->page) + sg->offset, +NCR53c406a_pio_read (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
drivers/scsi/aacraid/aachba.c +1 -1
@@ -356,7 +356,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigneint transfer_len;struct scatterlist *sg =scsi_sglist (scsicmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len + offset); transfer_len -= offset;
drivers/scsi/aha1542.c +3 -3
@@ -49,7 +49,7 @@#include "aha1542.h" #define SCSI_BUF_PA (address) isa_virt_to_bus(address) -#define SCSI_SG_PA (sgent) (isa_page_to_bus((sgent)->page) + (sgent)->offset) +#define SCSI_SG_PA (sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)static void BAD_DMA (void *address,unsigned int length) {
@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt, {printk (KERN_CRIT "sgpnt[%d:%d] page %p/0x%llx length %u\n" , badseg, nseg, -page_address (sgp->page) + sgp->offset, +page_address (sg_page (sgp)) + sgp->offset, (unsigned long long )SCSI_SG_PA (sgp), sgp->length);
@@ -712,7 +712,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))printk (KERN_CRIT "Bad segment list supplied to aha1542.c (%d, %d)\n" , SCpnt->use_sg, i);scsi_for_each_sg (SCpnt, sg, SCpnt->use_sg, i) {printk (KERN_CRIT "%d: %p %d\n" , i, - (page_address (sg->page) + + (page_address (sg_page (sg)) + sg->offset), sg->length); };printk (KERN_CRIT "cptr %x: " , (unsigned int ) cptr);
drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
@@ -1343,7 +1343,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \/* 4 bytes: Areca io control code */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (scsi_sg_count (cmd) >1 ) { retvalue =ARCMSR_MESSAGE_FAIL ; goto message_out;
@@ -1593,7 +1593,7 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,strncpy (&inqdata[32 ],"R001" ,4 );/* Product Revision */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buffer, inqdata,sizeof (inqdata)); sg =scsi_sglist (cmd);
drivers/scsi/fdomain.c +3 -3
@@ -1321,7 +1321,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id)if (current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; }else break ;
@@ -1354,7 +1354,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id) && current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; } }
@@ -1439,7 +1439,7 @@ static int fdomain_16x0_queue(struct scsi_cmnd *SCpnt,if (scsi_sg_count (current_SC)) { current_SC->SCp.buffer =scsi_sglist (current_SC); - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; current_SC->SCp.buffers_residual =scsi_sg_count (current_SC) -1 ;
drivers/scsi/gdth.c +2 -2
@@ -2374,13 +2374,13 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow; -if (!sl->page) { +if (!sg_page (sl)) {printk ("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n" , ha->hanum);return ; }local_irq_save (flags); - address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; + address =kmap_atomic (sg_page (sl),KM_BIO_SRC_IRQ ) + sl->offset;if (to_buffer)memcpy (buffer, address, cpnow);else
drivers/scsi/ibmmca.c +1 -1
@@ -1828,7 +1828,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))BUG_ON (scsi_sg_count (cmd) >16 );scsi_for_each_sg (cmd, sg,scsi_sg_count (cmd), i) { -ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg->page) + sg->offset); +ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg_page (sg)) + sg->offset);ld (shpnt)[ldn].sge[i].byte_length = sg->length; } scb->enable |=IM_POINTER_TO_LIST ;
drivers/scsi/ide-scsi.c +6 -6
@@ -175,18 +175,18 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignewhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count); }
@@ -212,18 +212,18 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignwhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count); }
drivers/scsi/imm.c +2 -2
@@ -706,7 +706,7 @@ static int imm_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset;/*
@@ -845,7 +845,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/ipr.c +12 -7
@@ -2872,6 +2872,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len) } scatterlist = sglist->scatterlist; +sg_init_table (scatterlist, num_elem); sglist->order = order; sglist->num_sg = num_elem;
@@ -2884,12 +2885,12 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)/* Free up what we already allocated */ for (j = i -1 ; j >=0 ; j--) -__free_pages (scatterlist[j].page, order); +__free_pages (sg_page (&scatterlist[j]), order);kfree (sglist);return NULL ; } - scatterlist[i].page = page; +sg_set_page (&scatterlist[i], page); }return sglist;
@@ -2910,7 +2911,7 @@ static void ipr_free_ucode_buffer(struct ipr_sglist *sglist)int i;for (i =0 ; i < sglist->num_sg; i++) -__free_pages (sglist->scatterlist[i].page, sglist->order); +__free_pages (sg_page (&sglist->scatterlist[i]), sglist->order);kfree (sglist); }
@@ -2940,9 +2941,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, scatterlist = sglist->scatterlist;for (i =0 ; i < (len / bsize_elem); i++, buffer += bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = bsize_elem;
@@ -2953,9 +2956,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, }if (len % bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, len % bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = len % bsize_elem; }
drivers/scsi/ips.c +3 -3
@@ -1515,7 +1515,7 @@ static int ips_is_passthru(struct scsi_cmnd *SC)/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && buffer[2 ] =='P' && buffer[3 ] =='P' ) {kunmap_atomic (buffer - sg->offset,KM_IRQ0 );
@@ -3523,7 +3523,7 @@ ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (buffer, &cdata[xfer_cnt], min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
@@ -3556,7 +3556,7 @@ ips_scmd_buf_read(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (&cdata[xfer_cnt], buffer, min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/iscsi_tcp.c +7 -8
@@ -70,9 +70,7 @@ module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);static inline void iscsi_buf_init_iov (struct iscsi_buf *ibuf,char *vbuf,int size) { - ibuf->sg.page =virt_to_page (vbuf); - ibuf->sg.offset =offset_in_page (vbuf); - ibuf->sg.length = size; +sg_init_one (&ibuf->sg, vbuf, size); ibuf->sent =0 ; ibuf->use_sendmsg =1 ; }
@@ -80,13 +78,14 @@ iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)static inline void iscsi_buf_init_sg (struct iscsi_buf *ibuf,struct scatterlist *sg) { - ibuf->sg.page = sg->page; +sg_init_table (&ibuf->sg,1 ); +sg_set_page (&ibuf->sg,sg_page (sg)); ibuf->sg.offset = sg->offset; ibuf->sg.length = sg->length;/* * Fastpath: sg element fits into single page */ -if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg->page)) +if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg_page (sg))) ibuf->use_sendmsg =0 ;else ibuf->use_sendmsg =1 ;
@@ -716,7 +715,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)for (i = tcp_ctask->sg_count; i <scsi_sg_count (sc); i++) {char *dest; - dest =kmap_atomic (sg[i].page,KM_SOFTIRQ0 ); + dest =kmap_atomic (sg_page (&sg[i]),KM_SOFTIRQ0 ); rc =iscsi_ctask_copy (tcp_conn, ctask, dest + sg[i].offset, sg[i].length, offset);kunmap_atomic (dest,KM_SOFTIRQ0 );
@@ -1103,9 +1102,9 @@ iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)* slab case. */ if (buf->use_sendmsg) - res =sock_no_sendpage (sk, buf->sg.page, offset, size, flags); + res =sock_no_sendpage (sk,sg_page (&buf->sg), offset, size, flags);else - res = tcp_conn->sendpage (sk, buf->sg.page, offset, size, flags); + res = tcp_conn->sendpage (sk,sg_page (&buf->sg), offset, size, flags);if (res >=0 ) { conn->txdata_octets += res;
drivers/scsi/megaraid.c +3 -3
@@ -658,7 +658,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)struct scatterlist *sg; sg =scsi_sglist (cmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memset (buf,0 , cmd->cmnd[4 ]);kunmap_atomic (buf - sg->offset,KM_IRQ0 );
@@ -1542,9 +1542,9 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)if ( cmd->cmnd[0 ] ==INQUIRY && !islogical ) { sgl =scsi_sglist (cmd); -if ( sgl->page ) { +if (sg_page (sgl) ) { c = *(unsigned char *) -page_address ((&sgl[0 ])->page) + +page_address ((sg_page (&sgl[0 ]))) + (&sgl[0 ])->offset; }else { printk(KERN_WARNING
drivers/scsi/megaraid/megaraid_mbox.c +4 -4
@@ -1584,9 +1584,9 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)caddr_t vaddr; sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { vaddr = (caddr_t) - (page_address ((&sgl[0 ])->page) + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset);memset (vaddr,0 , scp->cmnd[4 ]);
@@ -2328,9 +2328,9 @@ megaraid_mbox_dpc(unsigned long devp) && IS_RAID_CH(raid_dev, scb->dev_channel)) { sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { c = *(unsigned char *) - (page_address ((&sgl[0 ])->page) + + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset); }else { con_log(CL_ANN, (KERN_WARNING
drivers/scsi/osst.c +17 -15
@@ -542,7 +542,7 @@ static int osst_verify_frame(struct osst_tape * STp, int frame_seq_number, int qif (STp->raw) {if (STp->buffer->syscall_result) {for (i=0 ; i < STp->buffer->sg_segs; i++) -memset (page_address (STp->buffer->sg[i].page), +memset (page_address (sg_page (&STp->buffer->sg[i])),0 , STp->buffer->sg[i].length);strcpy (STp->buffer->b_data,"READ ERROR ON FRAME" ); }else
@@ -4437,7 +4437,7 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)for (i =0 , b_size =0 ; (i < STp->buffer->sg_segs) && ((b_size + STp->buffer->sg[i].length) <=OS_DATA_SIZE ); b_size += STp->buffer->sg[i++].length); - STp->buffer->aux = (os_aux_t *) (page_address (STp->buffer->sg[i].page) +OS_DATA_SIZE - b_size); + STp->buffer->aux = (os_aux_t *) (page_address (sg_page (&STp->buffer->sg[i])) +OS_DATA_SIZE - b_size);#if DEBUG printk (OSST_DEB_MSG "%s:D: b_data points to %p in segment 0 at %p\n" , name, STp->buffer->b_data,page_address (STp->buffer->sg[0 ].page));
@@ -5252,25 +5252,26 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)/* Try to allocate the first segment up to OS_DATA_SIZE and the others big enough to reach the goal (code assumes no segments in place) */ for (b_size =OS_DATA_SIZE , order =OSST_FIRST_ORDER ; b_size >=PAGE_SIZE ; order--, b_size /=2 ) { - STbuffer->sg[0 ].page =alloc_pages (priority, order); +struct page *page =alloc_pages (priority, order); + STbuffer->sg[0 ].offset =0 ; -if (STbuffer->sg[0 ].page !=NULL ) { +if (page !=NULL ) { +sg_set_page (&STbuffer->sg[0 ], page); STbuffer->sg[0 ].length = b_size; - STbuffer->b_data =page_address (STbuffer->sg[0 ].page); + STbuffer->b_data =page_address (page);break ; } } -if (STbuffer->sg[0 ].page ==NULL ) { +if (sg_page (&STbuffer->sg[0 ]) ==NULL ) {printk (KERN_NOTICE "osst :I: Can't allocate tape buffer main segment.\n" );return 0 ; }/* Got initial segment of 'bsize,order', continue with same size if possible, except for AUX */ for (segs=STbuffer->sg_segs=1 , got=b_size; segs < max_segs && got <OS_FRAME_SIZE ; ) { - STbuffer->sg[segs].page = -alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); +struct page *page =alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); STbuffer->sg[segs].offset =0 ; -if (STbuffer->sg[segs].page ==NULL ) { +if (page ==NULL ) {if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size /2 && order) { b_size /=2 ;/* Large enough for the rest of the buffers */ order--;
@@ -5284,6 +5285,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)normalize_buffer (STbuffer);return 0 ; } +sg_set_page (&STbuffer->sg[segs], page); STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <=PAGE_SIZE /2 ) ? (OS_FRAME_SIZE - got) : b_size; got += STbuffer->sg[segs].length; STbuffer->buffer_size = got;
@@ -5316,7 +5318,7 @@ static void normalize_buffer(struct osst_buffer *STbuffer) b_size < STbuffer->sg[i].length; b_size *= 2, order++); -__free_pages (STbuffer->sg[i].page, order); +__free_pages (sg_page (&STbuffer->sg[i]), order); STbuffer->buffer_size -= STbuffer->sg[i].length; }#if DEBUG
@@ -5344,7 +5346,7 @@ static int append_to_buffer(const char __user *ubp, struct osst_buffer *st_bp, ifor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_from_user (page_address (st_bp->sg[i].page) + offset, ubp, cnt); + res =copy_from_user (page_address (sg_page (&st_bp->sg[i])) + offset, ubp, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5377,7 +5379,7 @@ static int from_buffer(struct osst_buffer *st_bp, char __user *ubp, int do_countfor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_to_user (ubp,page_address (st_bp->sg[i].page) + offset, cnt); + res =copy_to_user (ubp,page_address (sg_page (&st_bp->sg[i])) + offset, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5410,7 +5412,7 @@ static int osst_zero_buffer_tail(struct osst_buffer *st_bp) i < st_bp->sg_segs && do_count > 0; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count ; -memset (page_address (st_bp->sg[i].page) + offset,0 , cnt); +memset (page_address (sg_page (&st_bp->sg[i])) + offset,0 , cnt); do_count -= cnt; offset =0 ; }
@@ -5430,7 +5432,7 @@ static int osst_copy_to_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (page_address (st_bp->sg[i].page), ptr, cnt); +memcpy (page_address (sg_page (&st_bp->sg[i])), ptr, cnt); do_count -= cnt; ptr += cnt; }
@@ -5451,7 +5453,7 @@ static int osst_copy_from_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (ptr,page_address (st_bp->sg[i].page), cnt); +memcpy (ptr,page_address (sg_page (&st_bp->sg[i])), cnt); do_count -= cnt; ptr += cnt; }
drivers/scsi/pcmcia/sym53c500_cs.c +3 -3
@@ -443,7 +443,7 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_write (fast_pio, port_base, -page_address (sg->page) + sg->offset, +page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 (port_base);
@@ -463,8 +463,8 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_read (fast_pio, port_base, -page_address (sg->page) + sg->offset, - sg->length); +page_address (sg_page (sg)) + sg->offset, + sg->length); }REG0 (port_base); }
drivers/scsi/ppa.c +2 -2
@@ -609,7 +609,7 @@ static int ppa_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; } }
@@ -756,7 +756,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)/* if many buffers are available, start filling the first */ cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page) + + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/qlogicfas408.c +1 -1
@@ -317,7 +317,7 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)return ((priv->qabort ==1 ?DID_ABORT :DID_RESET ) <<16 ); } - buf =page_address (sg->page) + sg->offset; + buf =page_address (sg_page (sg)) + sg->offset;if (ql_pdma (priv, phase, buf, sg->length))break ; }
drivers/scsi/scsi_debug.c +2 -2
@@ -625,7 +625,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,scsi_for_each_sg (scp, sg, scp->use_sg, k) {if (active) { kaddr = (unsigned char *) -kmap_atomic (sg->page,KM_USER0 ); +kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return (DID_ERROR <<16 ); kaddr_off = (unsigned char *)kaddr + sg->offset;
@@ -672,7 +672,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr, sg =scsi_sglist (scp); req_len = fin =0 ;for (k =0 ; k < scp->use_sg; ++k, sg =sg_next (sg)) { - kaddr = (unsigned char *)kmap_atomic (sg->page,KM_USER0 ); + kaddr = (unsigned char *)kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return -1 ; kaddr_off = (unsigned char *)kaddr + sg->offset;
drivers/scsi/scsi_lib.c +10 -3
@@ -295,7 +295,7 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,int i, err, nr_vecs =0 ;for_each_sg (sgl, sg, nsegs, i) { - page = sg->page; + page =sg_page (sg); off = sg->offset; len = sg->length; data_len += len;
@@ -764,7 +764,7 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)if (unlikely (!sgl)) goto enomem; -memset (sgl,0 ,sizeof (*sgl) * sgp->size); +sg_init_table (sgl, sgp->size);/* * first loop through, set initial index and return value
@@ -781,6 +781,13 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)sg_chain (prev,SCSI_MAX_SG_SEGMENTS , sgl);/* +* if we have nothing left, mark the last segment as +* end-of-list +*/ +if (!left) +sg_mark_end (sgl, this); + +/* * don't allow subsequent mempool allocs to sleep, it would * violate the mempool principle. */
@@ -2353,7 +2360,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count, *offset = *offset - len_complete + sg->offset;/* Assumption: contiguous pages can be accessed as "page + i" */ - page =nth_page (sg->page, (*offset >>PAGE_SHIFT )); + page =nth_page (sg_page (sg), (*offset >>PAGE_SHIFT )); *offset &= ~PAGE_MASK ;/* Bytes in this sg-entry from *offset to the end of the page */
drivers/scsi/sg.c +15 -15
@@ -1169,7 +1169,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length;if (offset < len) { - page =virt_to_page (page_address (sg->page) + offset); + page =virt_to_page (page_address (sg_page (sg)) + offset);get_page (page);/* increment page count */ break ; }
@@ -1717,13 +1717,13 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,goto out_unlock; */ } - sgl[0 ].page = pages[0 ]; +sg_set_page (sgl, pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { - sgl[i].page = pages[i]; +sg_set_page (&sgl[i], pages[i]); sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -1754,7 +1754,7 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,int i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
@@ -1854,7 +1854,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) scatter_elem_sz_prev = ret_sz; } } - sg->page = p; +sg_set_page (sg, p); sg->length = (ret_sz > num) ? num : ret_sz; SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
@@ -1907,14 +1907,14 @@ sg_write_xfer(Sg_request * srp) onum =1 ; ksglen = sg->length; - p =page_address (sg->page); + p =page_address (sg_page (sg));for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,1 , &usglen, &up);if (res)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -1991,12 +1991,12 @@ sg_remove_scat(Sg_scatter_hold * schp) }else {int k; -for (k =0 ; (k < schp->k_use_sg) && sg->page; +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) {SCSI_LOG_TIMEOUT (5 ,printk ("sg_remove_scat: k=%d, pg=0x%p, len=%d\n" , - k, sg->page, sg->length)); -sg_page_free (sg->page, sg->length); + k,sg_page (sg), sg->length)); +sg_page_free (sg_page (sg), sg->length); } }kfree (schp->buffer);
@@ -2038,7 +2038,7 @@ sg_read_xfer(Sg_request * srp) }else onum =1 ; - p =page_address (sg->page); + p =page_address (sg_page (sg)); ksglen = sg->length;for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,0 , &usglen, &up);
@@ -2046,7 +2046,7 @@ sg_read_xfer(Sg_request * srp)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -2092,15 +2092,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)if ((!outp) || (num_read_xfer <=0 ))return 0 ; -for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, sg =sg_next (sg)) { +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) { num = sg->length;if (num > num_read_xfer) { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num_read_xfer))return -EFAULT ;break ; }else { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num))return -EFAULT ; num_read_xfer -= num;
drivers/scsi/st.c +4 -4
@@ -3797,7 +3797,7 @@ static void buf_to_sg(struct st_buffer *STbp, unsigned int length) sg = &(STbp->sg[0 ]); frp = STbp->frp;for (i=count=0 ; count < length; i++) { - sg[i].page = frp[i].page; +sg_set_page (&sg[i], frp[i].page);if (length - count > frp[i].length) sg[i].length = frp[i].length;else
@@ -4446,14 +4446,14 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa }/* Populate the scatter/gather list */ - sgl[0 ].page = pages[0 ]; +sg_set_page (&sgl[0 ], pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { +sg_set_page (&sgl[i], pages[i]);; sgl[i].offset =0 ; - sgl[i].page = pages[i]; sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -4483,7 +4483,7 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pint i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
drivers/scsi/tmscsim.c +1 -4
@@ -430,10 +430,7 @@ static __inline__ void dc390_Going_remove (struct dc390_dcb* pDCB, struct dc390_static struct scatterlist *dc390_sg_build_single (struct scatterlist *sg,void *addr,unsigned int length) { -memset (sg,0 ,sizeof (struct scatterlist )); - sg->page =virt_to_page (addr); - sg->length = length; - sg->offset = (unsigned long )addr & ~PAGE_MASK ; +sg_init_one (sg, addr, length);return sg; }
drivers/scsi/ultrastor.c +1 -1
@@ -681,7 +681,7 @@ static inline void build_sg_list(struct mscp *mscp, struct scsi_cmnd *SCpnt) max =scsi_sg_count (SCpnt);scsi_for_each_sg (SCpnt, sg, max, i) { - mscp->sglist[i].address =isa_page_to_bus (sg->page) + sg->offset; + mscp->sglist[i].address =isa_page_to_bus (sg_page (sg)) + sg->offset; mscp->sglist[i].num_bytes = sg->length; transfer_length += sg->length; }
drivers/scsi/wd7000.c +1 -1
@@ -1123,7 +1123,7 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,any2scsi (scb->maxlen, nseg *sizeof (Sgb));scsi_for_each_sg (SCpnt, sg, nseg, i) { -any2scsi (sgb[i].ptr,isa_page_to_bus (sg->page) + sg->offset); +any2scsi (sgb[i].ptr,isa_page_to_bus (sg_page (sg)) + sg->offset);any2scsi (sgb[i].len, sg->length); } }else {
drivers/usb/core/message.c +2 -2
@@ -438,12 +438,12 @@ int usb_sg_init ( io->urbs[i]->transfer_buffer =NULL ;#else io->urbs[i]->transfer_buffer = -page_address (sg[i].page) + sg[i].offset; +page_address (sg_page (&sg[i])) + sg[i].offset;#endif }else {/* hc may use _only_ transfer_buffer */ io->urbs [i]->transfer_buffer = -page_address (sg [i].page) + sg [i].offset; +page_address (sg_page (&sg[i])) + sg [i].offset; len = sg [i].length; }
drivers/usb/image/microtek.c +2 -2
@@ -519,7 +519,7 @@ static void mts_do_sg (struct urb* transfer) context->fragment++; mts_int_submit_urb(transfer, context->data_pipe, - page_address(sg[context->fragment].page) + + page_address(sg_page(&sg[context->fragment])) + sg[context->fragment].offset, sg[context->fragment].length, context->fragment + 1 == scsi_sg_count(context->srb) ?
@@ -557,7 +557,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)return ; }else { sg =scsi_sglist (srb); - desc->context.data =page_address (sg[0 ].page) + sg[0 ].offset; + desc->context.data =page_address (sg_page (&sg[0 ])) + sg[0 ].offset; desc->context.data_length = sg[0 ].length; }
drivers/usb/misc/usbtest.c +3 -2
@@ -360,9 +360,10 @@ static void free_sglist (struct scatterlist *sg, int nents)if (!sg)return ;for (i =0 ; i < nents; i++) { -if (!sg [i].page) +struct page *page =sg_page (&sg[i]); +if (!page)continue ; -kfree (page_address (sg [i].page) + sg [i].offset); +kfree (page_address (page) + sg [i].offset); }kfree (sg); }
drivers/usb/storage/protocol.c +1 -1
@@ -195,7 +195,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,* the *offset and *index values for the next loop. */ cnt =0 ;while (cnt < buflen) { -struct page *page = sg->page + +struct page *page =sg_page (sg) + ((sg->offset + *offset) >>PAGE_SHIFT );unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE -1 );
fs/ecryptfs/crypto.c +11 -5
@@ -283,7 +283,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, pg =virt_to_page (addr); offset =offset_in_page (addr);if (sg) { - sg[i].page = pg; +sg_set_page (&sg[i], pg); sg[i].offset = offset; } remainder_of_page =PAGE_CACHE_SIZE - offset;
@@ -713,10 +713,13 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return encrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
@@ -742,10 +745,13 @@ ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return decrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
fs/ecryptfs/keystore.c +3 -0
@@ -1040,6 +1040,9 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, };int rc =0 ; +sg_init_table (&dst_sg,1 ); +sg_init_table (&src_sg,1 ); +if (unlikely (ecryptfs_verbosity >0 )) { ecryptfs_printk( KERN_DEBUG, "Session key encryption key (size [%d]):\n",
fs/nfsd/nfs4recover.c +3 -5
@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) {struct xdr_netobj cksum;struct hash_desc desc; -struct scatterlist sg[1 ]; +struct scatterlist sg;__be32 status = nfserr_resource; dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
@@ -102,11 +102,9 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)if (cksum.data ==NULL ) goto out; - sg[0 ].page =virt_to_page (clname->data); - sg[0 ].offset =offset_in_page (clname->data); - sg[0 ].length = clname->len; +sg_init_one (&sg, clname->data, clname->len); -if (crypto_hash_digest (&desc, sg, sg->length, cksum.data)) +if (crypto_hash_digest (&desc, &sg, sg.length, cksum.data)) goto out;md5_to_hex (dname, cksum.data);
include/asm-alpha/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-arm/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page;/* buffer page */ +unsigned long page_link;unsigned int offset;/* buffer offset */ dma_addr_t dma_address;/* dma address */ unsigned int length;/* length */
include/asm-avr32/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-blackfin/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/mm.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-cris/scatterlist.h +1 -1
@@ -6,7 +6,7 @@ struct scatterlist {unsigned int length;/* The following is i386 highmem junk - not used by us */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ };
include/asm-frv/scatterlist.h +1 -1
@@ -22,7 +22,7 @@* and that's it. There's no excuse for not highmem enabling YOUR driver. /jens */ struct scatterlist { -struct page *page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-h8300/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-ia64/scatterlist.h +1 -1
@@ -9,7 +9,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;/* buffer length */
include/asm-m32r/scatterlist.h +1 -1
@@ -6,7 +6,7 @@struct scatterlist {char * address;/* Location data is to be transferred to, NULL for * highmem page */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-m68k/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-m68knommu/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-mips/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-parisc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-powerpc/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/dma.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-s390/scatterlist.h +1 -1
@@ -2,7 +2,7 @@#define _ASMS390_SCATTERLIST_Hstruct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length; };
include/asm-sh/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sh64/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sparc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-sparc64/scatterlist.h +4 -1
@@ -6,7 +6,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-v850/scatterlist.h +1 -1
@@ -17,7 +17,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned offset;dma_addr_t dma_address;unsigned length;
include/asm-x86/dma-mapping_32.h +2 -2
@@ -45,9 +45,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,WARN_ON (nents ==0 || sglist[0 ].length ==0 );for_each_sg (sglist, sg, nents, i) { -BUG_ON (!sg->page); +BUG_ON (!sg_page (sg)); - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset; }flush_write_buffers ();
include/asm-x86/scatterlist_32.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-x86/scatterlist_64.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;dma_addr_t dma_address;
include/asm-xtensa/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/linux/scatterlist.h +125 -15
181 lines not on this page · raw message
lib/Kconfig.debug +10 -0
@@ -389,6 +389,16 @@ config DEBUG_LIST If unsure, say N. +config DEBUG_SG + bool "Debug SG table operations" + depends on DEBUG_KERNEL + help + Enable this to turn on checks on scatter-gather tables. This can + help find problems with drivers that do not properly initialize + their sg tables. + + If unsure, say N. + config FRAME_POINTER bool "Compile the kernel with frame pointers" depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BFIN)
lib/swiotlb.c +1 -1
@@ -35,7 +35,7 @@#define OFFSET (val,align) ((unsigned long) \ ( (val) & ( (align) - 1))) -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (sg) virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))/*
net/core/skbuff.c +2 -2
@@ -2045,7 +2045,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy >0 ) {if (copy > len) copy = len; - sg[elt].page =virt_to_page (skb->data + offset); +sg_set_page (&sg[elt],virt_to_page (skb->data + offset)); sg[elt].offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg[elt].length = copy; elt++;
@@ -2065,7 +2065,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy > len) copy = len; - sg[elt].page = frag->page; +sg_set_page (&sg[elt], frag->page); sg[elt].offset = frag->page_offset+offset-start; sg[elt].length = copy; elt++;
net/ieee80211/ieee80211_crypt_tkip.c +5 -8
@@ -390,9 +390,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (tkey->tx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -485,9 +483,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -12 ;crypto_blkcipher_setkey (tkey->rx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 )) {if (net_ratelimit ()) { printk(KERN_DEBUG ": TKIP: failed to decrypt "
@@ -539,11 +535,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,printk (KERN_WARNING "michael_mic: tfm_michael == NULL\n" );return -1 ; } - sg[0 ].page =virt_to_page (hdr); +sg_init_table (sg,2 ); +sg_set_page (&sg[0 ],virt_to_page (hdr)); sg[0 ].offset =offset_in_page (hdr); sg[0 ].length =16 ; - sg[1 ].page =virt_to_page (data); +sg_set_page (&sg[1 ],virt_to_page (data)); sg[1 ].offset =offset_in_page (data); sg[1 ].length = data_len;
net/ieee80211/ieee80211_crypt_wep.c +2 -6
@@ -170,9 +170,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (wep->tx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -212,9 +210,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -8 ;crypto_blkcipher_setkey (wep->rx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 ))return -7 ;
net/mac80211/wep.c +2 -6
@@ -138,9 +138,7 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, *icv =cpu_to_le32 (~crc32_le (~0 , data, data_len));crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_encrypt (&desc, &sg, &sg, sg.length); }
@@ -204,9 +202,7 @@ int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,__le32 crc;crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_decrypt (&desc, &sg, &sg, sg.length); crc =cpu_to_le32 (~crc32_le (~0 , data, data_len));
net/sctp/auth.c +2 -1
@@ -726,7 +726,8 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,/* set up scatter list */ end =skb_tail_pointer (skb); - sg.page =virt_to_page (auth); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (auth)); sg.offset = (unsigned long )(auth) %PAGE_SIZE ; sg.length = end - (unsigned char *)auth;
net/sctp/sm_make_chunk.c +4 -2
@@ -1513,7 +1513,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,struct hash_desc desc;/* Sign the message. */ - sg.page =virt_to_page (&cookie->c); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (&cookie->c)); sg.offset = (unsigned long )(&cookie->c) %PAGE_SIZE ; sg.length = bodysize; keylen =SCTP_SECRET_SIZE ;
@@ -1585,7 +1586,8 @@ struct sctp_association *sctp_unpack_cookie(/* Check the signature. */ keylen =SCTP_SECRET_SIZE ; - sg.page =virt_to_page (bear_cookie); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (bear_cookie)); sg.offset = (unsigned long )(bear_cookie) %PAGE_SIZE ; sg.length = bodysize; key = (char *)ep->secret_key[ep->current_key];
net/sunrpc/auth_gss/gss_krb5_crypto.c +5 -5
@@ -197,9 +197,9 @@ encryptor(struct scatterlist *sg, void *data)int i = (page_pos + outbuf->page_base) >>PAGE_CACHE_SHIFT ; in_page = desc->pages[i]; }else { - in_page = sg->page; + in_page =sg_page (sg); } - desc->infrags[desc->fragno].page = in_page; +sg_set_page (&desc->infrags[desc->fragno], in_page); desc->fragno++; desc->fraglen += sg->length; desc->pos += sg->length;
@@ -215,11 +215,11 @@ encryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->outfrags[0 ].page = sg->page; +sg_set_page (&desc->outfrags[0 ],sg_page (sg)); desc->outfrags[0 ].offset = sg->offset + sg->length - fraglen; desc->outfrags[0 ].length = fraglen; desc->infrags[0 ] = desc->outfrags[0 ]; - desc->infrags[0 ].page = in_page; +sg_set_page (&desc->infrags[0 ], in_page); desc->fragno =1 ; desc->fraglen = fraglen; }else {
@@ -287,7 +287,7 @@ decryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->frags[0 ].page = sg->page; +sg_set_page (&desc->frags[0 ],sg_page (sg)); desc->frags[0 ].offset = sg->offset + sg->length - fraglen; desc->frags[0 ].length = fraglen; desc->fragno =1 ;
net/sunrpc/xdr.c +1 -1
@@ -1059,7 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, do { if (thislen > page_len) thislen = page_len; - sg->page = buf->pages[i]; + sg_set_page(sg, buf->pages[i]); sg->offset = page_offset; sg->length = thislen; ret = actor(sg, data);
net/xfrm/xfrm_algo.c +2 -2
@@ -552,7 +552,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page =virt_to_page (skb->data + offset); +sg_set_page (&sg,virt_to_page (skb->data + offset)); sg.offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg.length = copy;
@@ -577,7 +577,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page = frag->page; +sg_set_page (&sg, frag->page); sg.offset = frag->page_offset + offset-start; sg.length = copy;
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 25 lines · Jens Axboe
Quoted 12 lines · Benny Halevy
Quoted 11 lines · Jens Axboe
Quoted 10 lines · Jens Axboe
Quoted 9 lines · Benny Halevy
Review static inline struct scatterlist *sg_last(struct scatterlist *sgl, · line 100
Quoted 8 lines
(quoted diff) +2
-0return sg; }@@ -83,6 +96,9 @@ static inline struct scatterlist *sg_last(struct scatterlist *sgl, ret = sg; #endif +#ifdef CONFIG_DEBUG_SG + BUG_ON(sgl[0].sg_magic != SG_MAGIC);can it also do BUG_ON(!sg_is_last(sg))?
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
That would make sense, definitely. I'll add that.
BUG_ON(!sg_is_last(ret));it should be, not sg. That's what I merged.
right. of course.
OK, that found something interesting - mapping a request may shrink it, so we need to update the end marker to move it earlier in the list. Basically just a
Quoted 5 lines
if (sg) __sg_mark_end(sg);at the bottom of
blk_rq_map_sg(). Updated patch below, booted on other machines now as well without incident.
PPC needs this. I'm guessing other arches might too. Otherwise seems to boot and work well (with Jeff's sata patch).
Thanks,
-Olof
include/asm-powerpc/scatterlist.h +3 -0
@@ -14,6 +14,9 @@#include <asm/dma.h> struct scatterlist { +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif unsigned long page_link;unsigned int offset;unsigned int length;
Re: [bug] ata subsystem related crash with latest -git
Quoted 26 lines · Olof Johansson
Quoted 25 lines · Jens Axboe
Quoted 12 lines · Benny Halevy
Quoted 11 lines · Jens Axboe
Quoted 10 lines · Jens Axboe
Quoted 9 lines · Benny Halevy
Review static inline struct scatterlist *sg_last(struct scatterlist *sgl, · line 100
Quoted 8 lines
(quoted diff) +2
-0return sg; }@@ -83,6 +96,9 @@ static inline struct scatterlist *sg_last(struct scatterlist *sgl, ret = sg; #endif +#ifdef CONFIG_DEBUG_SG + BUG_ON(sgl[0].sg_magic != SG_MAGIC);can it also do BUG_ON(!sg_is_last(sg))?
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
That would make sense, definitely. I'll add that.
BUG_ON(!sg_is_last(ret));it should be, not sg. That's what I merged.
right. of course.
OK, that found something interesting - mapping a request may shrink it, so we need to update the end marker to move it earlier in the list. Basically just a
Quoted 8 lines
Quoted 5 lines
if (sg) __sg_mark_end(sg);at the bottom of
blk_rq_map_sg(). Updated patch below, booted on other machines now as well without incident.PPC needs this. I'm guessing other arches might too. Otherwise seems to boot and work well (with Jeff's sata patch).
Oh duh, indeed I didn't add that to the archs when converting. Thanks for the patch, I'll update the rest as well.
And thanks a lot for boot testing it!
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens AxboeQuoted 9 lines · Jens Axboe
Quoted 8 lines · Jens Axboe
Quoted 7 lines · David Miller
From: Jens Axboe <[email protected]>
Date: Thu, 18 Oct 2007 13:57:02 +0200Quoted 3 lines
Thanks a lot, Dave! The patch is a monster right now, I'll work on splitting it into a 3-step process. Any arch help is greatly appreciated.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I have some other bits that my compile hit, such as some things in the crypto layer.
Yeah, I have tons of that so far. I hope to have an allyesconfig compiling pretty soonish, will send that out then.
OK here goes, this compiles with allyesconfig on x86-64. Not too bad, the scsi/ drivers were by far the worst.
Alright, small modifications and tested somewhat. It boots on my laptop just fine (CONFIG_DEBUG_SG is set) without warnings. Also tested with PAGEALLOC set, that also boots and works fine without issue.
So if this is what we want, the question is how to proceed. Right now i386 and x86-64 works, sparc64 PROBABLY works but is not tested. Any other arch will NOT compile, since it's not converted to use page_link. I'll try and do ppc64 now.
arch/sparc64/kernel/iommu.c +2 -2
@@ -473,7 +473,7 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static void fill_sg(iopte_t *iopte, struct scatterlist *sg, int nused, int nelems,
@@ -566,7 +566,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4u_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/sparc64/kernel/iommu_common.c +6 -6
@@ -73,7 +73,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, daddr = dma_sg->dma_address; sglen = sg->length; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);while (dlen >0 ) {unsigned long paddr;
@@ -123,7 +123,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, sg =sg_next (sg);if (--nents <=0 )break ; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); sglen = sg->length; }if (dlen <0 ) {
@@ -191,7 +191,7 @@ void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npprintk ("sg(%d): page_addr(%p) off(%x) length(%x) " "dma_address[%016x] dma_length[%016x]\n" , i, -page_address (sg->page), sg->offset, +page_address (sg_page (sg)), sg->offset, sg->length, sg->dma_address, sg->dma_length); }
@@ -207,15 +207,15 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)unsigned long prev;u32 dent_addr, dent_len; - prev = (unsigned long ) (page_address (sg->page) + sg->offset); + prev = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); prev += (unsigned long ) (dent_len = sg->length); - dent_addr = (u32) ((unsigned long )(page_address (sg->page) + sg->offset) + dent_addr = (u32) ((unsigned long )(page_address (sg_page (sg)) + sg->offset) & (IO_PAGE_SIZE -1UL ));while (--nents) {unsigned long addr; sg =sg_next (sg); - addr = (unsigned long ) (page_address (sg->page) + sg->offset); + addr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);if (!VCONTIG (prev, addr)) { dma_sg->dma_address = dent_addr; dma_sg->dma_length = dent_len;
arch/sparc64/kernel/pci_sun4v.c +2 -2
@@ -366,7 +366,7 @@ static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static long fill_sg(long entry, struct device *dev, struct scatterlist *sg,
@@ -478,7 +478,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4v_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/x86/kernel/pci-calgary_64.c +8 -4
@@ -411,8 +411,10 @@ static int calgary_nontranslate_map_sg(struct device* dev,int i;for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +struct page *p =sg_page (s); + +BUG_ON (!p); + s->dma_address =virt_to_bus (page_address (p) + s->offset); s->dma_length = s->length; }return nelems;
@@ -432,9 +434,11 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,return calgary_nontranslate_map_sg (dev, sg, nelems, direction);for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); +struct page *p =sg_page (s); + +BUG_ON (!p); - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (p) + s->offset; npages =num_dma_pages (vaddr, s->length); entry =iommu_range_alloc (tbl, npages);
arch/x86/kernel/pci-gart_64.c +2 -2
@@ -302,7 +302,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,#endif for_each_sg (sg, s, nents, i) { -unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;if (nonforced_iommu (dev, addr, s->length)) { addr =dma_map_area (dev, addr, s->length, dir);if (addr == bad_dma_address) {
@@ -397,7 +397,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, start_sg = sgmap = sg; ps =NULL ;/* shut up gcc */ for_each_sg (sg, s, nents, i) { -dma_addr_t addr =page_to_phys (s->page) + s->offset; +dma_addr_t addr =page_to_phys (sg_page (s)) + s->offset; s->dma_address = addr;BUG_ON (s->length ==0 );
arch/x86/kernel/pci-nommu_64.c +2 -2
@@ -62,8 +62,8 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,int i;for_each_sg (sg, s, nents, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +BUG_ON (!sg_page (s)); + s->dma_address =virt_to_bus (page_address (sg_page (s)) +s->offset);if (!check_addr ("map_sg" , hwdev, s->dma_address, s->length))return 0 ; s->dma_length = s->length;
block/ll_rw_blk.c +3 -2
@@ -1354,8 +1354,9 @@ new_segment:else sg =sg_next (sg); -memset (sg,0 ,sizeof (*sg)); - sg->page = bvec->bv_page; +sg_dma_len (sg) =0 ; +sg_dma_address (sg) =0 ; +sg_set_page (sg, bvec->bv_page); sg->length = nbytes; sg->offset = bvec->bv_offset; nsegs++;
crypto/digest.c +1 -1
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,return 0 ;for (;;) { -struct page *pg = sg->page; +struct page *pg =sg_page (sg);unsigned int offset = sg->offset;unsigned int l = sg->length;
crypto/hmac.c +2 -1
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg, desc.flags = pdesc->flags &CRYPTO_TFM_REQ_MAY_SLEEP ;sg_set_buf (sg1, ipad, bs); - sg1[1 ].page = (void *)sg; + +sg_set_page (&sg[1 ], (void *) sg); sg1[1 ].length =0 ;sg_set_buf (sg2, opad, bs + ds);
crypto/scatterwalk.c +1 -1
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,if (out) {struct page *page; - page = walk->sg->page + ((walk->offset -1 ) >>PAGE_SHIFT ); + page =sg_page (walk->sg) + ((walk->offset -1 ) >>PAGE_SHIFT );flush_dcache_page (page); }
crypto/scatterwalk.h +3 -3
@@ -22,13 +22,13 @@static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg) { -return (++sg)->length ? sg : (void *)sg->page; +return (++sg)->length ? sg : (void *)sg_page (sg); }static inline unsigned long scatterwalk_samebuf (struct scatter_walk *walk_in,struct scatter_walk *walk_out) { -return !(((walk_in->sg->page - walk_out->sg->page) <<PAGE_SHIFT ) + +return !(((sg_page (walk_in->sg) -sg_page (walk_out->sg)) <<PAGE_SHIFT ) + (int )(walk_in->offset - walk_out->offset)); }
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,static inline struct page *scatterwalk_page (struct scatter_walk *walk) { -return walk->sg->page + (walk->offset >>PAGE_SHIFT ); +return sg_page (walk->sg) + (walk->offset >>PAGE_SHIFT ); }static inline void scatterwalk_unmap (void *vaddr,int out)
crypto/tcrypt.c +2 -2
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc, goto out; } - q =kmap (sg[0 ].page) + sg[0 ].offset; + q =kmap (sg_page (&sg[0 ])) + sg[0 ].offset;hexdump (q, cipher_tv[i].rlen); printk("%s\n",
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc, temp =0 ;for (k =0 ; k < cipher_tv[i].np; k++) {printk ("page %u\n" , k); - q =kmap (sg[k].page) + sg[k].offset; + q =kmap (sg_page (&sg[k])) + sg[k].offset;hexdump (q, cipher_tv[i].tap[k]); printk("%s\n", memcmp(q, cipher_tv[i].result + temp,
crypto/xcbc.c +1 -1
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, do { - struct page *pg = sg[i].page; + struct page *pg = sg_page(&sg[i]); unsigned int offset = sg[i].offset; unsigned int slen = sg[i].length;
drivers/ata/libata-core.c +5 -5
@@ -4296,7 +4296,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc)sg_last (sg, qc->orig_n_elem)->length += qc->pad_len;if (pad_buf) {struct scatterlist *psg = &qc->pad_sgent; -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (addr + psg->offset, pad_buf, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4686,11 +4686,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)* data in this function or read data in ata_sg_clean. */ offset = lsg->offset + lsg->length - qc->pad_len; - psg->page =nth_page (lsg->page, offset >>PAGE_SHIFT ); +sg_set_page (psg,nth_page (sg_page (lsg), offset >>PAGE_SHIFT )); psg->offset =offset_in_page (offset);if (qc->tf.flags &ATA_TFLAG_WRITE ) { -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (pad_buf, addr + psg->offset, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4836,7 +4836,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ; - page = qc->cursg->page; + page =sg_page (qc->cursg); offset = qc->cursg->offset + qc->cursg_ofs;/* get the current page and offset */
@@ -4988,7 +4988,7 @@ next_sg: sg = qc->cursg; - page = sg->page; + page =sg_page (sg); offset = sg->offset + qc->cursg_ofs;/* get the current page and offset */
drivers/ata/libata-scsi.c +1 -1
@@ -1544,7 +1544,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)struct scatterlist *sg =scsi_sglist (cmd);if (sg) { - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; buflen = sg->length; }else { buf =NULL ;
drivers/block/cciss.c +2 -2
@@ -2610,7 +2610,7 @@ static void do_cciss_request(struct request_queue *q) (int)creq->nr_sectors);#endif /* CCISS_DEBUG */ -memset (tmp_sg,0 ,sizeof (tmp_sg)); +sg_init_table (tmp_sg,MAXSGENTRIES ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* get the DMA records for the setup */
@@ -2621,7 +2621,7 @@ static void do_cciss_request(struct request_queue *q)for (i =0 ; i < seg; i++) { c->SG[i].Len = tmp_sg[i].length; - temp64.val = (__u64 )pci_map_page (h->pdev, tmp_sg[i].page, + temp64.val = (__u64 )pci_map_page (h->pdev,sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); c->SG[i].Addr.lower = temp64.val32.lower;
drivers/block/cpqarray.c +2 -1
@@ -918,6 +918,7 @@ queue_next:DBGPX ( printk("sector=%d, nr_sectors=%d\n", creq->sector, creq->nr_sectors); ); +sg_init_table (tmp_sg,SG_MAX ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* Now do all the DMA Mappings */
@@ -929,7 +930,7 @@ DBGPX( { c->req.sg[i].size = tmp_sg[i].length; c->req.sg[i].addr = (__u32 )pci_map_page (h->pci_dev, - tmp_sg[i].page, +sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); }
drivers/block/cryptoloop.c +8 -4
@@ -26,6 +26,7 @@#include <linux/crypto.h> #include <linux/blkdev.h> #include <linux/loop.h> +#include <linux/scatterlist.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -119,14 +120,17 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, .tfm = tfm, .flags = CRYPTO_TFM_REQ_MAY_SLEEP, }; -struct scatterlist sg_out = {NULL , }; -struct scatterlist sg_in = {NULL , }; +struct scatterlist sg_out; +struct scatterlist sg_in;encdec_cbc_t encdecfunc;struct page *in_page, *out_page;unsigned in_offs, out_offs;int err; +sg_init_table (&sg_out,1 ); +sg_init_table (&sg_in,1 ); +if (cmd ==READ ) { in_page = raw_page; in_offs = raw_off;
@@ -146,11 +150,11 @@ cryptoloop_transfer(struct loop_device *lo, int cmd,u32 iv[4 ] = {0 , }; iv[0 ] =cpu_to_le32 (IV &0xffffffff ); - sg_in.page = in_page; +sg_set_page (&sg_in, in_page); sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = out_page; +sg_set_page (&sg_out, out_page); sg_out.offset = out_offs; sg_out.length = sz;
drivers/block/ub.c +5 -3
@@ -25,6 +25,7 @@#include <linux/usb_usual.h> #include <linux/blkdev.h> #include <linux/timer.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #define DRV_NAME "ub"
@@ -656,6 +657,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)if ((cmd =ub_get_cmd (lun)) ==NULL )return -1 ;memset (cmd,0 ,sizeof (struct ub_scsi_cmd )); +sg_init_table (cmd->sgv,UB_MAX_REQ_SG );blkdev_dequeue_request (rq);
@@ -1310,7 +1312,7 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) pipe = sc->send_bulk_pipe; sc->last_pipe = pipe;usb_fill_bulk_urb (&sc->work_urb, sc->dev, pipe, -page_address (sg->page) + sg->offset, sg->length, +page_address (sg_page (sg)) + sg->offset, sg->length, ub_urb_complete, sc); sc->work_urb.actual_length =0 ; sc->work_urb.error_count =0 ;
@@ -1427,7 +1429,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd) scmd->state =UB_CMDST_INIT ; scmd->nsg =1 ; sg = &scmd->sgv[0 ]; - sg->page =virt_to_page (sc->top_sense); +sg_set_page (sg,virt_to_page (sc->top_sense)); sg->offset = (unsigned long )sc->top_sense & (PAGE_SIZE -1 ); sg->length =UB_SENSE_SIZE ; scmd->len =UB_SENSE_SIZE ;
@@ -1863,7 +1865,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, cmd->state =UB_CMDST_INIT ; cmd->nsg =1 ; sg = &cmd->sgv[0 ]; - sg->page =virt_to_page (p); +sg_set_page (sg,virt_to_page (p)); sg->offset = (unsigned long )p & (PAGE_SIZE -1 ); sg->length =8 ; cmd->len =8 ;
drivers/ide/ide-probe.c +3 -1
@@ -1337,12 +1337,14 @@ static int hwif_init(ide_hwif_t *hwif)if (!hwif->sg_max_nents) hwif->sg_max_nents =PRD_ENTRIES ; - hwif->sg_table =kzalloc (sizeof (struct scatterlist )*hwif->sg_max_nents, + hwif->sg_table =kmalloc (sizeof (struct scatterlist )*hwif->sg_max_nents,GFP_KERNEL );if (!hwif->sg_table) {printk (KERN_ERR "%s: unable to allocate SG table.\n" , hwif->name); goto out; } + +sg_init_table (hwif->sg_table, hwif->sg_max_nents);if (init_irq (hwif) ==0 ) goto done;
drivers/ide/ide-taskfile.c +1 -1
@@ -278,7 +278,7 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) hwif->cursg = sg; } - page = cursg->page; + page =sg_page (cursg); offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */
drivers/ieee1394/dma.c +1 -1
@@ -111,7 +111,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,unsigned long va = (unsigned long )dma->kvirt + (i <<PAGE_SHIFT ); - dma->sglist[i].page =vmalloc_to_page ((void *)va); +sg_set_page (&dma->sglist[i],vmalloc_to_page ((void *)va)); dma->sglist[i].length =PAGE_SIZE ; }
drivers/ieee1394/sbp2.c +1 -1
@@ -1466,7 +1466,7 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, cmd->dma_size = sgpnt[0 ].length; cmd->dma_type =CMD_DMA_PAGE ; cmd->cmd_dma =dma_map_page (hi->host->device.parent, - sgpnt[0 ].page, sgpnt[0 ].offset, +sg_page (&sgpnt[0 ]), sgpnt[0 ].offset, cmd->dma_size, cmd->dma_dir); orb->data_descriptor_lo = cmd->cmd_dma;
drivers/infiniband/core/umem.c +7 -4
@@ -55,9 +55,11 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dib_dma_unmap_sg (dev, chunk->page_list, chunk->nents,DMA_BIDIRECTIONAL );for (i =0 ; i < chunk->nents; ++i) { +struct page *page =sg_page (&chunk->page_list[i]); +if (umem->writable && dirty) -set_page_dirty_lock (chunk->page_list[i].page); -put_page (chunk->page_list[i].page); +set_page_dirty_lock (page); +put_page (page); }kfree (chunk);
@@ -164,11 +166,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, } chunk->nents =min_t (int, ret,IB_UMEM_MAX_PAGE_CHUNK ); +sg_init_table (chunk->page_list, chunk->nents);for (i =0 ; i < chunk->nents; ++i) {if (vma_list && !is_vm_hugetlb_page (vma_list[i + off])) umem->hugetlb =0 ; - chunk->page_list[i].page = page_list[i + off]; +sg_set_page (&chunk->page_list[i], page_list[i + off]); chunk->page_list[i].offset =0 ; chunk->page_list[i].length =PAGE_SIZE ; }
@@ -179,7 +182,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, DMA_BIDIRECTIONAL);if (chunk->nmap <=0 ) {for (i =0 ; i < chunk->nents; ++i) -put_page (chunk->page_list[i].page); +put_page (sg_page (&chunk->page_list[i]));kfree (chunk); ret = -ENOMEM ;
drivers/infiniband/hw/ipath/ipath_dma.c +2 -2
@@ -108,7 +108,7 @@ static int ipath_map_sg(struct ib_device *dev, struct scatterlist *sgl,BUG_ON (!valid_dma_direction (direction));for_each_sg (sgl, sg, nents, i) { - addr = (u64 )page_address (sg->page); + addr = (u64 )page_address (sg_page (sg));/* TODO: handle highmem pages */ if (!addr) { ret =0 ;
@@ -127,7 +127,7 @@ static void ipath_unmap_sg(struct ib_device *dev,static u64 ipath_sg_dma_address (struct ib_device *dev,struct scatterlist *sg) { -u64 addr = (u64 )page_address (sg->page); +u64 addr = (u64 )page_address (sg_page (sg));if (addr) addr += sg->offset;
drivers/infiniband/hw/ipath/ipath_mr.c +1 -1
@@ -225,7 +225,7 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,for (i =0 ; i < chunk->nents; i++) {void *vaddr; - vaddr =page_address (chunk->page_list[i].page); + vaddr =page_address (sg_page (&chunk->page_list[i]));if (!vaddr) { ret =ERR_PTR (-EINVAL ); goto bail;
drivers/infiniband/hw/mthca/mthca_memfree.c +15 -9
@@ -71,7 +71,7 @@ static void mthca_free_icm_pages(struct mthca_dev *dev, struct mthca_icm_chunk * PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -81,7 +81,7 @@ static void mthca_free_icm_coherent(struct mthca_dev *dev, struct mthca_icm_chunfor (i =0 ; i < chunk->npages; ++i) {dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); } }
@@ -107,10 +107,13 @@ void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm, int coherent)static int mthca_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -157,6 +160,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MTHCA_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -304,7 +308,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj, dma_addr_t *dma_h* so if we found the page, dma_handle has already * been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
@@ -445,6 +449,7 @@ static u64 mthca_uarc_virt(struct mthca_dev *dev, struct mthca_uar *uar, int pagint mthca_map_user_db (struct mthca_dev *dev,struct mthca_uar *uar,struct mthca_user_db_table *db_tab,int index,u64 uaddr) { +struct page *pages[1 ];int ret =0 ;u8 status;int i;
@@ -472,16 +477,17 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, } ret =get_user_pages (current, current->mm, uaddr &PAGE_MASK ,1 ,1 ,0 , - &db_tab->page[i].mem.page,NULL ); + pages,NULL );if (ret <0 ) goto out; +sg_set_page (&db_tab->page[i].mem, pages[0 ]); db_tab->page[i].mem.length =MTHCA_ICM_PAGE_SIZE ; db_tab->page[i].mem.offset = uaddr & ~PAGE_MASK ; ret =pci_map_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE );if (ret <0 ) { -put_page (db_tab->page[i].mem.page); +put_page (pages[0 ]); goto out; }
@@ -491,7 +497,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, ret = -EINVAL ;if (ret) {pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); goto out; }
@@ -557,7 +563,7 @@ void mthca_cleanup_user_db_tab(struct mthca_dev *dev, struct mthca_uar *uar,if (db_tab->page[i].uvirt) {mthca_UNMAP_ICM (dev,mthca_uarc_virt (dev, uar, i),1 , &status);pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); } }
drivers/infiniband/ulp/iser/iser_memory.c +3 -3
@@ -131,7 +131,7 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, data->size, i) { - from =kmap_atomic (sg->page,KM_USER0 ); + from =kmap_atomic (sg_page (sg),KM_USER0 );memcpy (p, from + sg->offset, sg->length);
@@ -191,7 +191,7 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, sg_size, i) { - to =kmap_atomic (sg->page,KM_SOFTIRQ0 ); + to =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 );memcpy (to + sg->offset, p, sg->length);
@@ -336,7 +336,7 @@ static void iser_data_buf_dump(struct iser_data_buf *data,iser_err ("sg[%d] dma_addr:0x%lX page:0x%p " "off:0x%x sz:0x%x dma_len:0x%x\n" , i, (unsigned long )ib_sg_dma_address (ibdev, sg), - sg->page, sg->offset, +sg_page (sg), sg->offset, sg->length,ib_sg_dma_len (ibdev, sg)); }
drivers/md/dm-crypt.c +11 -10
@@ -346,16 +346,17 @@ static int crypt_convert(struct crypt_config *cc, ctx->idx_out < ctx->bio_out->bi_vcnt) {struct bio_vec *bv_in =bio_iovec_idx (ctx->bio_in, ctx->idx_in);struct bio_vec *bv_out =bio_iovec_idx (ctx->bio_out, ctx->idx_out); -struct scatterlist sg_in = { - .page = bv_in->bv_page, - .offset = bv_in->bv_offset + ctx->offset_in, - .length =1 <<SECTOR_SHIFT - }; -struct scatterlist sg_out = { - .page = bv_out->bv_page, - .offset = bv_out->bv_offset + ctx->offset_out, - .length =1 <<SECTOR_SHIFT - }; +struct scatterlist sg_in, sg_out; + +sg_init_table (&sg_in,1 ); +sg_set_page (&sg_in, bv_in->bv_page); + sg_in.offset = bv_in->bv_offset + ctx->offset_in; + sg_in.length =1 <<SECTOR_SHIFT ; + +sg_init_table (&sg_out,1 ); +sg_set_page (&sg_out, bv_out->bv_page); + sg_out.offset = bv_out->bv_offset + ctx->offset_out; + sg_out.length =1 <<SECTOR_SHIFT ; ctx->offset_in += sg_in.length;if (ctx->offset_in >= bv_in->bv_len) {
drivers/media/common/saa7146_core.c +2 -1
@@ -112,12 +112,13 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/media/video/ivtv/ivtv-udma.c +2 -2
@@ -63,10 +63,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_infomemcpy (page_address (dma->bouncemap[map_offset]) + offset, src, len);kunmap_atomic (src,KM_BOUNCE_READ );local_irq_restore (flags); - dma->SGlist[map_offset].page = dma->bouncemap[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->bouncemap[map_offset]); }else { - dma->SGlist[map_offset].page = dma->map[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->map[map_offset]); } offset =0 ; map_offset++;
drivers/media/video/videobuf-dma-sg.c +5 -3
@@ -60,12 +60,13 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
@@ -86,13 +87,14 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) sglist =kcalloc (nr_pages,sizeof (*sglist),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);if (NULL == pages[0 ]) goto nopage;if (PageHighMem (pages[0 ]))/* DMA to highmem pages might not work */ goto highmem; - sglist[0 ].page = pages[0 ]; +sg_set_page (&sglist[0 ], pages[0 ]); sglist[0 ].offset = offset; sglist[0 ].length =PAGE_SIZE - offset;for (i =1 ; i < nr_pages; i++) {
@@ -100,7 +102,7 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) goto nopage;if (PageHighMem (pages[i])) goto highmem; - sglist[i].page = pages[i]; +sg_set_page (&sglist[i], pages[i]); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/mmc/card/queue.c +8 -7
@@ -13,6 +13,7 @@#include <linux/blkdev.h> #include <linux/freezer.h> #include <linux/kthread.h> +#include <linux/scatterlist.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h>
@@ -153,19 +154,21 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lockblk_queue_max_hw_segments (mq->queue, bouncesz /512 );blk_queue_max_segment_size (mq->queue, bouncesz); - mq->sg =kzalloc (sizeof (struct scatterlist ), + mq->sg =kmalloc (sizeof (struct scatterlist ),GFP_KERNEL );if (!mq->sg) { ret = -ENOMEM ; goto cleanup_queue; } +sg_init_table (mq->sg,1 ); - mq->bounce_sg =kzalloc (sizeof (struct scatterlist ) * + mq->bounce_sg =kmalloc (sizeof (struct scatterlist ) * bouncesz /512 ,GFP_KERNEL );if (!mq->bounce_sg) { ret = -ENOMEM ; goto cleanup_queue; } + sg_init_table(mq->bounce_sg, bouncesz / 512); } }#endif
@@ -302,12 +305,12 @@ static void copy_sg(struct scatterlist *dst, unsigned int dst_len,BUG_ON (dst_len ==0 );if (dst_size ==0 ) { - dst_buf =page_address (dst->page) + dst->offset; + dst_buf =page_address (sg_page (dst)) + dst->offset; dst_size = dst->length; }if (src_size ==0 ) { - src_buf =page_address (src->page) + src->offset; + src_buf =page_address (sg_page (src)) + src->offset; src_size = src->length; }
@@ -353,9 +356,7 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq)return 1 ; } - mq->sg[0 ].page =virt_to_page (mq->bounce_buf); - mq->sg[0 ].offset =offset_in_page (mq->bounce_buf); - mq->sg[0 ].length =0 ; +sg_init_one (mq->sg, mq->bounce_buf,0 );while (sg_len) { mq->sg[0 ].length += mq->bounce_sg[sg_len -1 ].length;
drivers/mmc/host/mmc_spi.c +4 -4
@@ -813,7 +813,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, && dir == DMA_FROM_DEVICE) dir =DMA_BIDIRECTIONAL ; - dma_addr =dma_map_page (dma_dev, sg->page,0 , + dma_addr =dma_map_page (dma_dev,sg_page (sg),0 ,PAGE_SIZE , dir);if (direction ==DMA_TO_DEVICE ) t->tx_dma = dma_addr + sg->offset;
@@ -822,7 +822,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, }/* allow pio too; we don't allow highmem */ - kmap_addr =kmap (sg->page); + kmap_addr =kmap (sg_page (sg));if (direction ==DMA_TO_DEVICE ) t->tx_buf = kmap_addr + sg->offset;else
@@ -855,8 +855,8 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,/* discard mappings */ if (direction ==DMA_FROM_DEVICE ) -flush_kernel_dcache_page (sg->page); -kunmap (sg->page); +flush_kernel_dcache_page (sg_page (sg)); +kunmap (sg_page (sg));if (dma_dev)dma_unmap_page (dma_dev, dma_addr,PAGE_SIZE , dir);
drivers/mmc/host/sdhci.c +1 -1
@@ -231,7 +231,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host)static inline char *sdhci_sg_to_buffer (struct sdhci_host * host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline int sdhci_next_sg (struct sdhci_host * host)
drivers/mmc/host/tifm_sd.c +4 -4
@@ -192,7 +192,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt);
@@ -241,18 +241,18 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt); p_cnt =min (p_cnt, t_size);if (r_data->flags &MMC_DATA_WRITE ) -tifm_sd_copy_page (host->bounce_buf.page, +tifm_sd_copy_page (sg_page (&host->bounce_buf), r_data->blksz - t_size, pg, p_off, p_cnt);else if (r_data->flags &MMC_DATA_READ ) -tifm_sd_copy_page (pg, p_off, host->bounce_buf.page, +tifm_sd_copy_page (pg, p_off,sg_page (&host->bounce_buf), r_data->blksz - t_size, p_cnt); t_size -= p_cnt;
drivers/mmc/host/wbsd.c +3 -3
@@ -269,7 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host *host)static inline char *wbsd_sg_to_buffer (struct wbsd_host *host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline void wbsd_sg_to_dma (struct wbsd_host *host,struct mmc_data *data)
@@ -283,7 +283,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (dmabuf, sgbuf, sg[i].length); dmabuf += sg[i].length; }
@@ -300,7 +300,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (sgbuf, dmabuf, sg[i].length); dmabuf += sg[i].length; }
drivers/net/mlx4/icm.c +9 -5
@@ -60,7 +60,7 @@ static void mlx4_free_icm_pages(struct mlx4_dev *dev, struct mlx4_icm_chunk *chu PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -70,7 +70,7 @@ static void mlx4_free_icm_coherent(struct mlx4_dev *dev, struct mlx4_icm_chunk *for (i =0 ; i < chunk->npages; ++i)dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); }
@@ -95,10 +95,13 @@ void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent)static int mlx4_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -145,6 +148,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MLX4_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -334,7 +338,7 @@ void *mlx4_table_find(struct mlx4_icm_table *table, int obj, dma_addr_t *dma_han* been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
drivers/net/ppp_mppe.c +2 -4
@@ -55,7 +55,7 @@#include <linux/mm.h> #include <linux/ppp_defs.h> #include <linux/ppp-comp.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include "ppp_mppe.h"
@@ -68,9 +68,7 @@ MODULE_VERSION("1.0.2");static unsigned int setup_sg (struct scatterlist *sg,const void *address,unsigned int length) { - sg[0 ].page =virt_to_page (address); - sg[0 ].offset =offset_in_page (address); - sg[0 ].length = length; +sg_init_one (sg, address, length);return length; }
drivers/scsi/3w-9xxx.c +2 -2
@@ -1840,7 +1840,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, (scsi_bufflen(srb) < TW_MIN_SGL_LENGTH)) {if (srb->sc_data_direction ==DMA_TO_DEVICE || srb->sc_data_direction ==DMA_BIDIRECTIONAL ) {struct scatterlist *sg =scsi_sglist (srb); -char *buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; +char *buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (tw_dev->generic_buffer_virt[request_id], buf, sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 ); }
@@ -1919,7 +1919,7 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int rechar *buf;unsigned long flags =0 ;local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buf, tw_dev->generic_buffer_virt[request_id], sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/3w-xxxx.c +1 -1
@@ -1469,7 +1469,7 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,struct scatterlist *sg =scsi_sglist (cmd);local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len);memcpy (buf, data, transfer_len);
drivers/scsi/NCR5380.c +2 -2
@@ -298,7 +298,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.buffers_residual = cmd->use_sg -1 ; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset; cmd->SCp.this_residual = cmd->SCp.buffer->length; }else {
@@ -2143,7 +2143,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ++cmd->SCp.buffer; --cmd->SCp.buffers_residual; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset;dprintk (NDEBUG_INFORMATION , ("scsi%d : %d bytes and %d buffers left\n" , instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual)); }
drivers/scsi/aacraid/aachba.c +1 -1
@@ -356,7 +356,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigneint transfer_len;struct scatterlist *sg =scsi_sglist (scsicmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len + offset); transfer_len -= offset;
drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
@@ -1343,7 +1343,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \/* 4 bytes: Areca io control code */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (scsi_sg_count (cmd) >1 ) { retvalue =ARCMSR_MESSAGE_FAIL ; goto message_out;
@@ -1593,7 +1593,7 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,strncpy (&inqdata[32 ],"R001" ,4 );/* Product Revision */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buffer, inqdata,sizeof (inqdata)); sg =scsi_sglist (cmd);
drivers/scsi/fdomain.c +3 -3
@@ -1321,7 +1321,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id)if (current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; }else break ;
@@ -1354,7 +1354,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id) && current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; } }
@@ -1439,7 +1439,7 @@ static int fdomain_16x0_queue(struct scsi_cmnd *SCpnt,if (scsi_sg_count (current_SC)) { current_SC->SCp.buffer =scsi_sglist (current_SC); - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; current_SC->SCp.buffers_residual =scsi_sg_count (current_SC) -1 ;
drivers/scsi/gdth.c +2 -2
@@ -2374,13 +2374,13 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow; -if (!sl->page) { +if (!sg_page (sl)) {printk ("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n" , ha->hanum);return ; }local_irq_save (flags); - address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; + address =kmap_atomic (sg_page (sl),KM_BIO_SRC_IRQ ) + sl->offset;if (to_buffer)memcpy (buffer, address, cpnow);else
drivers/scsi/ide-scsi.c +4 -4
@@ -179,14 +179,14 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsigneunsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count); }
@@ -216,14 +216,14 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignunsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count); }
drivers/scsi/imm.c +2 -2
@@ -706,7 +706,7 @@ static int imm_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset;/*
@@ -845,7 +845,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/ipr.c +12 -7
@@ -2872,6 +2872,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len) } scatterlist = sglist->scatterlist; +sg_init_table (scatterlist, num_elem); sglist->order = order; sglist->num_sg = num_elem;
@@ -2884,12 +2885,12 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)/* Free up what we already allocated */ for (j = i -1 ; j >=0 ; j--) -__free_pages (scatterlist[j].page, order); +__free_pages (sg_page (&scatterlist[j]), order);kfree (sglist);return NULL ; } - scatterlist[i].page = page; +sg_set_page (&scatterlist[i], page); }return sglist;
@@ -2910,7 +2911,7 @@ static void ipr_free_ucode_buffer(struct ipr_sglist *sglist)int i;for (i =0 ; i < sglist->num_sg; i++) -__free_pages (sglist->scatterlist[i].page, sglist->order); +__free_pages (sg_page (&sglist->scatterlist[i]), sglist->order);kfree (sglist); }
@@ -2940,9 +2941,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, scatterlist = sglist->scatterlist;for (i =0 ; i < (len / bsize_elem); i++, buffer += bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = bsize_elem;
@@ -2953,9 +2956,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, }if (len % bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, len % bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = len % bsize_elem; }
drivers/scsi/ips.c +3 -3
@@ -1515,7 +1515,7 @@ static int ips_is_passthru(struct scsi_cmnd *SC)/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && buffer[2 ] =='P' && buffer[3 ] =='P' ) {kunmap_atomic (buffer - sg->offset,KM_IRQ0 );
@@ -3523,7 +3523,7 @@ ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (buffer, &cdata[xfer_cnt], min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
@@ -3556,7 +3556,7 @@ ips_scmd_buf_read(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (&cdata[xfer_cnt], buffer, min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/iscsi_tcp.c +7 -8
@@ -70,9 +70,7 @@ module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);static inline void iscsi_buf_init_iov (struct iscsi_buf *ibuf,char *vbuf,int size) { - ibuf->sg.page =virt_to_page (vbuf); - ibuf->sg.offset =offset_in_page (vbuf); - ibuf->sg.length = size; +sg_init_one (&ibuf->sg, vbuf, size); ibuf->sent =0 ; ibuf->use_sendmsg =1 ; }
@@ -80,13 +78,14 @@ iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)static inline void iscsi_buf_init_sg (struct iscsi_buf *ibuf,struct scatterlist *sg) { - ibuf->sg.page = sg->page; +sg_init_table (&ibuf->sg,1 ); +sg_set_page (&ibuf->sg,sg_page (sg)); ibuf->sg.offset = sg->offset; ibuf->sg.length = sg->length;/* * Fastpath: sg element fits into single page */ -if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg->page)) +if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg_page (sg))) ibuf->use_sendmsg =0 ;else ibuf->use_sendmsg =1 ;
@@ -716,7 +715,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)for (i = tcp_ctask->sg_count; i <scsi_sg_count (sc); i++) {char *dest; - dest =kmap_atomic (sg[i].page,KM_SOFTIRQ0 ); + dest =kmap_atomic (sg_page (&sg[i]),KM_SOFTIRQ0 ); rc =iscsi_ctask_copy (tcp_conn, ctask, dest + sg[i].offset, sg[i].length, offset);kunmap_atomic (dest,KM_SOFTIRQ0 );
@@ -1103,9 +1102,9 @@ iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)* slab case. */ if (buf->use_sendmsg) - res =sock_no_sendpage (sk, buf->sg.page, offset, size, flags); + res =sock_no_sendpage (sk,sg_page (&buf->sg), offset, size, flags);else - res = tcp_conn->sendpage (sk, buf->sg.page, offset, size, flags); + res = tcp_conn->sendpage (sk,sg_page (&buf->sg), offset, size, flags);if (res >=0 ) { conn->txdata_octets += res;
drivers/scsi/megaraid.c +3 -3
@@ -658,7 +658,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)struct scatterlist *sg; sg =scsi_sglist (cmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memset (buf,0 , cmd->cmnd[4 ]);kunmap_atomic (buf - sg->offset,KM_IRQ0 );
@@ -1542,9 +1542,9 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)if ( cmd->cmnd[0 ] ==INQUIRY && !islogical ) { sgl =scsi_sglist (cmd); -if ( sgl->page ) { +if (sg_page (sgl) ) { c = *(unsigned char *) -page_address ((&sgl[0 ])->page) + +page_address ((sg_page (&sgl[0 ]))) + (&sgl[0 ])->offset; }else { printk(KERN_WARNING
drivers/scsi/megaraid/megaraid_mbox.c +4 -4
@@ -1584,9 +1584,9 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)caddr_t vaddr; sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { vaddr = (caddr_t) - (page_address ((&sgl[0 ])->page) + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset);memset (vaddr,0 , scp->cmnd[4 ]);
@@ -2328,9 +2328,9 @@ megaraid_mbox_dpc(unsigned long devp) && IS_RAID_CH(raid_dev, scb->dev_channel)) { sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { c = *(unsigned char *) - (page_address ((&sgl[0 ])->page) + + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset); }else { con_log(CL_ANN, (KERN_WARNING
drivers/scsi/osst.c +17 -15
@@ -542,7 +542,7 @@ static int osst_verify_frame(struct osst_tape * STp, int frame_seq_number, int qif (STp->raw) {if (STp->buffer->syscall_result) {for (i=0 ; i < STp->buffer->sg_segs; i++) -memset (page_address (STp->buffer->sg[i].page), +memset (page_address (sg_page (&STp->buffer->sg[i])),0 , STp->buffer->sg[i].length);strcpy (STp->buffer->b_data,"READ ERROR ON FRAME" ); }else
@@ -4437,7 +4437,7 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)for (i =0 , b_size =0 ; (i < STp->buffer->sg_segs) && ((b_size + STp->buffer->sg[i].length) <=OS_DATA_SIZE ); b_size += STp->buffer->sg[i++].length); - STp->buffer->aux = (os_aux_t *) (page_address (STp->buffer->sg[i].page) +OS_DATA_SIZE - b_size); + STp->buffer->aux = (os_aux_t *) (page_address (sg_page (&STp->buffer->sg[i])) +OS_DATA_SIZE - b_size);#if DEBUG printk (OSST_DEB_MSG "%s:D: b_data points to %p in segment 0 at %p\n" , name, STp->buffer->b_data,page_address (STp->buffer->sg[0 ].page));
@@ -5252,25 +5252,26 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)/* Try to allocate the first segment up to OS_DATA_SIZE and the others big enough to reach the goal (code assumes no segments in place) */ for (b_size =OS_DATA_SIZE , order =OSST_FIRST_ORDER ; b_size >=PAGE_SIZE ; order--, b_size /=2 ) { - STbuffer->sg[0 ].page =alloc_pages (priority, order); +struct page *page =alloc_pages (priority, order); + STbuffer->sg[0 ].offset =0 ; -if (STbuffer->sg[0 ].page !=NULL ) { +if (page !=NULL ) { +sg_set_page (&STbuffer->sg[0 ], page); STbuffer->sg[0 ].length = b_size; - STbuffer->b_data =page_address (STbuffer->sg[0 ].page); + STbuffer->b_data =page_address (page);break ; } } -if (STbuffer->sg[0 ].page ==NULL ) { +if (sg_page (&STbuffer->sg[0 ]) ==NULL ) {printk (KERN_NOTICE "osst :I: Can't allocate tape buffer main segment.\n" );return 0 ; }/* Got initial segment of 'bsize,order', continue with same size if possible, except for AUX */ for (segs=STbuffer->sg_segs=1 , got=b_size; segs < max_segs && got <OS_FRAME_SIZE ; ) { - STbuffer->sg[segs].page = -alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); +struct page *page =alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); STbuffer->sg[segs].offset =0 ; -if (STbuffer->sg[segs].page ==NULL ) { +if (page ==NULL ) {if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size /2 && order) { b_size /=2 ;/* Large enough for the rest of the buffers */ order--;
@@ -5284,6 +5285,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)normalize_buffer (STbuffer);return 0 ; } +sg_set_page (&STbuffer->sg[segs], page); STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <=PAGE_SIZE /2 ) ? (OS_FRAME_SIZE - got) : b_size; got += STbuffer->sg[segs].length; STbuffer->buffer_size = got;
@@ -5316,7 +5318,7 @@ static void normalize_buffer(struct osst_buffer *STbuffer) b_size < STbuffer->sg[i].length; b_size *= 2, order++); -__free_pages (STbuffer->sg[i].page, order); +__free_pages (sg_page (&STbuffer->sg[i]), order); STbuffer->buffer_size -= STbuffer->sg[i].length; }#if DEBUG
@@ -5344,7 +5346,7 @@ static int append_to_buffer(const char __user *ubp, struct osst_buffer *st_bp, ifor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_from_user (page_address (st_bp->sg[i].page) + offset, ubp, cnt); + res =copy_from_user (page_address (sg_page (&st_bp->sg[i])) + offset, ubp, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5377,7 +5379,7 @@ static int from_buffer(struct osst_buffer *st_bp, char __user *ubp, int do_countfor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_to_user (ubp,page_address (st_bp->sg[i].page) + offset, cnt); + res =copy_to_user (ubp,page_address (sg_page (&st_bp->sg[i])) + offset, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5410,7 +5412,7 @@ static int osst_zero_buffer_tail(struct osst_buffer *st_bp) i < st_bp->sg_segs && do_count > 0; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count ; -memset (page_address (st_bp->sg[i].page) + offset,0 , cnt); +memset (page_address (sg_page (&st_bp->sg[i])) + offset,0 , cnt); do_count -= cnt; offset =0 ; }
@@ -5430,7 +5432,7 @@ static int osst_copy_to_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (page_address (st_bp->sg[i].page), ptr, cnt); +memcpy (page_address (sg_page (&st_bp->sg[i])), ptr, cnt); do_count -= cnt; ptr += cnt; }
@@ -5451,7 +5453,7 @@ static int osst_copy_from_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (ptr,page_address (st_bp->sg[i].page), cnt); +memcpy (ptr,page_address (sg_page (&st_bp->sg[i])), cnt); do_count -= cnt; ptr += cnt; }
drivers/scsi/pcmcia/sym53c500_cs.c +3 -3
@@ -443,7 +443,7 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_write (fast_pio, port_base, -page_address (sg->page) + sg->offset, +page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 (port_base);
@@ -463,8 +463,8 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_read (fast_pio, port_base, -page_address (sg->page) + sg->offset, - sg->length); +page_address (sg_page (sg)) + sg->offset, + sg->length); }REG0 (port_base); }
drivers/scsi/ppa.c +2 -2
@@ -609,7 +609,7 @@ static int ppa_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; } }
@@ -756,7 +756,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)/* if many buffers are available, start filling the first */ cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page) + + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/qlogicfas408.c +1 -1
@@ -317,7 +317,7 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)return ((priv->qabort ==1 ?DID_ABORT :DID_RESET ) <<16 ); } - buf =page_address (sg->page) + sg->offset; + buf =page_address (sg_page (sg)) + sg->offset;if (ql_pdma (priv, phase, buf, sg->length))break ; }
drivers/scsi/scsi_debug.c +2 -2
@@ -625,7 +625,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,scsi_for_each_sg (scp, sg, scp->use_sg, k) {if (active) { kaddr = (unsigned char *) -kmap_atomic (sg->page,KM_USER0 ); +kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return (DID_ERROR <<16 ); kaddr_off = (unsigned char *)kaddr + sg->offset;
@@ -672,7 +672,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr, sg =scsi_sglist (scp); req_len = fin =0 ;for (k =0 ; k < scp->use_sg; ++k, sg =sg_next (sg)) { - kaddr = (unsigned char *)kmap_atomic (sg->page,KM_USER0 ); + kaddr = (unsigned char *)kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return -1 ; kaddr_off = (unsigned char *)kaddr + sg->offset;
drivers/scsi/scsi_lib.c +10 -3
@@ -295,7 +295,7 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,int i, err, nr_vecs =0 ;for_each_sg (sgl, sg, nsegs, i) { - page = sg->page; + page =sg_page (sg); off = sg->offset; len = sg->length; data_len += len;
@@ -764,7 +764,7 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)if (unlikely (!sgl)) goto enomem; -memset (sgl,0 ,sizeof (*sgl) * sgp->size); +sg_init_table (sgl, sgp->size);/* * first loop through, set initial index and return value
@@ -781,6 +781,13 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)sg_chain (prev,SCSI_MAX_SG_SEGMENTS , sgl);/* +* if we have nothing left, mark the last segment as +* end-of-list +*/ +if (!left) +sg_mark_end (sgl, this); + +/* * don't allow subsequent mempool allocs to sleep, it would * violate the mempool principle. */
@@ -2353,7 +2360,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count, *offset = *offset - len_complete + sg->offset;/* Assumption: contiguous pages can be accessed as "page + i" */ - page =nth_page (sg->page, (*offset >>PAGE_SHIFT )); + page =nth_page (sg_page (sg), (*offset >>PAGE_SHIFT )); *offset &= ~PAGE_MASK ;/* Bytes in this sg-entry from *offset to the end of the page */
drivers/scsi/sg.c +15 -15
@@ -1169,7 +1169,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length;if (offset < len) { - page =virt_to_page (page_address (sg->page) + offset); + page =virt_to_page (page_address (sg_page (sg)) + offset);get_page (page);/* increment page count */ break ; }
@@ -1717,13 +1717,13 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,goto out_unlock; */ } - sgl[0 ].page = pages[0 ]; +sg_set_page (sgl, pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { - sgl[i].page = pages[i]; +sg_set_page (&sgl[i], pages[i]); sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -1754,7 +1754,7 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,int i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
@@ -1854,7 +1854,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) scatter_elem_sz_prev = ret_sz; } } - sg->page = p; +sg_set_page (sg, p); sg->length = (ret_sz > num) ? num : ret_sz; SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
@@ -1907,14 +1907,14 @@ sg_write_xfer(Sg_request * srp) onum =1 ; ksglen = sg->length; - p =page_address (sg->page); + p =page_address (sg_page (sg));for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,1 , &usglen, &up);if (res)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -1991,12 +1991,12 @@ sg_remove_scat(Sg_scatter_hold * schp) }else {int k; -for (k =0 ; (k < schp->k_use_sg) && sg->page; +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) {SCSI_LOG_TIMEOUT (5 ,printk ("sg_remove_scat: k=%d, pg=0x%p, len=%d\n" , - k, sg->page, sg->length)); -sg_page_free (sg->page, sg->length); + k,sg_page (sg), sg->length)); +sg_page_free (sg_page (sg), sg->length); } }kfree (schp->buffer);
@@ -2038,7 +2038,7 @@ sg_read_xfer(Sg_request * srp) }else onum =1 ; - p =page_address (sg->page); + p =page_address (sg_page (sg)); ksglen = sg->length;for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,0 , &usglen, &up);
@@ -2046,7 +2046,7 @@ sg_read_xfer(Sg_request * srp)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -2092,15 +2092,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)if ((!outp) || (num_read_xfer <=0 ))return 0 ; -for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, sg =sg_next (sg)) { +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) { num = sg->length;if (num > num_read_xfer) { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num_read_xfer))return -EFAULT ;break ; }else { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num))return -EFAULT ; num_read_xfer -= num;
drivers/scsi/st.c +4 -4
@@ -3797,7 +3797,7 @@ static void buf_to_sg(struct st_buffer *STbp, unsigned int length) sg = &(STbp->sg[0 ]); frp = STbp->frp;for (i=count=0 ; count < length; i++) { - sg[i].page = frp[i].page; +sg_set_page (&sg[i], frp[i].page);if (length - count > frp[i].length) sg[i].length = frp[i].length;else
@@ -4446,14 +4446,14 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa }/* Populate the scatter/gather list */ - sgl[0 ].page = pages[0 ]; +sg_set_page (&sgl[0 ], pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { +sg_set_page (&sgl[i], pages[i]);; sgl[i].offset =0 ; - sgl[i].page = pages[i]; sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -4483,7 +4483,7 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pint i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
drivers/scsi/tmscsim.c +1 -4
@@ -430,10 +430,7 @@ static __inline__ void dc390_Going_remove (struct dc390_dcb* pDCB, struct dc390_static struct scatterlist *dc390_sg_build_single (struct scatterlist *sg,void *addr,unsigned int length) { -memset (sg,0 ,sizeof (struct scatterlist )); - sg->page =virt_to_page (addr); - sg->length = length; - sg->offset = (unsigned long )addr & ~PAGE_MASK ; +sg_init_one (sg, addr, length);return sg; }
drivers/usb/core/message.c +2 -2
@@ -438,12 +438,12 @@ int usb_sg_init ( io->urbs[i]->transfer_buffer =NULL ;#else io->urbs[i]->transfer_buffer = -page_address (sg[i].page) + sg[i].offset; +page_address (sg_page (&sg[i])) + sg[i].offset;#endif }else {/* hc may use _only_ transfer_buffer */ io->urbs [i]->transfer_buffer = -page_address (sg [i].page) + sg [i].offset; +page_address (sg_page (&sg[i])) + sg [i].offset; len = sg [i].length; }
drivers/usb/image/microtek.c +2 -2
@@ -519,7 +519,7 @@ static void mts_do_sg (struct urb* transfer) context->fragment++; mts_int_submit_urb(transfer, context->data_pipe, - page_address(sg[context->fragment].page) + + page_address(sg_page(&sg[context->fragment])) + sg[context->fragment].offset, sg[context->fragment].length, context->fragment + 1 == scsi_sg_count(context->srb) ?
@@ -557,7 +557,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)return ; }else { sg =scsi_sglist (srb); - desc->context.data =page_address (sg[0 ].page) + sg[0 ].offset; + desc->context.data =page_address (sg_page (&sg[0 ])) + sg[0 ].offset; desc->context.data_length = sg[0 ].length; }
drivers/usb/misc/usbtest.c +3 -2
@@ -360,9 +360,10 @@ static void free_sglist (struct scatterlist *sg, int nents)if (!sg)return ;for (i =0 ; i < nents; i++) { -if (!sg [i].page) +struct page *page =sg_page (&sg[i]); +if (!page)continue ; -kfree (page_address (sg [i].page) + sg [i].offset); +kfree (page_address (page) + sg [i].offset); }kfree (sg); }
drivers/usb/storage/protocol.c +1 -1
@@ -195,7 +195,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,* the *offset and *index values for the next loop. */ cnt =0 ;while (cnt < buflen) { -struct page *page = sg->page + +struct page *page =sg_page (sg) + ((sg->offset + *offset) >>PAGE_SHIFT );unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE -1 );
fs/ecryptfs/crypto.c +11 -5
@@ -283,7 +283,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, pg =virt_to_page (addr); offset =offset_in_page (addr);if (sg) { - sg[i].page = pg; +sg_set_page (&sg[i], pg); sg[i].offset = offset; } remainder_of_page =PAGE_CACHE_SIZE - offset;
@@ -713,10 +713,13 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return encrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
@@ -742,10 +745,13 @@ ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return decrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
fs/ecryptfs/keystore.c +3 -0
@@ -1040,6 +1040,9 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, };int rc =0 ; +sg_init_table (&dst_sg,1 ); +sg_init_table (&src_sg,1 ); +if (unlikely (ecryptfs_verbosity >0 )) { ecryptfs_printk( KERN_DEBUG, "Session key encryption key (size [%d]):\n",
fs/nfsd/nfs4recover.c +3 -5
@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) {struct xdr_netobj cksum;struct hash_desc desc; -struct scatterlist sg[1 ]; +struct scatterlist sg;__be32 status = nfserr_resource; dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
@@ -102,11 +102,9 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)if (cksum.data ==NULL ) goto out; - sg[0 ].page =virt_to_page (clname->data); - sg[0 ].offset =offset_in_page (clname->data); - sg[0 ].length = clname->len; +sg_init_one (&sg, clname->data, clname->len); -if (crypto_hash_digest (&desc, sg, sg->length, cksum.data)) +if (crypto_hash_digest (&desc, &sg, sg.length, cksum.data)) goto out;md5_to_hex (dname, cksum.data);
include/asm-sparc64/scatterlist.h +4 -1
@@ -6,7 +6,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-x86/dma-mapping_32.h +2 -2
@@ -45,9 +45,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,WARN_ON (nents ==0 || sglist[0 ].length ==0 );for_each_sg (sglist, sg, nents, i) { -BUG_ON (!sg->page); +BUG_ON (!sg_page (sg)); - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset; }flush_write_buffers ();
include/asm-x86/scatterlist_32.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-x86/scatterlist_64.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;dma_addr_t dma_address;
include/linux/scatterlist.h +121 -17
179 lines not on this page · raw message
lib/Kconfig.debug +10 -0
@@ -389,6 +389,16 @@ config DEBUG_LIST If unsure, say N. +config DEBUG_SG + bool "Debug SG table operations" + depends on DEBUG_KERNEL + help + Enable this to turn on checks on scatter-gather tables. This can + help find problems with drivers that do not properly initialize + their sg tables. + + If unsure, say N. + config FRAME_POINTER bool "Compile the kernel with frame pointers" depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BFIN)
lib/swiotlb.c +1 -1
@@ -35,7 +35,7 @@#define OFFSET (val,align) ((unsigned long) \ ( (val) & ( (align) - 1))) -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (sg) virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))/*
net/core/skbuff.c +2 -2
@@ -2045,7 +2045,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy >0 ) {if (copy > len) copy = len; - sg[elt].page =virt_to_page (skb->data + offset); +sg_set_page (&sg[elt],virt_to_page (skb->data + offset)); sg[elt].offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg[elt].length = copy; elt++;
@@ -2065,7 +2065,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy > len) copy = len; - sg[elt].page = frag->page; +sg_set_page (&sg[elt], frag->page); sg[elt].offset = frag->page_offset+offset-start; sg[elt].length = copy; elt++;
net/ieee80211/ieee80211_crypt_tkip.c +5 -8
@@ -390,9 +390,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (tkey->tx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -485,9 +483,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -12 ;crypto_blkcipher_setkey (tkey->rx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 )) {if (net_ratelimit ()) { printk(KERN_DEBUG ": TKIP: failed to decrypt "
@@ -539,11 +535,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,printk (KERN_WARNING "michael_mic: tfm_michael == NULL\n" );return -1 ; } - sg[0 ].page =virt_to_page (hdr); +sg_init_table (sg,2 ); +sg_set_page (&sg[0 ],virt_to_page (hdr)); sg[0 ].offset =offset_in_page (hdr); sg[0 ].length =16 ; - sg[1 ].page =virt_to_page (data); +sg_set_page (&sg[1 ],virt_to_page (data)); sg[1 ].offset =offset_in_page (data); sg[1 ].length = data_len;
net/ieee80211/ieee80211_crypt_wep.c +2 -6
@@ -170,9 +170,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (wep->tx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -212,9 +210,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -8 ;crypto_blkcipher_setkey (wep->rx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 ))return -7 ;
net/mac80211/wep.c +2 -6
@@ -138,9 +138,7 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, *icv =cpu_to_le32 (~crc32_le (~0 , data, data_len));crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_encrypt (&desc, &sg, &sg, sg.length); }
@@ -204,9 +202,7 @@ int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,__le32 crc;crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_decrypt (&desc, &sg, &sg, sg.length); crc =cpu_to_le32 (~crc32_le (~0 , data, data_len));
net/sctp/auth.c +2 -1
@@ -726,7 +726,8 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,/* set up scatter list */ end =skb_tail_pointer (skb); - sg.page =virt_to_page (auth); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (auth)); sg.offset = (unsigned long )(auth) %PAGE_SIZE ; sg.length = end - (unsigned char *)auth;
net/sctp/sm_make_chunk.c +4 -2
@@ -1513,7 +1513,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,struct hash_desc desc;/* Sign the message. */ - sg.page =virt_to_page (&cookie->c); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (&cookie->c)); sg.offset = (unsigned long )(&cookie->c) %PAGE_SIZE ; sg.length = bodysize; keylen =SCTP_SECRET_SIZE ;
@@ -1585,7 +1586,8 @@ struct sctp_association *sctp_unpack_cookie(/* Check the signature. */ keylen =SCTP_SECRET_SIZE ; - sg.page =virt_to_page (bear_cookie); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (bear_cookie)); sg.offset = (unsigned long )(bear_cookie) %PAGE_SIZE ; sg.length = bodysize; key = (char *)ep->secret_key[ep->current_key];
net/sunrpc/auth_gss/gss_krb5_crypto.c +5 -5
@@ -197,9 +197,9 @@ encryptor(struct scatterlist *sg, void *data)int i = (page_pos + outbuf->page_base) >>PAGE_CACHE_SHIFT ; in_page = desc->pages[i]; }else { - in_page = sg->page; + in_page =sg_page (sg); } - desc->infrags[desc->fragno].page = in_page; +sg_set_page (&desc->infrags[desc->fragno], in_page); desc->fragno++; desc->fraglen += sg->length; desc->pos += sg->length;
@@ -215,11 +215,11 @@ encryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->outfrags[0 ].page = sg->page; +sg_set_page (&desc->outfrags[0 ],sg_page (sg)); desc->outfrags[0 ].offset = sg->offset + sg->length - fraglen; desc->outfrags[0 ].length = fraglen; desc->infrags[0 ] = desc->outfrags[0 ]; - desc->infrags[0 ].page = in_page; +sg_set_page (&desc->infrags[0 ], in_page); desc->fragno =1 ; desc->fraglen = fraglen; }else {
@@ -287,7 +287,7 @@ decryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->frags[0 ].page = sg->page; +sg_set_page (&desc->frags[0 ],sg_page (sg)); desc->frags[0 ].offset = sg->offset + sg->length - fraglen; desc->frags[0 ].length = fraglen; desc->fragno =1 ;
net/sunrpc/xdr.c +1 -1
@@ -1059,7 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, do { if (thislen > page_len) thislen = page_len; - sg->page = buf->pages[i]; + sg_set_page(sg, buf->pages[i]); sg->offset = page_offset; sg->length = thislen; ret = actor(sg, data);
net/xfrm/xfrm_algo.c +2 -2
@@ -552,7 +552,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page =virt_to_page (skb->data + offset); +sg_set_page (&sg,virt_to_page (skb->data + offset)); sg.offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg.length = copy;
@@ -577,7 +577,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page = frag->page; +sg_set_page (&sg, frag->page); sg.offset = frag->page_offset + offset-start; sg.length = copy;
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 19 lines · Jens Axboe
Quoted 9 lines · Jens Axboe
Quoted 8 lines · Jens Axboe
Quoted 7 lines · David Miller
From: Jens Axboe <[email protected]>
Date: Thu, 18 Oct 2007 13:57:02 +0200Quoted 3 lines
Thanks a lot, Dave! The patch is a monster right now, I'll work on splitting it into a 3-step process. Any arch help is greatly appreciated.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I have some other bits that my compile hit, such as some things in the crypto layer.
Yeah, I have tons of that so far. I hope to have an allyesconfig compiling pretty soonish, will send that out then.
OK here goes, this compiles with allyesconfig on x86-64. Not too bad, the scsi/ drivers were by far the worst.
Quoted 8 lines
Alright, small modifications and tested somewhat. It boots on my laptop just fine (
CONFIG_DEBUG_SGis set) without warnings. Also tested with PAGEALLOC set, that also boots and works fine without issue.So if this is what we want, the question is how to proceed. Right now i386 and x86-64 works, sparc64 PROBABLY works but is not tested. Any other arch will NOT compile, since it's not converted to use
page_link. I'll try and do ppc64 now.
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I hope nothing is missing linux/scatterlist.h includes...
arch/alpha/kernel/pci_iommu.c | 2 arch/arm/common/dmabounce.c | 2 arch/blackfin/kernel/dma-mapping.c | 2 arch/ia64/hp/common/sba_iommu.c | 2 arch/ia64/hp/sim/simscsi.c | 4 arch/ia64/sn/pci/pci_dma.c | 2 arch/m68k/kernel/dma.c | 2 arch/mips/mm/dma-default.c | 8 - arch/powerpc/kernel/dma_64.c | 2 arch/powerpc/kernel/ibmebus.c | 2 arch/powerpc/kernel/iommu.c | 2 arch/powerpc/platforms/ps3/system-bus.c | 2 arch/sparc/kernel/ioport.c | 16 +- arch/sparc/mm/io-unit.c | 2 arch/sparc/mm/iommu.c | 8 - arch/sparc/mm/sun4c.c | 2 arch/sparc64/kernel/iommu.c | 4 arch/sparc64/kernel/iommu_common.c | 12 - arch/sparc64/kernel/ldc.c | 2 arch/sparc64/kernel/pci_sun4v.c | 4 arch/um/drivers/ubd_kern.c | 2 arch/x86/kernel/pci-calgary_64.c | 12 + arch/x86/kernel/pci-gart_64.c | 4 arch/x86/kernel/pci-nommu_64.c | 4 block/ll_rw_blk.c | 5 crypto/digest.c | 2 crypto/hmac.c | 3 crypto/scatterwalk.c | 2 crypto/scatterwalk.h | 6 crypto/tcrypt.c | 4 crypto/xcbc.c | 2 drivers/ata/libata-core.c | 10 - drivers/ata/libata-scsi.c | 2 drivers/block/cciss.c | 4 drivers/block/cpqarray.c | 3 drivers/block/cryptoloop.c | 12 + drivers/block/ub.c | 8 - drivers/ide/cris/ide-cris.c | 4 drivers/ide/ide-probe.c | 4 drivers/ide/ide-taskfile.c | 2 drivers/ide/mips/au1xxx-ide.c | 4 drivers/ieee1394/dma.c | 2 drivers/ieee1394/sbp2.c | 2 drivers/infiniband/core/umem.c | 11 + drivers/infiniband/hw/ipath/ipath_dma.c | 4 drivers/infiniband/hw/ipath/ipath_mr.c | 2 drivers/infiniband/hw/mthca/mthca_memfree.c | 24 ++- drivers/infiniband/ulp/iser/iser_memory.c | 8 - drivers/md/dm-crypt.c | 21 +-- drivers/media/common/saa7146_core.c | 3 drivers/media/video/ivtv/ivtv-udma.c | 4 drivers/media/video/videobuf-dma-sg.c | 8 - drivers/mmc/card/queue.c | 15 +- drivers/mmc/host/at91_mci.c | 8 - drivers/mmc/host/au1xmmc.c | 8 - drivers/mmc/host/imxmmc.c | 2 drivers/mmc/host/mmc_spi.c | 8 - drivers/mmc/host/omap.c | 4 drivers/mmc/host/sdhci.c | 2 drivers/mmc/host/tifm_sd.c | 8 - drivers/mmc/host/wbsd.c | 6 drivers/net/mlx4/icm.c | 14 +- drivers/net/ppp_mppe.c | 6 drivers/scsi/3w-9xxx.c | 4 drivers/scsi/3w-xxxx.c | 2 drivers/scsi/NCR5380.c | 4 drivers/scsi/NCR53c406a.c | 4 drivers/scsi/aacraid/aachba.c | 2 drivers/scsi/aha1542.c | 6 drivers/scsi/arcmsr/arcmsr_hba.c | 4 drivers/scsi/fdomain.c | 6 drivers/scsi/gdth.c | 4 drivers/scsi/ibmmca.c | 2 drivers/scsi/ide-scsi.c | 12 - drivers/scsi/imm.c | 4 drivers/scsi/ipr.c | 19 +- drivers/scsi/ips.c | 6 drivers/scsi/iscsi_tcp.c | 15 +- drivers/scsi/megaraid.c | 6 drivers/scsi/megaraid/megaraid_mbox.c | 8 - drivers/scsi/osst.c | 32 ++-- drivers/scsi/pcmcia/sym53c500_cs.c | 6 drivers/scsi/ppa.c | 4 drivers/scsi/qlogicfas408.c | 2 drivers/scsi/scsi_debug.c | 4 drivers/scsi/scsi_lib.c | 13 + drivers/scsi/sg.c | 30 ++-- drivers/scsi/st.c | 8 - drivers/scsi/tmscsim.c | 5 drivers/scsi/ultrastor.c | 2 drivers/scsi/wd7000.c | 2 drivers/usb/core/message.c | 4 drivers/usb/image/microtek.c | 4 drivers/usb/misc/usbtest.c | 5 drivers/usb/storage/protocol.c | 2 fs/ecryptfs/crypto.c | 16 +- fs/ecryptfs/keystore.c | 3 fs/nfsd/nfs4recover.c | 8 - include/asm-alpha/scatterlist.h | 2 include/asm-arm/scatterlist.h | 2 include/asm-avr32/scatterlist.h | 2 include/asm-blackfin/scatterlist.h | 2 include/asm-cris/scatterlist.h | 2 include/asm-frv/scatterlist.h | 2 include/asm-h8300/scatterlist.h | 2 include/asm-ia64/scatterlist.h | 2 include/asm-m32r/scatterlist.h | 2 include/asm-m68k/scatterlist.h | 2 include/asm-m68knommu/scatterlist.h | 2 include/asm-mips/scatterlist.h | 2 include/asm-parisc/scatterlist.h | 2 include/asm-powerpc/scatterlist.h | 2 include/asm-s390/scatterlist.h | 2 include/asm-sh/scatterlist.h | 2 include/asm-sh64/scatterlist.h | 2 include/asm-sparc/scatterlist.h | 2 include/asm-sparc64/scatterlist.h | 5 include/asm-v850/scatterlist.h | 2 include/asm-x86/dma-mapping_32.h | 4 include/asm-x86/scatterlist_32.h | 5 include/asm-x86/scatterlist_64.h | 5 include/asm-xtensa/scatterlist.h | 2 include/linux/scatterlist.h | 138 +++++++++++++++++--- lib/Kconfig.debug | 10 + lib/swiotlb.c | 2 net/core/skbuff.c | 4 net/ieee80211/ieee80211_crypt_tkip.c | 13 - net/ieee80211/ieee80211_crypt_wep.c | 8 - net/mac80211/wep.c | 8 - net/sctp/auth.c | 3 net/sctp/sm_make_chunk.c | 6 net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 - net/sunrpc/xdr.c | 2 net/xfrm/xfrm_algo.c | 4 134 files changed, 520 insertions(+), 356 deletions(-)
arch/alpha/kernel/pci_iommu.c +1 -1
@@ -465,7 +465,7 @@ EXPORT_SYMBOL(pci_free_consistent);Write dma_length of each leader with the combined lengths of the mergable followers. */ -#define SG_ENT_VIRT_ADDRESS (SG ) (page_address((SG)->page) + (SG)->offset) +#define SG_ENT_VIRT_ADDRESS (SG ) (page_address(sg_page((SG)) + (SG)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) __pa(SG_ENT_VIRT_ADDRESS(SG)) static void
arch/arm/common/dmabounce.c +1 -1
@@ -442,7 +442,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (dir ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { -struct page *page = sg->page; +struct page *page =sg_page (sg);unsigned int offset = sg->offset;unsigned int length = sg->length;void *ptr =page_address (page) + offset;
arch/blackfin/kernel/dma-mapping.c +1 -1
@@ -160,7 +160,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (direction ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { - sg->dma_address = (dma_addr_t)(page_address (sg->page) + + sg->dma_address = (dma_addr_t)(page_address (sg_page (sg)) + sg->offset); invalidate_dcache_range(sg_dma_address(sg),
arch/ia64/hp/common/sba_iommu.c +1 -1
@@ -246,7 +246,7 @@ static int reserve_sba_gart = 1; static SBA_INLINE void sba_mark_invalid(struct ioc *, dma_addr_t, size_t); static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t); -#define sba_sg_address (sg) (page_address((sg)->page) + (sg)->offset) +#define sba_sg_address (sg) (page_address(sg_page((sg)) + (sg)->offset))#ifdef FULL_VALID_PDIR static u64 prefetch_spill_page;
arch/ia64/hp/sim/simscsi.c +2 -2
@@ -131,7 +131,7 @@ simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset) stat.fd = desc[sc->device->id];scsi_for_each_sg (sc, sl,scsi_sg_count (sc), i) { - req.addr =__pa (page_address (sl->page) + sl->offset); + req.addr =__pa (page_address (sg_page (sl)) + sl->offset); req.len = sl->length;if (DBG ) printk("simscsi_sg_%s @ %lx (off %lx) use_sg=%d len=%d\n",
@@ -212,7 +212,7 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len)if (!len)break ; thislen =min (len, slp->length); -memcpy (page_address (slp->page) + slp->offset, buf, thislen); +memcpy (page_address (sg_page (slp)) + slp->offset, buf, thislen); len -= thislen; } }
arch/ia64/sn/pci/pci_dma.c +1 -1
@@ -16,7 +16,7 @@#include <asm/sn/pcidev.h> #include <asm/sn/sn_sal.h> -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))/**
arch/m68k/kernel/dma.c +1 -1
@@ -121,7 +121,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,int i;for (i =0 ; i < nents; sg++, i++) { - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset;dma_sync_single_for_device (dev, sg->dma_address, sg->length, dir); }return nents;
arch/mips/mm/dma-default.c +4 -4
@@ -165,7 +165,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,for (i =0 ; i < nents; i++, sg++) {unsigned long addr; - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (!plat_device_is_coherent (dev) && addr)__dma_sync (addr + sg->offset, sg->length, direction); sg->dma_address = plat_map_dma_mem(dev,
@@ -223,7 +223,7 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,for (i =0 ; i < nhwentries; i++, sg++) {if (!plat_device_is_coherent (dev) && direction !=DMA_TO_DEVICE ) { - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (addr)__dma_sync (addr + sg->offset, sg->length, direction);
@@ -304,7 +304,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (cpu_is_noncoherent_r10000 (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
@@ -322,7 +322,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (!plat_device_is_coherent (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
arch/powerpc/kernel/dma_64.c +1 -1
@@ -161,7 +161,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (page_to_phys (sg->page) + sg->offset) | + sg->dma_address = (page_to_phys (sg_page (sg)) + sg->offset) | dma_direct_offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -102,7 +102,7 @@ static int ibmebus_map_sg(struct device *dev,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (dma_addr_t )page_address (sg->page) + sg->dma_address = (dma_addr_t )page_address (sg_page (sg)) + sg->offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/iommu.c +1 -1
@@ -307,7 +307,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,continue ; }/* Allocate iommu entries for that segment */ - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (sg_page (s)) + s->offset; npages =iommu_num_pages (vaddr, slen); entry =iommu_range_alloc (tbl, npages, &handle, mask >>IOMMU_PAGE_SHIFT ,0 );
arch/powerpc/platforms/ps3/system-bus.c +1 -1
@@ -629,7 +629,7 @@ static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,for_each_sg (sgl, sg, nents, i) {int result =ps3_dma_map (dev->d_region, -page_to_phys (sg->page) + sg->offset, sg->length, +page_to_phys (sg_page (sg)) + sg->offset, sg->length, &sg->dma_address,0 );if (result) {
arch/sparc/kernel/ioport.c +8 -8
@@ -727,9 +727,9 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );/* IIep is write-through, not flushing. */ for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL ); sg->dvma_address = -virt_to_phys (page_address (sg->page)) + sg->offset; +virt_to_phys (page_address (sg_page (sg))) + sg->offset; sg->dvma_length = sg->length; }return nents;
@@ -748,9 +748,9 @@ void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -798,9 +798,9 @@ void pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sgl, intBUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -814,9 +814,9 @@ void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sgl,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
arch/sparc/mm/io-unit.c +1 -1
@@ -144,7 +144,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_busspin_lock_irqsave (&iounit->lock, flags);while (sz !=0 ) { --sz; - sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc/mm/iommu.c +4 -4
@@ -238,7 +238,7 @@ static void iommu_get_scsi_sgl_noflush(struct scatterlist *sg, int sz, struct sbwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -252,7 +252,7 @@ static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbuwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -273,7 +273,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu* XXX Is this a good assumption? * XXX What if someone else unmaps it here and races us? */ -if ((page = (unsigned long )page_address (sg->page)) !=0 ) { +if ((page = (unsigned long )page_address (sg_page (sg))) !=0 ) {for (i =0 ; i < n; i++) {if (page != oldpage) {/* Already flushed? */ flush_page_for_dma (page);
@@ -283,7 +283,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu } } - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
arch/sparc/mm/sun4c.c +1 -1
@@ -1228,7 +1228,7 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus * {while (sz !=0 ) { --sz; - sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc64/kernel/iommu.c +2 -2
@@ -473,7 +473,7 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static void fill_sg(iopte_t *iopte, struct scatterlist *sg, int nused, int nelems,
@@ -566,7 +566,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4u_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/sparc64/kernel/iommu_common.c +6 -6
@@ -73,7 +73,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, daddr = dma_sg->dma_address; sglen = sg->length; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);while (dlen >0 ) {unsigned long paddr;
@@ -123,7 +123,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, sg =sg_next (sg);if (--nents <=0 )break ; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); sglen = sg->length; }if (dlen <0 ) {
@@ -191,7 +191,7 @@ void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npprintk ("sg(%d): page_addr(%p) off(%x) length(%x) " "dma_address[%016x] dma_length[%016x]\n" , i, -page_address (sg->page), sg->offset, +page_address (sg_page (sg)), sg->offset, sg->length, sg->dma_address, sg->dma_length); }
@@ -207,15 +207,15 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)unsigned long prev;u32 dent_addr, dent_len; - prev = (unsigned long ) (page_address (sg->page) + sg->offset); + prev = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); prev += (unsigned long ) (dent_len = sg->length); - dent_addr = (u32) ((unsigned long )(page_address (sg->page) + sg->offset) + dent_addr = (u32) ((unsigned long )(page_address (sg_page (sg)) + sg->offset) & (IO_PAGE_SIZE -1UL ));while (--nents) {unsigned long addr; sg =sg_next (sg); - addr = (unsigned long ) (page_address (sg->page) + sg->offset); + addr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);if (!VCONTIG (prev, addr)) { dma_sg->dma_address = dent_addr; dma_sg->dma_length = dent_len;
arch/sparc64/kernel/ldc.c +1 -1
@@ -2057,7 +2057,7 @@ static void fill_cookies(struct cookie_state *sp, unsigned long pa,static int sg_count_one (struct scatterlist *sg) { -unsigned long base =page_to_pfn (sg->page) <<PAGE_SHIFT ; +unsigned long base =page_to_pfn (sg_page (sg)) <<PAGE_SHIFT ;long len = sg->length;if ((sg->offset | len) & (8UL -1 ))
arch/sparc64/kernel/pci_sun4v.c +2 -2
@@ -366,7 +366,7 @@ static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static long fill_sg(long entry, struct device *dev, struct scatterlist *sg,
@@ -478,7 +478,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4v_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/um/drivers/ubd_kern.c +1 -1
@@ -1115,7 +1115,7 @@ static void do_ubd_request(struct request_queue *q) }prepare_request (req, io_req, (unsigned long long ) req->sector <<9 , - sg->offset, sg->length, sg->page); + sg->offset, sg->length,sg_page (sg)); last_sectors = sg->length >>9 ; n = os_write_file(thread_fd, &io_req,
arch/x86/kernel/pci-calgary_64.c +8 -4
@@ -411,8 +411,10 @@ static int calgary_nontranslate_map_sg(struct device* dev,int i;for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +struct page *p =sg_page (s); + +BUG_ON (!p); + s->dma_address =virt_to_bus (page_address (p) + s->offset); s->dma_length = s->length; }return nelems;
@@ -432,9 +434,11 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,return calgary_nontranslate_map_sg (dev, sg, nelems, direction);for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); +struct page *p =sg_page (s); + +BUG_ON (!p); - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (p) + s->offset; npages =num_dma_pages (vaddr, s->length); entry =iommu_range_alloc (tbl, npages);
arch/x86/kernel/pci-gart_64.c +2 -2
@@ -302,7 +302,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,#endif for_each_sg (sg, s, nents, i) { -unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;if (nonforced_iommu (dev, addr, s->length)) { addr =dma_map_area (dev, addr, s->length, dir);if (addr == bad_dma_address) {
@@ -397,7 +397,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, start_sg = sgmap = sg; ps =NULL ;/* shut up gcc */ for_each_sg (sg, s, nents, i) { -dma_addr_t addr =page_to_phys (s->page) + s->offset; +dma_addr_t addr =page_to_phys (sg_page (s)) + s->offset; s->dma_address = addr;BUG_ON (s->length ==0 );
arch/x86/kernel/pci-nommu_64.c +2 -2
@@ -62,8 +62,8 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,int i;for_each_sg (sg, s, nents, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +BUG_ON (!sg_page (s)); + s->dma_address =virt_to_bus (page_address (sg_page (s)) +s->offset);if (!check_addr ("map_sg" , hwdev, s->dma_address, s->length))return 0 ; s->dma_length = s->length;
block/ll_rw_blk.c +3 -2
@@ -1354,8 +1354,9 @@ new_segment:else sg =sg_next (sg); -memset (sg,0 ,sizeof (*sg)); - sg->page = bvec->bv_page; +sg_dma_len (sg) =0 ; +sg_dma_address (sg) =0 ; +sg_set_page (sg, bvec->bv_page); sg->length = nbytes; sg->offset = bvec->bv_offset; nsegs++;
crypto/digest.c +1 -1
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,return 0 ;for (;;) { -struct page *pg = sg->page; +struct page *pg =sg_page (sg);unsigned int offset = sg->offset;unsigned int l = sg->length;
crypto/hmac.c +2 -1
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg, desc.flags = pdesc->flags &CRYPTO_TFM_REQ_MAY_SLEEP ;sg_set_buf (sg1, ipad, bs); - sg1[1 ].page = (void *)sg; + +sg_set_page (&sg[1 ], (void *) sg); sg1[1 ].length =0 ;sg_set_buf (sg2, opad, bs + ds);
crypto/scatterwalk.c +1 -1
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,if (out) {struct page *page; - page = walk->sg->page + ((walk->offset -1 ) >>PAGE_SHIFT ); + page =sg_page (walk->sg) + ((walk->offset -1 ) >>PAGE_SHIFT );flush_dcache_page (page); }
crypto/scatterwalk.h +3 -3
@@ -22,13 +22,13 @@static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg) { -return (++sg)->length ? sg : (void *)sg->page; +return (++sg)->length ? sg : (void *)sg_page (sg); }static inline unsigned long scatterwalk_samebuf (struct scatter_walk *walk_in,struct scatter_walk *walk_out) { -return !(((walk_in->sg->page - walk_out->sg->page) <<PAGE_SHIFT ) + +return !(((sg_page (walk_in->sg) -sg_page (walk_out->sg)) <<PAGE_SHIFT ) + (int )(walk_in->offset - walk_out->offset)); }
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,static inline struct page *scatterwalk_page (struct scatter_walk *walk) { -return walk->sg->page + (walk->offset >>PAGE_SHIFT ); +return sg_page (walk->sg) + (walk->offset >>PAGE_SHIFT ); }static inline void scatterwalk_unmap (void *vaddr,int out)
crypto/tcrypt.c +2 -2
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc, goto out; } - q =kmap (sg[0 ].page) + sg[0 ].offset; + q =kmap (sg_page (&sg[0 ])) + sg[0 ].offset;hexdump (q, cipher_tv[i].rlen); printk("%s\n",
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc, temp =0 ;for (k =0 ; k < cipher_tv[i].np; k++) {printk ("page %u\n" , k); - q =kmap (sg[k].page) + sg[k].offset; + q =kmap (sg_page (&sg[k])) + sg[k].offset;hexdump (q, cipher_tv[i].tap[k]); printk("%s\n", memcmp(q, cipher_tv[i].result + temp,
crypto/xcbc.c +1 -1
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, do { - struct page *pg = sg[i].page; + struct page *pg = sg_page(&sg[i]); unsigned int offset = sg[i].offset; unsigned int slen = sg[i].length;
drivers/ata/libata-core.c +5 -5
@@ -4296,7 +4296,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc)sg_last (sg, qc->orig_n_elem)->length += qc->pad_len;if (pad_buf) {struct scatterlist *psg = &qc->pad_sgent; -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (addr + psg->offset, pad_buf, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4686,11 +4686,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)* data in this function or read data in ata_sg_clean. */ offset = lsg->offset + lsg->length - qc->pad_len; - psg->page =nth_page (lsg->page, offset >>PAGE_SHIFT ); +sg_set_page (psg,nth_page (sg_page (lsg), offset >>PAGE_SHIFT )); psg->offset =offset_in_page (offset);if (qc->tf.flags &ATA_TFLAG_WRITE ) { -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (pad_buf, addr + psg->offset, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4836,7 +4836,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ; - page = qc->cursg->page; + page =sg_page (qc->cursg); offset = qc->cursg->offset + qc->cursg_ofs;/* get the current page and offset */
@@ -4988,7 +4988,7 @@ next_sg: sg = qc->cursg; - page = sg->page; + page =sg_page (sg); offset = sg->offset + qc->cursg_ofs;/* get the current page and offset */
drivers/ata/libata-scsi.c +1 -1
@@ -1544,7 +1544,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)struct scatterlist *sg =scsi_sglist (cmd);if (sg) { - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; buflen = sg->length; }else { buf =NULL ;
drivers/block/cciss.c +2 -2
@@ -2610,7 +2610,7 @@ static void do_cciss_request(struct request_queue *q) (int)creq->nr_sectors);#endif /* CCISS_DEBUG */ -memset (tmp_sg,0 ,sizeof (tmp_sg)); +sg_init_table (tmp_sg,MAXSGENTRIES ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* get the DMA records for the setup */
@@ -2621,7 +2621,7 @@ static void do_cciss_request(struct request_queue *q)for (i =0 ; i < seg; i++) { c->SG[i].Len = tmp_sg[i].length; - temp64.val = (__u64 )pci_map_page (h->pdev, tmp_sg[i].page, + temp64.val = (__u64 )pci_map_page (h->pdev,sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); c->SG[i].Addr.lower = temp64.val32.lower;
drivers/block/cpqarray.c +2 -1
@@ -918,6 +918,7 @@ queue_next:DBGPX ( printk("sector=%d, nr_sectors=%d\n", creq->sector, creq->nr_sectors); ); +sg_init_table (tmp_sg,SG_MAX ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* Now do all the DMA Mappings */
@@ -929,7 +930,7 @@ DBGPX( { c->req.sg[i].size = tmp_sg[i].length; c->req.sg[i].addr = (__u32 )pci_map_page (h->pci_dev, - tmp_sg[i].page, +sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); }
drivers/block/cryptoloop.c +8 -4
@@ -26,6 +26,7 @@#include <linux/crypto.h> #include <linux/blkdev.h> #include <linux/loop.h> +#include <linux/scatterlist.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -119,14 +120,17 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, .tfm = tfm, .flags = CRYPTO_TFM_REQ_MAY_SLEEP, }; -struct scatterlist sg_out = {NULL , }; -struct scatterlist sg_in = {NULL , }; +struct scatterlist sg_out; +struct scatterlist sg_in;encdec_cbc_t encdecfunc;struct page *in_page, *out_page;unsigned in_offs, out_offs;int err; +sg_init_table (&sg_out,1 ); +sg_init_table (&sg_in,1 ); +if (cmd ==READ ) { in_page = raw_page; in_offs = raw_off;
@@ -146,11 +150,11 @@ cryptoloop_transfer(struct loop_device *lo, int cmd,u32 iv[4 ] = {0 , }; iv[0 ] =cpu_to_le32 (IV &0xffffffff ); - sg_in.page = in_page; +sg_set_page (&sg_in, in_page); sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = out_page; +sg_set_page (&sg_out, out_page); sg_out.offset = out_offs; sg_out.length = sz;
drivers/block/ub.c +5 -3
@@ -25,6 +25,7 @@#include <linux/usb_usual.h> #include <linux/blkdev.h> #include <linux/timer.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #define DRV_NAME "ub"
@@ -656,6 +657,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)if ((cmd =ub_get_cmd (lun)) ==NULL )return -1 ;memset (cmd,0 ,sizeof (struct ub_scsi_cmd )); +sg_init_table (cmd->sgv,UB_MAX_REQ_SG );blkdev_dequeue_request (rq);
@@ -1310,7 +1312,7 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) pipe = sc->send_bulk_pipe; sc->last_pipe = pipe;usb_fill_bulk_urb (&sc->work_urb, sc->dev, pipe, -page_address (sg->page) + sg->offset, sg->length, +page_address (sg_page (sg)) + sg->offset, sg->length, ub_urb_complete, sc); sc->work_urb.actual_length =0 ; sc->work_urb.error_count =0 ;
@@ -1427,7 +1429,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd) scmd->state =UB_CMDST_INIT ; scmd->nsg =1 ; sg = &scmd->sgv[0 ]; - sg->page =virt_to_page (sc->top_sense); +sg_set_page (sg,virt_to_page (sc->top_sense)); sg->offset = (unsigned long )sc->top_sense & (PAGE_SIZE -1 ); sg->length =UB_SENSE_SIZE ; scmd->len =UB_SENSE_SIZE ;
@@ -1863,7 +1865,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, cmd->state =UB_CMDST_INIT ; cmd->nsg =1 ; sg = &cmd->sgv[0 ]; - sg->page =virt_to_page (p); +sg_set_page (sg,virt_to_page (p)); sg->offset = (unsigned long )p & (PAGE_SIZE -1 ); sg->length =8 ; cmd->len =8 ;
drivers/ide/cris/ide-cris.c +2 -2
@@ -934,11 +934,11 @@ static int cris_ide_build_dmatable (ide_drive_t *drive)* than two possibly non-adjacent physical 4kB pages. */ /* group sequential buffers into one large buffer */ - addr =page_to_phys (sg->page) + sg->offset; + addr =page_to_phys (sg_page (sg)) + sg->offset; size =sg_dma_len (sg);while (--i) { sg =sg_next (sg); -if ((addr + size) !=page_to_phys (sg->page) + sg->offset) +if ((addr + size) !=page_to_phys (sg_page (sg)) + sg->offset)break ; size +=sg_dma_len (sg); }
drivers/ide/ide-probe.c +3 -1
@@ -1337,12 +1337,14 @@ static int hwif_init(ide_hwif_t *hwif)if (!hwif->sg_max_nents) hwif->sg_max_nents =PRD_ENTRIES ; - hwif->sg_table =kzalloc (sizeof (struct scatterlist )*hwif->sg_max_nents, + hwif->sg_table =kmalloc (sizeof (struct scatterlist )*hwif->sg_max_nents,GFP_KERNEL );if (!hwif->sg_table) {printk (KERN_ERR "%s: unable to allocate SG table.\n" , hwif->name); goto out; } + +sg_init_table (hwif->sg_table, hwif->sg_max_nents);if (init_irq (hwif) ==0 ) goto done;
drivers/ide/ide-taskfile.c +1 -1
@@ -278,7 +278,7 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) hwif->cursg = sg; } - page = cursg->page; + page =sg_page (cursg); offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */
drivers/ide/mips/au1xxx-ide.c +2 -2
@@ -276,7 +276,7 @@ static int auide_build_dmatable(ide_drive_t *drive)if (iswrite) {if (!put_source_flags (ahwif->tx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
@@ -285,7 +285,7 @@ static int auide_build_dmatable(ide_drive_t *drive) }else {if (!put_dest_flags (ahwif->rx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
drivers/ieee1394/dma.c +1 -1
@@ -111,7 +111,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,unsigned long va = (unsigned long )dma->kvirt + (i <<PAGE_SHIFT ); - dma->sglist[i].page =vmalloc_to_page ((void *)va); +sg_set_page (&dma->sglist[i],vmalloc_to_page ((void *)va)); dma->sglist[i].length =PAGE_SIZE ; }
drivers/ieee1394/sbp2.c +1 -1
@@ -1466,7 +1466,7 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, cmd->dma_size = sgpnt[0 ].length; cmd->dma_type =CMD_DMA_PAGE ; cmd->cmd_dma =dma_map_page (hi->host->device.parent, - sgpnt[0 ].page, sgpnt[0 ].offset, +sg_page (&sgpnt[0 ]), sgpnt[0 ].offset, cmd->dma_size, cmd->dma_dir); orb->data_descriptor_lo = cmd->cmd_dma;
drivers/infiniband/core/umem.c +7 -4
@@ -55,9 +55,11 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dib_dma_unmap_sg (dev, chunk->page_list, chunk->nents,DMA_BIDIRECTIONAL );for (i =0 ; i < chunk->nents; ++i) { +struct page *page =sg_page (&chunk->page_list[i]); +if (umem->writable && dirty) -set_page_dirty_lock (chunk->page_list[i].page); -put_page (chunk->page_list[i].page); +set_page_dirty_lock (page); +put_page (page); }kfree (chunk);
@@ -164,11 +166,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, } chunk->nents =min_t (int, ret,IB_UMEM_MAX_PAGE_CHUNK ); +sg_init_table (chunk->page_list, chunk->nents);for (i =0 ; i < chunk->nents; ++i) {if (vma_list && !is_vm_hugetlb_page (vma_list[i + off])) umem->hugetlb =0 ; - chunk->page_list[i].page = page_list[i + off]; +sg_set_page (&chunk->page_list[i], page_list[i + off]); chunk->page_list[i].offset =0 ; chunk->page_list[i].length =PAGE_SIZE ; }
@@ -179,7 +182,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, DMA_BIDIRECTIONAL);if (chunk->nmap <=0 ) {for (i =0 ; i < chunk->nents; ++i) -put_page (chunk->page_list[i].page); +put_page (sg_page (&chunk->page_list[i]));kfree (chunk); ret = -ENOMEM ;
drivers/infiniband/hw/ipath/ipath_dma.c +2 -2
@@ -108,7 +108,7 @@ static int ipath_map_sg(struct ib_device *dev, struct scatterlist *sgl,BUG_ON (!valid_dma_direction (direction));for_each_sg (sgl, sg, nents, i) { - addr = (u64 )page_address (sg->page); + addr = (u64 )page_address (sg_page (sg));/* TODO: handle highmem pages */ if (!addr) { ret =0 ;
@@ -127,7 +127,7 @@ static void ipath_unmap_sg(struct ib_device *dev,static u64 ipath_sg_dma_address (struct ib_device *dev,struct scatterlist *sg) { -u64 addr = (u64 )page_address (sg->page); +u64 addr = (u64 )page_address (sg_page (sg));if (addr) addr += sg->offset;
drivers/infiniband/hw/ipath/ipath_mr.c +1 -1
@@ -225,7 +225,7 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,for (i =0 ; i < chunk->nents; i++) {void *vaddr; - vaddr =page_address (chunk->page_list[i].page); + vaddr =page_address (sg_page (&chunk->page_list[i]));if (!vaddr) { ret =ERR_PTR (-EINVAL ); goto bail;
drivers/infiniband/hw/mthca/mthca_memfree.c +15 -9
@@ -71,7 +71,7 @@ static void mthca_free_icm_pages(struct mthca_dev *dev, struct mthca_icm_chunk * PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -81,7 +81,7 @@ static void mthca_free_icm_coherent(struct mthca_dev *dev, struct mthca_icm_chunfor (i =0 ; i < chunk->npages; ++i) {dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); } }
@@ -107,10 +107,13 @@ void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm, int coherent)static int mthca_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -157,6 +160,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MTHCA_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -304,7 +308,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj, dma_addr_t *dma_h* so if we found the page, dma_handle has already * been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
@@ -445,6 +449,7 @@ static u64 mthca_uarc_virt(struct mthca_dev *dev, struct mthca_uar *uar, int pagint mthca_map_user_db (struct mthca_dev *dev,struct mthca_uar *uar,struct mthca_user_db_table *db_tab,int index,u64 uaddr) { +struct page *pages[1 ];int ret =0 ;u8 status;int i;
@@ -472,16 +477,17 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, } ret =get_user_pages (current, current->mm, uaddr &PAGE_MASK ,1 ,1 ,0 , - &db_tab->page[i].mem.page,NULL ); + pages,NULL );if (ret <0 ) goto out; +sg_set_page (&db_tab->page[i].mem, pages[0 ]); db_tab->page[i].mem.length =MTHCA_ICM_PAGE_SIZE ; db_tab->page[i].mem.offset = uaddr & ~PAGE_MASK ; ret =pci_map_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE );if (ret <0 ) { -put_page (db_tab->page[i].mem.page); +put_page (pages[0 ]); goto out; }
@@ -491,7 +497,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, ret = -EINVAL ;if (ret) {pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); goto out; }
@@ -557,7 +563,7 @@ void mthca_cleanup_user_db_tab(struct mthca_dev *dev, struct mthca_uar *uar,if (db_tab->page[i].uvirt) {mthca_UNMAP_ICM (dev,mthca_uarc_virt (dev, uar, i),1 , &status);pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); } }
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -131,7 +131,7 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, data->size, i) { - from =kmap_atomic (sg->page,KM_USER0 ); + from =kmap_atomic (sg_page (sg),KM_USER0 );memcpy (p, from + sg->offset, sg->length);
@@ -191,7 +191,7 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, sg_size, i) { - to =kmap_atomic (sg->page,KM_SOFTIRQ0 ); + to =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 );memcpy (to + sg->offset, p, sg->length);
@@ -300,7 +300,7 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,for_each_sg (sgl, sg, data->dma_nents, i) {/* iser_dbg("Checking sg iobuf [%d]: phys=0x%08lX " "offset: %ld sz: %ld\n", i, -(unsigned long)page_to_phys(sg->page), +(unsigned long)page_to_phys(sg_page(sg)), (unsigned long)sg->offset, (unsigned long)sg->length); */ end_addr = ib_sg_dma_address(ibdev, sg) +
@@ -336,7 +336,7 @@ static void iser_data_buf_dump(struct iser_data_buf *data,iser_err ("sg[%d] dma_addr:0x%lX page:0x%p " "off:0x%x sz:0x%x dma_len:0x%x\n" , i, (unsigned long )ib_sg_dma_address (ibdev, sg), - sg->page, sg->offset, +sg_page (sg), sg->offset, sg->length,ib_sg_dma_len (ibdev, sg)); }
drivers/md/dm-crypt.c +11 -10
@@ -346,16 +346,17 @@ static int crypt_convert(struct crypt_config *cc, ctx->idx_out < ctx->bio_out->bi_vcnt) {struct bio_vec *bv_in =bio_iovec_idx (ctx->bio_in, ctx->idx_in);struct bio_vec *bv_out =bio_iovec_idx (ctx->bio_out, ctx->idx_out); -struct scatterlist sg_in = { - .page = bv_in->bv_page, - .offset = bv_in->bv_offset + ctx->offset_in, - .length =1 <<SECTOR_SHIFT - }; -struct scatterlist sg_out = { - .page = bv_out->bv_page, - .offset = bv_out->bv_offset + ctx->offset_out, - .length =1 <<SECTOR_SHIFT - }; +struct scatterlist sg_in, sg_out; + +sg_init_table (&sg_in,1 ); +sg_set_page (&sg_in, bv_in->bv_page); + sg_in.offset = bv_in->bv_offset + ctx->offset_in; + sg_in.length =1 <<SECTOR_SHIFT ; + +sg_init_table (&sg_out,1 ); +sg_set_page (&sg_out, bv_out->bv_page); + sg_out.offset = bv_out->bv_offset + ctx->offset_out; + sg_out.length =1 <<SECTOR_SHIFT ; ctx->offset_in += sg_in.length;if (ctx->offset_in >= bv_in->bv_len) {
drivers/media/common/saa7146_core.c +2 -1
@@ -112,12 +112,13 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/media/video/ivtv/ivtv-udma.c +2 -2
@@ -63,10 +63,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_infomemcpy (page_address (dma->bouncemap[map_offset]) + offset, src, len);kunmap_atomic (src,KM_BOUNCE_READ );local_irq_restore (flags); - dma->SGlist[map_offset].page = dma->bouncemap[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->bouncemap[map_offset]); }else { - dma->SGlist[map_offset].page = dma->map[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->map[map_offset]); } offset =0 ; map_offset++;
drivers/media/video/videobuf-dma-sg.c +5 -3
@@ -60,12 +60,13 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
@@ -86,13 +87,14 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) sglist =kcalloc (nr_pages,sizeof (*sglist),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);if (NULL == pages[0 ]) goto nopage;if (PageHighMem (pages[0 ]))/* DMA to highmem pages might not work */ goto highmem; - sglist[0 ].page = pages[0 ]; +sg_set_page (&sglist[0 ], pages[0 ]); sglist[0 ].offset = offset; sglist[0 ].length =PAGE_SIZE - offset;for (i =1 ; i < nr_pages; i++) {
@@ -100,7 +102,7 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) goto nopage;if (PageHighMem (pages[i])) goto highmem; - sglist[i].page = pages[i]; +sg_set_page (&sglist[i], pages[i]); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/mmc/card/queue.c +8 -7
@@ -13,6 +13,7 @@#include <linux/blkdev.h> #include <linux/freezer.h> #include <linux/kthread.h> +#include <linux/scatterlist.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h>
@@ -153,19 +154,21 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lockblk_queue_max_hw_segments (mq->queue, bouncesz /512 );blk_queue_max_segment_size (mq->queue, bouncesz); - mq->sg =kzalloc (sizeof (struct scatterlist ), + mq->sg =kmalloc (sizeof (struct scatterlist ),GFP_KERNEL );if (!mq->sg) { ret = -ENOMEM ; goto cleanup_queue; } +sg_init_table (mq->sg,1 ); - mq->bounce_sg =kzalloc (sizeof (struct scatterlist ) * + mq->bounce_sg =kmalloc (sizeof (struct scatterlist ) * bouncesz /512 ,GFP_KERNEL );if (!mq->bounce_sg) { ret = -ENOMEM ; goto cleanup_queue; } + sg_init_table(mq->bounce_sg, bouncesz / 512); } }#endif
@@ -302,12 +305,12 @@ static void copy_sg(struct scatterlist *dst, unsigned int dst_len,BUG_ON (dst_len ==0 );if (dst_size ==0 ) { - dst_buf =page_address (dst->page) + dst->offset; + dst_buf =page_address (sg_page (dst)) + dst->offset; dst_size = dst->length; }if (src_size ==0 ) { - src_buf =page_address (src->page) + src->offset; + src_buf =page_address (sg_page (src)) + src->offset; src_size = src->length; }
@@ -353,9 +356,7 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq)return 1 ; } - mq->sg[0 ].page =virt_to_page (mq->bounce_buf); - mq->sg[0 ].offset =offset_in_page (mq->bounce_buf); - mq->sg[0 ].length =0 ; +sg_init_one (mq->sg, mq->bounce_buf,0 );while (sg_len) { mq->sg[0 ].length += mq->bounce_sg[sg_len -1 ].length;
drivers/mmc/host/at91_mci.c +4 -4
@@ -149,7 +149,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data sg = &data->sg[i]; - sgbuffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + sgbuffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; amount =min (size, sg->length); size -= amount;
@@ -226,7 +226,7 @@ static void at91_mci_pre_dma_read(struct at91mci_host *host) sg = &data->sg[host->transfer_index++];pr_debug ("sg = %p\n" , sg); - sg->dma_address =dma_map_page (NULL , sg->page, sg->offset, sg->length,DMA_FROM_DEVICE ); + sg->dma_address =dma_map_page (NULL ,sg_page (sg), sg->offset, sg->length,DMA_FROM_DEVICE );pr_debug ("dma address = %08X, length = %d\n" , sg->dma_address, sg->length);
@@ -283,7 +283,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)int index;/* Swap the contents of the buffer */ - buffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset;pr_debug ("buffer = %p, length = %d\n" , buffer, sg->length);for (index =0 ; index < (sg->length /4 ); index++)
@@ -292,7 +292,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); } -flush_dcache_page (sg->page); +flush_dcache_page (sg_page (sg)); }/* Is there another transfer to trigger? */
drivers/mmc/host/au1xmmc.c +4 -4
@@ -340,7 +340,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)/* This is the pointer to the data buffer */ sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len = data->sg[host->pio.index].length - host->pio.offset;
@@ -400,7 +400,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)if (host->pio.index < host->dma.len) { sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len =sg_dma_len (&data->sg[host->pio.index]) - host->pio.offset;
@@ -613,13 +613,13 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)if (host->flags &HOST_F_XMIT ){ ret =au1xxx_dbdma_put_source_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }else { ret =au1xxx_dbdma_put_dest_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }
drivers/mmc/host/imxmmc.c +1 -1
@@ -262,7 +262,7 @@ static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data) }/* Convert back to virtual address */ - host->data_ptr = (u16 *)(page_address (data->sg->page) + data->sg->offset); + host->data_ptr = (u16 *)(page_address (sg_page (data->sg)) + data->sg->offset); host->data_cnt =0 ;clear_bit (IMXMCI_PEND_DMA_DATA_b, &host->pending_events);
drivers/mmc/host/mmc_spi.c +4 -4
@@ -813,7 +813,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, && dir == DMA_FROM_DEVICE) dir =DMA_BIDIRECTIONAL ; - dma_addr =dma_map_page (dma_dev, sg->page,0 , + dma_addr =dma_map_page (dma_dev,sg_page (sg),0 ,PAGE_SIZE , dir);if (direction ==DMA_TO_DEVICE ) t->tx_dma = dma_addr + sg->offset;
@@ -822,7 +822,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, }/* allow pio too; we don't allow highmem */ - kmap_addr =kmap (sg->page); + kmap_addr =kmap (sg_page (sg));if (direction ==DMA_TO_DEVICE ) t->tx_buf = kmap_addr + sg->offset;else
@@ -855,8 +855,8 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,/* discard mappings */ if (direction ==DMA_FROM_DEVICE ) -flush_kernel_dcache_page (sg->page); -kunmap (sg->page); +flush_kernel_dcache_page (sg_page (sg)); +kunmap (sg_page (sg));if (dma_dev)dma_unmap_page (dma_dev, dma_addr,PAGE_SIZE , dir);
drivers/mmc/host/omap.c +2 -2
@@ -24,10 +24,10 @@#include <linux/mmc/host.h> #include <linux/mmc/card.h> #include <linux/clk.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/scatterlist.h> #include <asm/mach-types.h> #include <asm/arch/board.h>
@@ -383,7 +383,7 @@ mmc_omap_sg_to_buf(struct mmc_omap_host *host) sg = host->data->sg + host->sg_idx; host->buffer_bytes_left = sg->length; - host->buffer =page_address (sg->page) + sg->offset; + host->buffer =page_address (sg_page (sg)) + sg->offset;if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; }
drivers/mmc/host/sdhci.c +1 -1
@@ -231,7 +231,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host)static inline char *sdhci_sg_to_buffer (struct sdhci_host * host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline int sdhci_next_sg (struct sdhci_host * host)
drivers/mmc/host/tifm_sd.c +4 -4
@@ -192,7 +192,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt);
@@ -241,18 +241,18 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt); p_cnt =min (p_cnt, t_size);if (r_data->flags &MMC_DATA_WRITE ) -tifm_sd_copy_page (host->bounce_buf.page, +tifm_sd_copy_page (sg_page (&host->bounce_buf), r_data->blksz - t_size, pg, p_off, p_cnt);else if (r_data->flags &MMC_DATA_READ ) -tifm_sd_copy_page (pg, p_off, host->bounce_buf.page, +tifm_sd_copy_page (pg, p_off,sg_page (&host->bounce_buf), r_data->blksz - t_size, p_cnt); t_size -= p_cnt;
drivers/mmc/host/wbsd.c +3 -3
@@ -269,7 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host *host)static inline char *wbsd_sg_to_buffer (struct wbsd_host *host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline void wbsd_sg_to_dma (struct wbsd_host *host,struct mmc_data *data)
@@ -283,7 +283,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (dmabuf, sgbuf, sg[i].length); dmabuf += sg[i].length; }
@@ -300,7 +300,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (sgbuf, dmabuf, sg[i].length); dmabuf += sg[i].length; }
drivers/net/mlx4/icm.c +9 -5
@@ -60,7 +60,7 @@ static void mlx4_free_icm_pages(struct mlx4_dev *dev, struct mlx4_icm_chunk *chu PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -70,7 +70,7 @@ static void mlx4_free_icm_coherent(struct mlx4_dev *dev, struct mlx4_icm_chunk *for (i =0 ; i < chunk->npages; ++i)dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); }
@@ -95,10 +95,13 @@ void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent)static int mlx4_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -145,6 +148,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MLX4_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -334,7 +338,7 @@ void *mlx4_table_find(struct mlx4_icm_table *table, int obj, dma_addr_t *dma_han* been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
drivers/net/ppp_mppe.c +2 -4
@@ -55,7 +55,7 @@#include <linux/mm.h> #include <linux/ppp_defs.h> #include <linux/ppp-comp.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include "ppp_mppe.h"
@@ -68,9 +68,7 @@ MODULE_VERSION("1.0.2");static unsigned int setup_sg (struct scatterlist *sg,const void *address,unsigned int length) { - sg[0 ].page =virt_to_page (address); - sg[0 ].offset =offset_in_page (address); - sg[0 ].length = length; +sg_init_one (sg, address, length);return length; }
drivers/scsi/3w-9xxx.c +2 -2
@@ -1840,7 +1840,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, (scsi_bufflen(srb) < TW_MIN_SGL_LENGTH)) {if (srb->sc_data_direction ==DMA_TO_DEVICE || srb->sc_data_direction ==DMA_BIDIRECTIONAL ) {struct scatterlist *sg =scsi_sglist (srb); -char *buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; +char *buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (tw_dev->generic_buffer_virt[request_id], buf, sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 ); }
@@ -1919,7 +1919,7 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int rechar *buf;unsigned long flags =0 ;local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buf, tw_dev->generic_buffer_virt[request_id], sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/3w-xxxx.c +1 -1
@@ -1469,7 +1469,7 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,struct scatterlist *sg =scsi_sglist (cmd);local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len);memcpy (buf, data, transfer_len);
drivers/scsi/NCR5380.c +2 -2
@@ -298,7 +298,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.buffers_residual = cmd->use_sg -1 ; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset; cmd->SCp.this_residual = cmd->SCp.buffer->length; }else {
@@ -2143,7 +2143,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ++cmd->SCp.buffer; --cmd->SCp.buffers_residual; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset;dprintk (NDEBUG_INFORMATION , ("scsi%d : %d bytes and %d buffers left\n" , instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual)); }
drivers/scsi/NCR53c406a.c +2 -2
@@ -875,7 +875,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_write (page_address (sg->page) + sg->offset, +NCR53c406a_pio_write (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
@@ -897,7 +897,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_read (page_address (sg->page) + sg->offset, +NCR53c406a_pio_read (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
drivers/scsi/aacraid/aachba.c +1 -1
@@ -356,7 +356,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigneint transfer_len;struct scatterlist *sg =scsi_sglist (scsicmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len + offset); transfer_len -= offset;
drivers/scsi/aha1542.c +3 -3
@@ -49,7 +49,7 @@#include "aha1542.h" #define SCSI_BUF_PA (address) isa_virt_to_bus(address) -#define SCSI_SG_PA (sgent) (isa_page_to_bus((sgent)->page) + (sgent)->offset) +#define SCSI_SG_PA (sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)static void BAD_DMA (void *address,unsigned int length) {
@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt, {printk (KERN_CRIT "sgpnt[%d:%d] page %p/0x%llx length %u\n" , badseg, nseg, -page_address (sgp->page) + sgp->offset, +page_address (sg_page (sgp)) + sgp->offset, (unsigned long long )SCSI_SG_PA (sgp), sgp->length);
@@ -712,7 +712,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))printk (KERN_CRIT "Bad segment list supplied to aha1542.c (%d, %d)\n" , SCpnt->use_sg, i);scsi_for_each_sg (SCpnt, sg, SCpnt->use_sg, i) {printk (KERN_CRIT "%d: %p %d\n" , i, - (page_address (sg->page) + + (page_address (sg_page (sg)) + sg->offset), sg->length); };printk (KERN_CRIT "cptr %x: " , (unsigned int ) cptr);
drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
@@ -1343,7 +1343,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \/* 4 bytes: Areca io control code */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (scsi_sg_count (cmd) >1 ) { retvalue =ARCMSR_MESSAGE_FAIL ; goto message_out;
@@ -1593,7 +1593,7 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,strncpy (&inqdata[32 ],"R001" ,4 );/* Product Revision */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buffer, inqdata,sizeof (inqdata)); sg =scsi_sglist (cmd);
drivers/scsi/fdomain.c +3 -3
@@ -1321,7 +1321,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id)if (current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; }else break ;
@@ -1354,7 +1354,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id) && current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; } }
@@ -1439,7 +1439,7 @@ static int fdomain_16x0_queue(struct scsi_cmnd *SCpnt,if (scsi_sg_count (current_SC)) { current_SC->SCp.buffer =scsi_sglist (current_SC); - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; current_SC->SCp.buffers_residual =scsi_sg_count (current_SC) -1 ;
drivers/scsi/gdth.c +2 -2
@@ -2374,13 +2374,13 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow; -if (!sl->page) { +if (!sg_page (sl)) {printk ("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n" , ha->hanum);return ; }local_irq_save (flags); - address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; + address =kmap_atomic (sg_page (sl),KM_BIO_SRC_IRQ ) + sl->offset;if (to_buffer)memcpy (buffer, address, cpnow);else
drivers/scsi/ibmmca.c +1 -1
@@ -1828,7 +1828,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))BUG_ON (scsi_sg_count (cmd) >16 );scsi_for_each_sg (cmd, sg,scsi_sg_count (cmd), i) { -ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg->page) + sg->offset); +ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg_page (sg)) + sg->offset);ld (shpnt)[ldn].sge[i].byte_length = sg->length; } scb->enable |=IM_POINTER_TO_LIST ;
drivers/scsi/ide-scsi.c +6 -6
@@ -175,18 +175,18 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignewhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count); }
@@ -212,18 +212,18 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignwhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count); }
drivers/scsi/imm.c +2 -2
@@ -706,7 +706,7 @@ static int imm_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset;/*
@@ -845,7 +845,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/ipr.c +12 -7
@@ -2872,6 +2872,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len) } scatterlist = sglist->scatterlist; +sg_init_table (scatterlist, num_elem); sglist->order = order; sglist->num_sg = num_elem;
@@ -2884,12 +2885,12 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)/* Free up what we already allocated */ for (j = i -1 ; j >=0 ; j--) -__free_pages (scatterlist[j].page, order); +__free_pages (sg_page (&scatterlist[j]), order);kfree (sglist);return NULL ; } - scatterlist[i].page = page; +sg_set_page (&scatterlist[i], page); }return sglist;
@@ -2910,7 +2911,7 @@ static void ipr_free_ucode_buffer(struct ipr_sglist *sglist)int i;for (i =0 ; i < sglist->num_sg; i++) -__free_pages (sglist->scatterlist[i].page, sglist->order); +__free_pages (sg_page (&sglist->scatterlist[i]), sglist->order);kfree (sglist); }
@@ -2940,9 +2941,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, scatterlist = sglist->scatterlist;for (i =0 ; i < (len / bsize_elem); i++, buffer += bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = bsize_elem;
@@ -2953,9 +2956,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, }if (len % bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, len % bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = len % bsize_elem; }
drivers/scsi/ips.c +3 -3
@@ -1515,7 +1515,7 @@ static int ips_is_passthru(struct scsi_cmnd *SC)/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && buffer[2 ] =='P' && buffer[3 ] =='P' ) {kunmap_atomic (buffer - sg->offset,KM_IRQ0 );
@@ -3523,7 +3523,7 @@ ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (buffer, &cdata[xfer_cnt], min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
@@ -3556,7 +3556,7 @@ ips_scmd_buf_read(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (&cdata[xfer_cnt], buffer, min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/iscsi_tcp.c +7 -8
@@ -70,9 +70,7 @@ module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);static inline void iscsi_buf_init_iov (struct iscsi_buf *ibuf,char *vbuf,int size) { - ibuf->sg.page =virt_to_page (vbuf); - ibuf->sg.offset =offset_in_page (vbuf); - ibuf->sg.length = size; +sg_init_one (&ibuf->sg, vbuf, size); ibuf->sent =0 ; ibuf->use_sendmsg =1 ; }
@@ -80,13 +78,14 @@ iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)static inline void iscsi_buf_init_sg (struct iscsi_buf *ibuf,struct scatterlist *sg) { - ibuf->sg.page = sg->page; +sg_init_table (&ibuf->sg,1 ); +sg_set_page (&ibuf->sg,sg_page (sg)); ibuf->sg.offset = sg->offset; ibuf->sg.length = sg->length;/* * Fastpath: sg element fits into single page */ -if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg->page)) +if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg_page (sg))) ibuf->use_sendmsg =0 ;else ibuf->use_sendmsg =1 ;
@@ -716,7 +715,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)for (i = tcp_ctask->sg_count; i <scsi_sg_count (sc); i++) {char *dest; - dest =kmap_atomic (sg[i].page,KM_SOFTIRQ0 ); + dest =kmap_atomic (sg_page (&sg[i]),KM_SOFTIRQ0 ); rc =iscsi_ctask_copy (tcp_conn, ctask, dest + sg[i].offset, sg[i].length, offset);kunmap_atomic (dest,KM_SOFTIRQ0 );
@@ -1103,9 +1102,9 @@ iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)* slab case. */ if (buf->use_sendmsg) - res =sock_no_sendpage (sk, buf->sg.page, offset, size, flags); + res =sock_no_sendpage (sk,sg_page (&buf->sg), offset, size, flags);else - res = tcp_conn->sendpage (sk, buf->sg.page, offset, size, flags); + res = tcp_conn->sendpage (sk,sg_page (&buf->sg), offset, size, flags);if (res >=0 ) { conn->txdata_octets += res;
drivers/scsi/megaraid.c +3 -3
@@ -658,7 +658,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)struct scatterlist *sg; sg =scsi_sglist (cmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memset (buf,0 , cmd->cmnd[4 ]);kunmap_atomic (buf - sg->offset,KM_IRQ0 );
@@ -1542,9 +1542,9 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)if ( cmd->cmnd[0 ] ==INQUIRY && !islogical ) { sgl =scsi_sglist (cmd); -if ( sgl->page ) { +if (sg_page (sgl) ) { c = *(unsigned char *) -page_address ((&sgl[0 ])->page) + +page_address ((sg_page (&sgl[0 ]))) + (&sgl[0 ])->offset; }else { printk(KERN_WARNING
drivers/scsi/megaraid/megaraid_mbox.c +4 -4
@@ -1584,9 +1584,9 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)caddr_t vaddr; sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { vaddr = (caddr_t) - (page_address ((&sgl[0 ])->page) + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset);memset (vaddr,0 , scp->cmnd[4 ]);
@@ -2328,9 +2328,9 @@ megaraid_mbox_dpc(unsigned long devp) && IS_RAID_CH(raid_dev, scb->dev_channel)) { sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { c = *(unsigned char *) - (page_address ((&sgl[0 ])->page) + + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset); }else { con_log(CL_ANN, (KERN_WARNING
drivers/scsi/osst.c +17 -15
@@ -542,7 +542,7 @@ static int osst_verify_frame(struct osst_tape * STp, int frame_seq_number, int qif (STp->raw) {if (STp->buffer->syscall_result) {for (i=0 ; i < STp->buffer->sg_segs; i++) -memset (page_address (STp->buffer->sg[i].page), +memset (page_address (sg_page (&STp->buffer->sg[i])),0 , STp->buffer->sg[i].length);strcpy (STp->buffer->b_data,"READ ERROR ON FRAME" ); }else
@@ -4437,7 +4437,7 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)for (i =0 , b_size =0 ; (i < STp->buffer->sg_segs) && ((b_size + STp->buffer->sg[i].length) <=OS_DATA_SIZE ); b_size += STp->buffer->sg[i++].length); - STp->buffer->aux = (os_aux_t *) (page_address (STp->buffer->sg[i].page) +OS_DATA_SIZE - b_size); + STp->buffer->aux = (os_aux_t *) (page_address (sg_page (&STp->buffer->sg[i])) +OS_DATA_SIZE - b_size);#if DEBUG printk (OSST_DEB_MSG "%s:D: b_data points to %p in segment 0 at %p\n" , name, STp->buffer->b_data,page_address (STp->buffer->sg[0 ].page));
@@ -5252,25 +5252,26 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)/* Try to allocate the first segment up to OS_DATA_SIZE and the others big enough to reach the goal (code assumes no segments in place) */ for (b_size =OS_DATA_SIZE , order =OSST_FIRST_ORDER ; b_size >=PAGE_SIZE ; order--, b_size /=2 ) { - STbuffer->sg[0 ].page =alloc_pages (priority, order); +struct page *page =alloc_pages (priority, order); + STbuffer->sg[0 ].offset =0 ; -if (STbuffer->sg[0 ].page !=NULL ) { +if (page !=NULL ) { +sg_set_page (&STbuffer->sg[0 ], page); STbuffer->sg[0 ].length = b_size; - STbuffer->b_data =page_address (STbuffer->sg[0 ].page); + STbuffer->b_data =page_address (page);break ; } } -if (STbuffer->sg[0 ].page ==NULL ) { +if (sg_page (&STbuffer->sg[0 ]) ==NULL ) {printk (KERN_NOTICE "osst :I: Can't allocate tape buffer main segment.\n" );return 0 ; }/* Got initial segment of 'bsize,order', continue with same size if possible, except for AUX */ for (segs=STbuffer->sg_segs=1 , got=b_size; segs < max_segs && got <OS_FRAME_SIZE ; ) { - STbuffer->sg[segs].page = -alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); +struct page *page =alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); STbuffer->sg[segs].offset =0 ; -if (STbuffer->sg[segs].page ==NULL ) { +if (page ==NULL ) {if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size /2 && order) { b_size /=2 ;/* Large enough for the rest of the buffers */ order--;
@@ -5284,6 +5285,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)normalize_buffer (STbuffer);return 0 ; } +sg_set_page (&STbuffer->sg[segs], page); STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <=PAGE_SIZE /2 ) ? (OS_FRAME_SIZE - got) : b_size; got += STbuffer->sg[segs].length; STbuffer->buffer_size = got;
@@ -5316,7 +5318,7 @@ static void normalize_buffer(struct osst_buffer *STbuffer) b_size < STbuffer->sg[i].length; b_size *= 2, order++); -__free_pages (STbuffer->sg[i].page, order); +__free_pages (sg_page (&STbuffer->sg[i]), order); STbuffer->buffer_size -= STbuffer->sg[i].length; }#if DEBUG
@@ -5344,7 +5346,7 @@ static int append_to_buffer(const char __user *ubp, struct osst_buffer *st_bp, ifor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_from_user (page_address (st_bp->sg[i].page) + offset, ubp, cnt); + res =copy_from_user (page_address (sg_page (&st_bp->sg[i])) + offset, ubp, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5377,7 +5379,7 @@ static int from_buffer(struct osst_buffer *st_bp, char __user *ubp, int do_countfor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_to_user (ubp,page_address (st_bp->sg[i].page) + offset, cnt); + res =copy_to_user (ubp,page_address (sg_page (&st_bp->sg[i])) + offset, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5410,7 +5412,7 @@ static int osst_zero_buffer_tail(struct osst_buffer *st_bp) i < st_bp->sg_segs && do_count > 0; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count ; -memset (page_address (st_bp->sg[i].page) + offset,0 , cnt); +memset (page_address (sg_page (&st_bp->sg[i])) + offset,0 , cnt); do_count -= cnt; offset =0 ; }
@@ -5430,7 +5432,7 @@ static int osst_copy_to_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (page_address (st_bp->sg[i].page), ptr, cnt); +memcpy (page_address (sg_page (&st_bp->sg[i])), ptr, cnt); do_count -= cnt; ptr += cnt; }
@@ -5451,7 +5453,7 @@ static int osst_copy_from_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (ptr,page_address (st_bp->sg[i].page), cnt); +memcpy (ptr,page_address (sg_page (&st_bp->sg[i])), cnt); do_count -= cnt; ptr += cnt; }
drivers/scsi/pcmcia/sym53c500_cs.c +3 -3
@@ -443,7 +443,7 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_write (fast_pio, port_base, -page_address (sg->page) + sg->offset, +page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 (port_base);
@@ -463,8 +463,8 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_read (fast_pio, port_base, -page_address (sg->page) + sg->offset, - sg->length); +page_address (sg_page (sg)) + sg->offset, + sg->length); }REG0 (port_base); }
drivers/scsi/ppa.c +2 -2
@@ -609,7 +609,7 @@ static int ppa_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; } }
@@ -756,7 +756,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)/* if many buffers are available, start filling the first */ cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page) + + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/qlogicfas408.c +1 -1
@@ -317,7 +317,7 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)return ((priv->qabort ==1 ?DID_ABORT :DID_RESET ) <<16 ); } - buf =page_address (sg->page) + sg->offset; + buf =page_address (sg_page (sg)) + sg->offset;if (ql_pdma (priv, phase, buf, sg->length))break ; }
drivers/scsi/scsi_debug.c +2 -2
@@ -625,7 +625,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,scsi_for_each_sg (scp, sg, scp->use_sg, k) {if (active) { kaddr = (unsigned char *) -kmap_atomic (sg->page,KM_USER0 ); +kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return (DID_ERROR <<16 ); kaddr_off = (unsigned char *)kaddr + sg->offset;
@@ -672,7 +672,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr, sg =scsi_sglist (scp); req_len = fin =0 ;for (k =0 ; k < scp->use_sg; ++k, sg =sg_next (sg)) { - kaddr = (unsigned char *)kmap_atomic (sg->page,KM_USER0 ); + kaddr = (unsigned char *)kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return -1 ; kaddr_off = (unsigned char *)kaddr + sg->offset;
drivers/scsi/scsi_lib.c +10 -3
@@ -295,7 +295,7 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,int i, err, nr_vecs =0 ;for_each_sg (sgl, sg, nsegs, i) { - page = sg->page; + page =sg_page (sg); off = sg->offset; len = sg->length; data_len += len;
@@ -764,7 +764,7 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)if (unlikely (!sgl)) goto enomem; -memset (sgl,0 ,sizeof (*sgl) * sgp->size); +sg_init_table (sgl, sgp->size);/* * first loop through, set initial index and return value
@@ -781,6 +781,13 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)sg_chain (prev,SCSI_MAX_SG_SEGMENTS , sgl);/* +* if we have nothing left, mark the last segment as +* end-of-list +*/ +if (!left) +sg_mark_end (sgl, this); + +/* * don't allow subsequent mempool allocs to sleep, it would * violate the mempool principle. */
@@ -2353,7 +2360,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count, *offset = *offset - len_complete + sg->offset;/* Assumption: contiguous pages can be accessed as "page + i" */ - page =nth_page (sg->page, (*offset >>PAGE_SHIFT )); + page =nth_page (sg_page (sg), (*offset >>PAGE_SHIFT )); *offset &= ~PAGE_MASK ;/* Bytes in this sg-entry from *offset to the end of the page */
drivers/scsi/sg.c +15 -15
@@ -1169,7 +1169,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length;if (offset < len) { - page =virt_to_page (page_address (sg->page) + offset); + page =virt_to_page (page_address (sg_page (sg)) + offset);get_page (page);/* increment page count */ break ; }
@@ -1717,13 +1717,13 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,goto out_unlock; */ } - sgl[0 ].page = pages[0 ]; +sg_set_page (sgl, pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { - sgl[i].page = pages[i]; +sg_set_page (&sgl[i], pages[i]); sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -1754,7 +1754,7 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,int i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
@@ -1854,7 +1854,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) scatter_elem_sz_prev = ret_sz; } } - sg->page = p; +sg_set_page (sg, p); sg->length = (ret_sz > num) ? num : ret_sz; SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
@@ -1907,14 +1907,14 @@ sg_write_xfer(Sg_request * srp) onum =1 ; ksglen = sg->length; - p =page_address (sg->page); + p =page_address (sg_page (sg));for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,1 , &usglen, &up);if (res)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -1991,12 +1991,12 @@ sg_remove_scat(Sg_scatter_hold * schp) }else {int k; -for (k =0 ; (k < schp->k_use_sg) && sg->page; +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) {SCSI_LOG_TIMEOUT (5 ,printk ("sg_remove_scat: k=%d, pg=0x%p, len=%d\n" , - k, sg->page, sg->length)); -sg_page_free (sg->page, sg->length); + k,sg_page (sg), sg->length)); +sg_page_free (sg_page (sg), sg->length); } }kfree (schp->buffer);
@@ -2038,7 +2038,7 @@ sg_read_xfer(Sg_request * srp) }else onum =1 ; - p =page_address (sg->page); + p =page_address (sg_page (sg)); ksglen = sg->length;for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,0 , &usglen, &up);
@@ -2046,7 +2046,7 @@ sg_read_xfer(Sg_request * srp)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -2092,15 +2092,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)if ((!outp) || (num_read_xfer <=0 ))return 0 ; -for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, sg =sg_next (sg)) { +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) { num = sg->length;if (num > num_read_xfer) { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num_read_xfer))return -EFAULT ;break ; }else { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num))return -EFAULT ; num_read_xfer -= num;
drivers/scsi/st.c +4 -4
@@ -3797,7 +3797,7 @@ static void buf_to_sg(struct st_buffer *STbp, unsigned int length) sg = &(STbp->sg[0 ]); frp = STbp->frp;for (i=count=0 ; count < length; i++) { - sg[i].page = frp[i].page; +sg_set_page (&sg[i], frp[i].page);if (length - count > frp[i].length) sg[i].length = frp[i].length;else
@@ -4446,14 +4446,14 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa }/* Populate the scatter/gather list */ - sgl[0 ].page = pages[0 ]; +sg_set_page (&sgl[0 ], pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { +sg_set_page (&sgl[i], pages[i]);; sgl[i].offset =0 ; - sgl[i].page = pages[i]; sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -4483,7 +4483,7 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pint i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
drivers/scsi/tmscsim.c +1 -4
@@ -430,10 +430,7 @@ static __inline__ void dc390_Going_remove (struct dc390_dcb* pDCB, struct dc390_static struct scatterlist *dc390_sg_build_single (struct scatterlist *sg,void *addr,unsigned int length) { -memset (sg,0 ,sizeof (struct scatterlist )); - sg->page =virt_to_page (addr); - sg->length = length; - sg->offset = (unsigned long )addr & ~PAGE_MASK ; +sg_init_one (sg, addr, length);return sg; }
drivers/scsi/ultrastor.c +1 -1
@@ -681,7 +681,7 @@ static inline void build_sg_list(struct mscp *mscp, struct scsi_cmnd *SCpnt) max =scsi_sg_count (SCpnt);scsi_for_each_sg (SCpnt, sg, max, i) { - mscp->sglist[i].address =isa_page_to_bus (sg->page) + sg->offset; + mscp->sglist[i].address =isa_page_to_bus (sg_page (sg)) + sg->offset; mscp->sglist[i].num_bytes = sg->length; transfer_length += sg->length; }
drivers/scsi/wd7000.c +1 -1
@@ -1123,7 +1123,7 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,any2scsi (scb->maxlen, nseg *sizeof (Sgb));scsi_for_each_sg (SCpnt, sg, nseg, i) { -any2scsi (sgb[i].ptr,isa_page_to_bus (sg->page) + sg->offset); +any2scsi (sgb[i].ptr,isa_page_to_bus (sg_page (sg)) + sg->offset);any2scsi (sgb[i].len, sg->length); } }else {
drivers/usb/core/message.c +2 -2
@@ -438,12 +438,12 @@ int usb_sg_init ( io->urbs[i]->transfer_buffer =NULL ;#else io->urbs[i]->transfer_buffer = -page_address (sg[i].page) + sg[i].offset; +page_address (sg_page (&sg[i])) + sg[i].offset;#endif }else {/* hc may use _only_ transfer_buffer */ io->urbs [i]->transfer_buffer = -page_address (sg [i].page) + sg [i].offset; +page_address (sg_page (&sg[i])) + sg [i].offset; len = sg [i].length; }
drivers/usb/image/microtek.c +2 -2
@@ -519,7 +519,7 @@ static void mts_do_sg (struct urb* transfer) context->fragment++; mts_int_submit_urb(transfer, context->data_pipe, - page_address(sg[context->fragment].page) + + page_address(sg_page(&sg[context->fragment])) + sg[context->fragment].offset, sg[context->fragment].length, context->fragment + 1 == scsi_sg_count(context->srb) ?
@@ -557,7 +557,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)return ; }else { sg =scsi_sglist (srb); - desc->context.data =page_address (sg[0 ].page) + sg[0 ].offset; + desc->context.data =page_address (sg_page (&sg[0 ])) + sg[0 ].offset; desc->context.data_length = sg[0 ].length; }
drivers/usb/misc/usbtest.c +3 -2
@@ -360,9 +360,10 @@ static void free_sglist (struct scatterlist *sg, int nents)if (!sg)return ;for (i =0 ; i < nents; i++) { -if (!sg [i].page) +struct page *page =sg_page (&sg[i]); +if (!page)continue ; -kfree (page_address (sg [i].page) + sg [i].offset); +kfree (page_address (page) + sg [i].offset); }kfree (sg); }
drivers/usb/storage/protocol.c +1 -1
@@ -195,7 +195,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,* the *offset and *index values for the next loop. */ cnt =0 ;while (cnt < buflen) { -struct page *page = sg->page + +struct page *page =sg_page (sg) + ((sg->offset + *offset) >>PAGE_SHIFT );unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE -1 );
fs/ecryptfs/crypto.c +11 -5
@@ -283,7 +283,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, pg =virt_to_page (addr); offset =offset_in_page (addr);if (sg) { - sg[i].page = pg; +sg_set_page (&sg[i], pg); sg[i].offset = offset; } remainder_of_page =PAGE_CACHE_SIZE - offset;
@@ -713,10 +713,13 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return encrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
@@ -742,10 +745,13 @@ ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return decrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
fs/ecryptfs/keystore.c +3 -0
@@ -1040,6 +1040,9 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, };int rc =0 ; +sg_init_table (&dst_sg,1 ); +sg_init_table (&src_sg,1 ); +if (unlikely (ecryptfs_verbosity >0 )) { ecryptfs_printk( KERN_DEBUG, "Session key encryption key (size [%d]):\n",
fs/nfsd/nfs4recover.c +3 -5
@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) {struct xdr_netobj cksum;struct hash_desc desc; -struct scatterlist sg[1 ]; +struct scatterlist sg;__be32 status = nfserr_resource; dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
@@ -102,11 +102,9 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)if (cksum.data ==NULL ) goto out; - sg[0 ].page =virt_to_page (clname->data); - sg[0 ].offset =offset_in_page (clname->data); - sg[0 ].length = clname->len; +sg_init_one (&sg, clname->data, clname->len); -if (crypto_hash_digest (&desc, sg, sg->length, cksum.data)) +if (crypto_hash_digest (&desc, &sg, sg.length, cksum.data)) goto out;md5_to_hex (dname, cksum.data);
include/asm-alpha/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-arm/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page;/* buffer page */ +unsigned long page_link;unsigned int offset;/* buffer offset */ dma_addr_t dma_address;/* dma address */ unsigned int length;/* length */
include/asm-avr32/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-blackfin/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/mm.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-cris/scatterlist.h +1 -1
@@ -6,7 +6,7 @@ struct scatterlist {unsigned int length;/* The following is i386 highmem junk - not used by us */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ };
include/asm-frv/scatterlist.h +1 -1
@@ -22,7 +22,7 @@* and that's it. There's no excuse for not highmem enabling YOUR driver. /jens */ struct scatterlist { -struct page *page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-h8300/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-ia64/scatterlist.h +1 -1
@@ -9,7 +9,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;/* buffer length */
include/asm-m32r/scatterlist.h +1 -1
@@ -6,7 +6,7 @@struct scatterlist {char * address;/* Location data is to be transferred to, NULL for * highmem page */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-m68k/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-m68knommu/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-mips/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-parisc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-powerpc/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/dma.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-s390/scatterlist.h +1 -1
@@ -2,7 +2,7 @@#define _ASMS390_SCATTERLIST_Hstruct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length; };
include/asm-sh/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sh64/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sparc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-sparc64/scatterlist.h +4 -1
@@ -6,7 +6,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-v850/scatterlist.h +1 -1
@@ -17,7 +17,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned offset;dma_addr_t dma_address;unsigned length;
include/asm-x86/dma-mapping_32.h +2 -2
@@ -45,9 +45,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,WARN_ON (nents ==0 || sglist[0 ].length ==0 );for_each_sg (sglist, sg, nents, i) { -BUG_ON (!sg->page); +BUG_ON (!sg_page (sg)); - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset; }flush_write_buffers ();
include/asm-x86/scatterlist_32.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-x86/scatterlist_64.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;dma_addr_t dma_address;
include/asm-xtensa/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/linux/scatterlist.h +121 -17
179 lines not on this page · raw message
lib/Kconfig.debug +10 -0
@@ -389,6 +389,16 @@ config DEBUG_LIST If unsure, say N. +config DEBUG_SG + bool "Debug SG table operations" + depends on DEBUG_KERNEL + help + Enable this to turn on checks on scatter-gather tables. This can + help find problems with drivers that do not properly initialize + their sg tables. + + If unsure, say N. + config FRAME_POINTER bool "Compile the kernel with frame pointers" depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BFIN)
lib/swiotlb.c +1 -1
@@ -35,7 +35,7 @@#define OFFSET (val,align) ((unsigned long) \ ( (val) & ( (align) - 1))) -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (sg) virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))/*
net/core/skbuff.c +2 -2
@@ -2045,7 +2045,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy >0 ) {if (copy > len) copy = len; - sg[elt].page =virt_to_page (skb->data + offset); +sg_set_page (&sg[elt],virt_to_page (skb->data + offset)); sg[elt].offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg[elt].length = copy; elt++;
@@ -2065,7 +2065,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy > len) copy = len; - sg[elt].page = frag->page; +sg_set_page (&sg[elt], frag->page); sg[elt].offset = frag->page_offset+offset-start; sg[elt].length = copy; elt++;
net/ieee80211/ieee80211_crypt_tkip.c +5 -8
@@ -390,9 +390,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (tkey->tx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -485,9 +483,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -12 ;crypto_blkcipher_setkey (tkey->rx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 )) {if (net_ratelimit ()) { printk(KERN_DEBUG ": TKIP: failed to decrypt "
@@ -539,11 +535,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,printk (KERN_WARNING "michael_mic: tfm_michael == NULL\n" );return -1 ; } - sg[0 ].page =virt_to_page (hdr); +sg_init_table (sg,2 ); +sg_set_page (&sg[0 ],virt_to_page (hdr)); sg[0 ].offset =offset_in_page (hdr); sg[0 ].length =16 ; - sg[1 ].page =virt_to_page (data); +sg_set_page (&sg[1 ],virt_to_page (data)); sg[1 ].offset =offset_in_page (data); sg[1 ].length = data_len;
net/ieee80211/ieee80211_crypt_wep.c +2 -6
@@ -170,9 +170,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (wep->tx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -212,9 +210,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -8 ;crypto_blkcipher_setkey (wep->rx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 ))return -7 ;
net/mac80211/wep.c +2 -6
@@ -138,9 +138,7 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, *icv =cpu_to_le32 (~crc32_le (~0 , data, data_len));crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_encrypt (&desc, &sg, &sg, sg.length); }
@@ -204,9 +202,7 @@ int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,__le32 crc;crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_decrypt (&desc, &sg, &sg, sg.length); crc =cpu_to_le32 (~crc32_le (~0 , data, data_len));
net/sctp/auth.c +2 -1
@@ -726,7 +726,8 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,/* set up scatter list */ end =skb_tail_pointer (skb); - sg.page =virt_to_page (auth); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (auth)); sg.offset = (unsigned long )(auth) %PAGE_SIZE ; sg.length = end - (unsigned char *)auth;
net/sctp/sm_make_chunk.c +4 -2
@@ -1513,7 +1513,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,struct hash_desc desc;/* Sign the message. */ - sg.page =virt_to_page (&cookie->c); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (&cookie->c)); sg.offset = (unsigned long )(&cookie->c) %PAGE_SIZE ; sg.length = bodysize; keylen =SCTP_SECRET_SIZE ;
@@ -1585,7 +1586,8 @@ struct sctp_association *sctp_unpack_cookie(/* Check the signature. */ keylen =SCTP_SECRET_SIZE ; - sg.page =virt_to_page (bear_cookie); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (bear_cookie)); sg.offset = (unsigned long )(bear_cookie) %PAGE_SIZE ; sg.length = bodysize; key = (char *)ep->secret_key[ep->current_key];
net/sunrpc/auth_gss/gss_krb5_crypto.c +5 -5
@@ -197,9 +197,9 @@ encryptor(struct scatterlist *sg, void *data)int i = (page_pos + outbuf->page_base) >>PAGE_CACHE_SHIFT ; in_page = desc->pages[i]; }else { - in_page = sg->page; + in_page =sg_page (sg); } - desc->infrags[desc->fragno].page = in_page; +sg_set_page (&desc->infrags[desc->fragno], in_page); desc->fragno++; desc->fraglen += sg->length; desc->pos += sg->length;
@@ -215,11 +215,11 @@ encryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->outfrags[0 ].page = sg->page; +sg_set_page (&desc->outfrags[0 ],sg_page (sg)); desc->outfrags[0 ].offset = sg->offset + sg->length - fraglen; desc->outfrags[0 ].length = fraglen; desc->infrags[0 ] = desc->outfrags[0 ]; - desc->infrags[0 ].page = in_page; +sg_set_page (&desc->infrags[0 ], in_page); desc->fragno =1 ; desc->fraglen = fraglen; }else {
@@ -287,7 +287,7 @@ decryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->frags[0 ].page = sg->page; +sg_set_page (&desc->frags[0 ],sg_page (sg)); desc->frags[0 ].offset = sg->offset + sg->length - fraglen; desc->frags[0 ].length = fraglen; desc->fragno =1 ;
net/sunrpc/xdr.c +1 -1
@@ -1059,7 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, do { if (thislen > page_len) thislen = page_len; - sg->page = buf->pages[i]; + sg_set_page(sg, buf->pages[i]); sg->offset = page_offset; sg->length = thislen; ret = actor(sg, data);
net/xfrm/xfrm_algo.c +2 -2
@@ -552,7 +552,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page =virt_to_page (skb->data + offset); +sg_set_page (&sg,virt_to_page (skb->data + offset)); sg.offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg.length = copy;
@@ -577,7 +577,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page = frag->page; +sg_set_page (&sg, frag->page); sg.offset = frag->page_offset + offset-start; sg.length = copy;
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 5 lines · Jens Axboe
static inline struct scatterlist *sg_next(struct scatterlist *sg) {
include/linux/scatterlist.h +0
-2- sg++; -
include/linux/scatterlist.h static inline void sg_init_one(struct scatterlist *sg, const void *buf, · line 94
Quoted 10 lines
include/linux/scatterlist.h +8
-1-if (unlikely (sg_is_chain (sg))) +#ifdef CONFIG_DEBUG_SG +BUG_ON (sg->sg_magic !=SG_MAGIC ); +#endif +if (sg_is_last (sg)) + sg =NULL ; +else if (sg_is_chain (sg)) sg =sg_chain_ptr (sg); +else + sg++;
Jens, again, please correct me if I'm wrong, but when sg points at the entry right before a chain entry this implementation of sg_next will return a pointer to the chain entry here, which I believe it must not.
Quoted 3 lines
return sg;
}
here's how I think sg_next should be implemented:
*/
static inline struct scatterlist *sg_next(struct scatterlist *sg) {
+#ifdef CONFIG_DEBUG_SG
+ BUG_ON(sg->sg_magic != SG_MAGIC);
+#endif
+ if (sg_is_last(sg))
+ return NULL;
+
sg++;
if (unlikely(sg_is_chain(sg)))
sg = sg_chain_ptr(sg);
return sg;
}
Re: [bug] ata subsystem related crash with latest -git
Quoted 33 lines · Benny Halevy
Quoted 5 lines · Jens Axboe
static inline struct scatterlist *sg_next(struct scatterlist *sg) {
include/linux/scatterlist.h +0
-2- sg++; -include/linux/scatterlist.h static inline void sg_init_one(struct scatterlist *sg, const void *buf, · line 94
Quoted 10 lines
include/linux/scatterlist.h +8
-1-if (unlikely (sg_is_chain (sg))) +#ifdef CONFIG_DEBUG_SG +BUG_ON (sg->sg_magic !=SG_MAGIC ); +#endif +if (sg_is_last (sg)) + sg =NULL ; +else if (sg_is_chain (sg)) sg =sg_chain_ptr (sg); +else + sg++;Jens, again, please correct me if I'm wrong, but when sg points at the entry right before a chain entry this implementation of
sg_nextwill return a pointer to the chain entry here, which I believe it must not.Quoted 3 lines
return sg;
}here's how I think
sg_nextshould be implemented:*/
static inline struct scatterlist *sg_next(struct scatterlist *sg) {include/linux/scatterlist.h +3
-0+#ifdef CONFIG_DEBUG_SG +BUG_ON (sg->sg_magic !=SG_MAGIC ); +#endif
include/linux/scatterlist.h static inline void sg_init_one(struct scatterlist *sg, const void *buf, · line 97
Quoted 10 lines
include/linux/scatterlist.h +3
-0+if (sg_is_last (sg)) +return NULL ; + sg++;if (unlikely (sg_is_chain (sg))) sg =sg_chain_ptr (sg);return sg; }
Yep, thanks for catching that!
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens AxboeQuoted 3 lines · Jens
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I hope nothing is missing
linux/scatterlist.hincludes...
Patch fails on drivers/scsi/scsi_lib.c.
I replaced that part of the patch with this updated portion instead:
drivers/scsi/scsi_lib.c +0 -0
@@ -295,7 +295,7 @@
int i, err, nr_vecs = 0;
for_each_sg(sgl, sg, nsegs, i) {
- page = sg->page;
+ page = sg_page(sg);
off = sg->offset;
len = sg->length;
data_len += len;
@@ -764,6 +764,8 @@
if (unlikely(!sgl))
goto enomem;+ sg_init_table(sgl, sgp->size);
+
/* * first loop through, set initial index and return value */ @@ -779,6 +781,13 @@ sg_chain(prev, SCSI_MAX_SG_SEGMENTS, sgl); /*
+ * if we have nothing left, mark the last segment as
+ * end-of-list
+ */
+ if (!left)
+ sg_mark_end(sgl, this);
+
+ /*
* don't allow subsequent mempool allocs to sleep, it would
* violate the mempool principle.
*/
@@ -2351,7 +2360,7 @@
*offset = *offset - len_complete + sg->offset; /* Assumption: contiguous pages can be accessed as "page + i" */ - page = nth_page(sg->page, (*offset >> PAGE_SHIFT)); + page = nth_page(sg_page(sg), (*offset >> PAGE_SHIFT)); *offset &= ~PAGE_MASK; /* Bytes in this sg-entry from *offset to the end of the page */
Re: [bug] ata subsystem related crash with latest -git
Quoted 8 lines · Mark Lord
Quoted 3 lines · Jens
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I hope nothing is missing
linux/scatterlist.hincludes...Patch fails on
drivers/scsi/scsi_lib.c.I replaced that part of the patch with this updated portion instead:
Hmm, what are you applying against? Must be a clean tree, throw away any patches that you already applied in this thread.
Updated below.
arch/alpha/kernel/pci_iommu.c +1 -1
@@ -465,7 +465,7 @@ EXPORT_SYMBOL(pci_free_consistent);Write dma_length of each leader with the combined lengths of the mergable followers. */ -#define SG_ENT_VIRT_ADDRESS (SG ) (page_address((SG)->page) + (SG)->offset) +#define SG_ENT_VIRT_ADDRESS (SG ) (page_address(sg_page((SG)) + (SG)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) __pa(SG_ENT_VIRT_ADDRESS(SG)) static void
arch/arm/common/dmabounce.c +1 -1
@@ -442,7 +442,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (dir ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { -struct page *page = sg->page; +struct page *page =sg_page (sg);unsigned int offset = sg->offset;unsigned int length = sg->length;void *ptr =page_address (page) + offset;
arch/blackfin/kernel/dma-mapping.c +1 -1
@@ -160,7 +160,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,BUG_ON (direction ==DMA_NONE );for (i =0 ; i < nents; i++, sg++) { - sg->dma_address = (dma_addr_t)(page_address (sg->page) + + sg->dma_address = (dma_addr_t)(page_address (sg_page (sg)) + sg->offset); invalidate_dcache_range(sg_dma_address(sg),
arch/ia64/hp/common/sba_iommu.c +1 -1
@@ -246,7 +246,7 @@ static int reserve_sba_gart = 1; static SBA_INLINE void sba_mark_invalid(struct ioc *, dma_addr_t, size_t); static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t); -#define sba_sg_address (sg) (page_address((sg)->page) + (sg)->offset) +#define sba_sg_address (sg) (page_address(sg_page((sg)) + (sg)->offset))#ifdef FULL_VALID_PDIR static u64 prefetch_spill_page;
arch/ia64/hp/sim/simscsi.c +2 -2
@@ -131,7 +131,7 @@ simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset) stat.fd = desc[sc->device->id];scsi_for_each_sg (sc, sl,scsi_sg_count (sc), i) { - req.addr =__pa (page_address (sl->page) + sl->offset); + req.addr =__pa (page_address (sg_page (sl)) + sl->offset); req.len = sl->length;if (DBG ) printk("simscsi_sg_%s @ %lx (off %lx) use_sg=%d len=%d\n",
@@ -212,7 +212,7 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len)if (!len)break ; thislen =min (len, slp->length); -memcpy (page_address (slp->page) + slp->offset, buf, thislen); +memcpy (page_address (sg_page (slp)) + slp->offset, buf, thislen); len -= thislen; } }
arch/ia64/sn/pci/pci_dma.c +1 -1
@@ -16,7 +16,7 @@#include <asm/sn/pcidev.h> #include <asm/sn/sn_sal.h> -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (SG ) virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))/**
arch/m68k/kernel/dma.c +1 -1
@@ -121,7 +121,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,int i;for (i =0 ; i < nents; sg++, i++) { - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset;dma_sync_single_for_device (dev, sg->dma_address, sg->length, dir); }return nents;
arch/mips/mm/dma-default.c +4 -4
@@ -165,7 +165,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,for (i =0 ; i < nents; i++, sg++) {unsigned long addr; - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (!plat_device_is_coherent (dev) && addr)__dma_sync (addr + sg->offset, sg->length, direction); sg->dma_address = plat_map_dma_mem(dev,
@@ -223,7 +223,7 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,for (i =0 ; i < nhwentries; i++, sg++) {if (!plat_device_is_coherent (dev) && direction !=DMA_TO_DEVICE ) { - addr = (unsigned long )page_address (sg->page); + addr = (unsigned long )page_address (sg_page (sg));if (addr)__dma_sync (addr + sg->offset, sg->length, direction);
@@ -304,7 +304,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (cpu_is_noncoherent_r10000 (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
@@ -322,7 +322,7 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) {if (!plat_device_is_coherent (dev)) -__dma_sync ((unsigned long )page_address (sg->page), +__dma_sync ((unsigned long )page_address (sg_page (sg)), sg->length, direction);plat_unmap_dma_mem (sg->dma_address); }
arch/powerpc/kernel/dma_64.c +1 -1
@@ -161,7 +161,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (page_to_phys (sg->page) + sg->offset) | + sg->dma_address = (page_to_phys (sg_page (sg)) + sg->offset) | dma_direct_offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/ibmebus.c +1 -1
@@ -102,7 +102,7 @@ static int ibmebus_map_sg(struct device *dev,int i;for_each_sg (sgl, sg, nents, i) { - sg->dma_address = (dma_addr_t )page_address (sg->page) + sg->dma_address = (dma_addr_t )page_address (sg_page (sg)) + sg->offset; sg->dma_length = sg->length; }
arch/powerpc/kernel/iommu.c +1 -1
@@ -307,7 +307,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,continue ; }/* Allocate iommu entries for that segment */ - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (sg_page (s)) + s->offset; npages =iommu_num_pages (vaddr, slen); entry =iommu_range_alloc (tbl, npages, &handle, mask >>IOMMU_PAGE_SHIFT ,0 );
arch/powerpc/platforms/ps3/system-bus.c +1 -1
@@ -629,7 +629,7 @@ static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,for_each_sg (sgl, sg, nents, i) {int result =ps3_dma_map (dev->d_region, -page_to_phys (sg->page) + sg->offset, sg->length, +page_to_phys (sg_page (sg)) + sg->offset, sg->length, &sg->dma_address,0 );if (result) {
arch/sparc/kernel/ioport.c +8 -8
@@ -727,9 +727,9 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );/* IIep is write-through, not flushing. */ for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL ); sg->dvma_address = -virt_to_phys (page_address (sg->page)) + sg->offset; +virt_to_phys (page_address (sg_page (sg))) + sg->offset; sg->dvma_length = sg->length; }return nents;
@@ -748,9 +748,9 @@ void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sgl, int nents,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -798,9 +798,9 @@ void pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sgl, intBUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
@@ -814,9 +814,9 @@ void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sgl,BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) {for_each_sg (sgl, sg, nents, n) { -BUG_ON (page_address (sg->page) ==NULL ); +BUG_ON (page_address (sg_page (sg)) ==NULL );mmu_inval_dma_area ( - (unsigned long )page_address (sg->page), + (unsigned long )page_address (sg_page (sg)), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); } }
arch/sparc/mm/io-unit.c +1 -1
@@ -144,7 +144,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_busspin_lock_irqsave (&iounit->lock, flags);while (sz !=0 ) { --sz; - sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc/mm/iommu.c +4 -4
@@ -238,7 +238,7 @@ static void iommu_get_scsi_sgl_noflush(struct scatterlist *sg, int sz, struct sbwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -252,7 +252,7 @@ static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbuwhile (sz !=0 ) { --sz; n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
@@ -273,7 +273,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu* XXX Is this a good assumption? * XXX What if someone else unmaps it here and races us? */ -if ((page = (unsigned long )page_address (sg->page)) !=0 ) { +if ((page = (unsigned long )page_address (sg_page (sg))) !=0 ) {for (i =0 ; i < n; i++) {if (page != oldpage) {/* Already flushed? */ flush_page_for_dma (page);
@@ -283,7 +283,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu } } - sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; + sg->dvma_address =iommu_get_one (sg_page (sg), n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; sg =sg_next (sg); }
arch/sparc/mm/sun4c.c +1 -1
@@ -1228,7 +1228,7 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus * {while (sz !=0 ) { --sz; - sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg->page) + sg->offset, sg->length); + sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg_page (sg)) + sg->offset, sg->length); sg->dvma_length = sg->length; sg =sg_next (sg); }
arch/sparc64/kernel/iommu.c +2 -2
@@ -473,7 +473,7 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static void fill_sg(iopte_t *iopte, struct scatterlist *sg, int nused, int nelems,
@@ -566,7 +566,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4u_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/sparc64/kernel/iommu_common.c +6 -6
@@ -73,7 +73,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, daddr = dma_sg->dma_address; sglen = sg->length; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);while (dlen >0 ) {unsigned long paddr;
@@ -123,7 +123,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, sg =sg_next (sg);if (--nents <=0 )break ; - sgaddr = (unsigned long ) (page_address (sg->page) + sg->offset); + sgaddr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); sglen = sg->length; }if (dlen <0 ) {
@@ -191,7 +191,7 @@ void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npprintk ("sg(%d): page_addr(%p) off(%x) length(%x) " "dma_address[%016x] dma_length[%016x]\n" , i, -page_address (sg->page), sg->offset, +page_address (sg_page (sg)), sg->offset, sg->length, sg->dma_address, sg->dma_length); }
@@ -207,15 +207,15 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)unsigned long prev;u32 dent_addr, dent_len; - prev = (unsigned long ) (page_address (sg->page) + sg->offset); + prev = (unsigned long ) (page_address (sg_page (sg)) + sg->offset); prev += (unsigned long ) (dent_len = sg->length); - dent_addr = (u32) ((unsigned long )(page_address (sg->page) + sg->offset) + dent_addr = (u32) ((unsigned long )(page_address (sg_page (sg)) + sg->offset) & (IO_PAGE_SIZE -1UL ));while (--nents) {unsigned long addr; sg =sg_next (sg); - addr = (unsigned long ) (page_address (sg->page) + sg->offset); + addr = (unsigned long ) (page_address (sg_page (sg)) + sg->offset);if (!VCONTIG (prev, addr)) { dma_sg->dma_address = dent_addr; dma_sg->dma_length = dent_len;
arch/sparc64/kernel/ldc.c +1 -1
@@ -2057,7 +2057,7 @@ static void fill_cookies(struct cookie_state *sp, unsigned long pa,static int sg_count_one (struct scatterlist *sg) { -unsigned long base =page_to_pfn (sg->page) <<PAGE_SHIFT ; +unsigned long base =page_to_pfn (sg_page (sg)) <<PAGE_SHIFT ;long len = sg->length;if ((sg->offset | len) & (8UL -1 ))
arch/sparc64/kernel/pci_sun4v.c +2 -2
@@ -366,7 +366,7 @@ static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr, }#define SG_ENT_PHYS_ADDRESS (SG ) \ - (__pa(page_address((SG)->page)) + (SG)->offset) + (__pa(page_address(sg_page(SG))) + (SG)->offset) static long fill_sg(long entry, struct device *dev, struct scatterlist *sg,
@@ -478,7 +478,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,if (nelems ==1 ) { sglist->dma_address =dma_4v_map_single (dev, - (page_address (sglist->page) + + (page_address (sg_page (sglist)) + sglist->offset), sglist->length, direction);if (unlikely (sglist->dma_address ==DMA_ERROR_CODE ))
arch/um/drivers/ubd_kern.c +1 -1
@@ -1115,7 +1115,7 @@ static void do_ubd_request(struct request_queue *q) }prepare_request (req, io_req, (unsigned long long ) req->sector <<9 , - sg->offset, sg->length, sg->page); + sg->offset, sg->length,sg_page (sg)); last_sectors = sg->length >>9 ; n = os_write_file(thread_fd, &io_req,
arch/x86/kernel/pci-calgary_64.c +8 -4
@@ -411,8 +411,10 @@ static int calgary_nontranslate_map_sg(struct device* dev,int i;for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +struct page *p =sg_page (s); + +BUG_ON (!p); + s->dma_address =virt_to_bus (page_address (p) + s->offset); s->dma_length = s->length; }return nelems;
@@ -432,9 +434,11 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,return calgary_nontranslate_map_sg (dev, sg, nelems, direction);for_each_sg (sg, s, nelems, i) { -BUG_ON (!s->page); +struct page *p =sg_page (s); + +BUG_ON (!p); - vaddr = (unsigned long )page_address (s->page) + s->offset; + vaddr = (unsigned long )page_address (p) + s->offset; npages =num_dma_pages (vaddr, s->length); entry =iommu_range_alloc (tbl, npages);
arch/x86/kernel/pci-gart_64.c +2 -2
@@ -302,7 +302,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,#endif for_each_sg (sg, s, nents, i) { -unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;if (nonforced_iommu (dev, addr, s->length)) { addr =dma_map_area (dev, addr, s->length, dir);if (addr == bad_dma_address) {
@@ -397,7 +397,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, start_sg = sgmap = sg; ps =NULL ;/* shut up gcc */ for_each_sg (sg, s, nents, i) { -dma_addr_t addr =page_to_phys (s->page) + s->offset; +dma_addr_t addr =page_to_phys (sg_page (s)) + s->offset; s->dma_address = addr;BUG_ON (s->length ==0 );
arch/x86/kernel/pci-nommu_64.c +2 -2
@@ -62,8 +62,8 @@ static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,int i;for_each_sg (sg, s, nents, i) { -BUG_ON (!s->page); - s->dma_address =virt_to_bus (page_address (s->page) +s->offset); +BUG_ON (!sg_page (s)); + s->dma_address =virt_to_bus (page_address (sg_page (s)) +s->offset);if (!check_addr ("map_sg" , hwdev, s->dma_address, s->length))return 0 ; s->dma_length = s->length;
block/ll_rw_blk.c +3 -2
@@ -1354,8 +1354,9 @@ new_segment:else sg =sg_next (sg); -memset (sg,0 ,sizeof (*sg)); - sg->page = bvec->bv_page; +sg_dma_len (sg) =0 ; +sg_dma_address (sg) =0 ; +sg_set_page (sg, bvec->bv_page); sg->length = nbytes; sg->offset = bvec->bv_offset; nsegs++;
crypto/digest.c +1 -1
@@ -41,7 +41,7 @@ static int update2(struct hash_desc *desc,return 0 ;for (;;) { -struct page *pg = sg->page; +struct page *pg =sg_page (sg);unsigned int offset = sg->offset;unsigned int l = sg->length;
crypto/hmac.c +2 -1
@@ -159,7 +159,8 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg, desc.flags = pdesc->flags &CRYPTO_TFM_REQ_MAY_SLEEP ;sg_set_buf (sg1, ipad, bs); - sg1[1 ].page = (void *)sg; + +sg_set_page (&sg[1 ], (void *) sg); sg1[1 ].length =0 ;sg_set_buf (sg2, opad, bs + ds);
crypto/scatterwalk.c +1 -1
@@ -54,7 +54,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,if (out) {struct page *page; - page = walk->sg->page + ((walk->offset -1 ) >>PAGE_SHIFT ); + page =sg_page (walk->sg) + ((walk->offset -1 ) >>PAGE_SHIFT );flush_dcache_page (page); }
crypto/scatterwalk.h +3 -3
@@ -22,13 +22,13 @@static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg) { -return (++sg)->length ? sg : (void *)sg->page; +return (++sg)->length ? sg : (void *)sg_page (sg); }static inline unsigned long scatterwalk_samebuf (struct scatter_walk *walk_in,struct scatter_walk *walk_out) { -return !(((walk_in->sg->page - walk_out->sg->page) <<PAGE_SHIFT ) + +return !(((sg_page (walk_in->sg) -sg_page (walk_out->sg)) <<PAGE_SHIFT ) + (int )(walk_in->offset - walk_out->offset)); }
@@ -60,7 +60,7 @@ static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,static inline struct page *scatterwalk_page (struct scatter_walk *walk) { -return walk->sg->page + (walk->offset >>PAGE_SHIFT ); +return sg_page (walk->sg) + (walk->offset >>PAGE_SHIFT ); }static inline void scatterwalk_unmap (void *vaddr,int out)
crypto/tcrypt.c +2 -2
@@ -317,7 +317,7 @@ static void test_cipher(char *algo, int enc, goto out; } - q =kmap (sg[0 ].page) + sg[0 ].offset; + q =kmap (sg_page (&sg[0 ])) + sg[0 ].offset;hexdump (q, cipher_tv[i].rlen); printk("%s\n",
@@ -390,7 +390,7 @@ static void test_cipher(char *algo, int enc, temp =0 ;for (k =0 ; k < cipher_tv[i].np; k++) {printk ("page %u\n" , k); - q =kmap (sg[k].page) + sg[k].offset; + q =kmap (sg_page (&sg[k])) + sg[k].offset;hexdump (q, cipher_tv[i].tap[k]); printk("%s\n", memcmp(q, cipher_tv[i].result + temp,
crypto/xcbc.c +1 -1
@@ -120,7 +120,7 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, do { - struct page *pg = sg[i].page; + struct page *pg = sg_page(&sg[i]); unsigned int offset = sg[i].offset; unsigned int slen = sg[i].length;
drivers/ata/libata-core.c +5 -5
@@ -4296,7 +4296,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc)sg_last (sg, qc->orig_n_elem)->length += qc->pad_len;if (pad_buf) {struct scatterlist *psg = &qc->pad_sgent; -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (addr + psg->offset, pad_buf, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4686,11 +4686,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)* data in this function or read data in ata_sg_clean. */ offset = lsg->offset + lsg->length - qc->pad_len; - psg->page =nth_page (lsg->page, offset >>PAGE_SHIFT ); +sg_set_page (psg,nth_page (sg_page (lsg), offset >>PAGE_SHIFT )); psg->offset =offset_in_page (offset);if (qc->tf.flags &ATA_TFLAG_WRITE ) { -void *addr =kmap_atomic (psg->page,KM_IRQ0 ); +void *addr =kmap_atomic (sg_page (psg),KM_IRQ0 );memcpy (pad_buf, addr + psg->offset, qc->pad_len);kunmap_atomic (addr,KM_IRQ0 ); }
@@ -4836,7 +4836,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ; - page = qc->cursg->page; + page =sg_page (qc->cursg); offset = qc->cursg->offset + qc->cursg_ofs;/* get the current page and offset */
@@ -4988,7 +4988,7 @@ next_sg: sg = qc->cursg; - page = sg->page; + page =sg_page (sg); offset = sg->offset + qc->cursg_ofs;/* get the current page and offset */
drivers/ata/libata-scsi.c +1 -1
@@ -1544,7 +1544,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)struct scatterlist *sg =scsi_sglist (cmd);if (sg) { - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; buflen = sg->length; }else { buf =NULL ;
drivers/block/cciss.c +2 -2
@@ -2610,7 +2610,7 @@ static void do_cciss_request(struct request_queue *q) (int)creq->nr_sectors);#endif /* CCISS_DEBUG */ -memset (tmp_sg,0 ,sizeof (tmp_sg)); +sg_init_table (tmp_sg,MAXSGENTRIES ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* get the DMA records for the setup */
@@ -2621,7 +2621,7 @@ static void do_cciss_request(struct request_queue *q)for (i =0 ; i < seg; i++) { c->SG[i].Len = tmp_sg[i].length; - temp64.val = (__u64 )pci_map_page (h->pdev, tmp_sg[i].page, + temp64.val = (__u64 )pci_map_page (h->pdev,sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); c->SG[i].Addr.lower = temp64.val32.lower;
drivers/block/cpqarray.c +2 -1
@@ -918,6 +918,7 @@ queue_next:DBGPX ( printk("sector=%d, nr_sectors=%d\n", creq->sector, creq->nr_sectors); ); +sg_init_table (tmp_sg,SG_MAX ); seg =blk_rq_map_sg (q, creq, tmp_sg);/* Now do all the DMA Mappings */
@@ -929,7 +930,7 @@ DBGPX( { c->req.sg[i].size = tmp_sg[i].length; c->req.sg[i].addr = (__u32 )pci_map_page (h->pci_dev, - tmp_sg[i].page, +sg_page (&tmp_sg[i]), tmp_sg[i].offset, tmp_sg[i].length, dir); }
drivers/block/cryptoloop.c +8 -4
@@ -26,6 +26,7 @@#include <linux/crypto.h> #include <linux/blkdev.h> #include <linux/loop.h> +#include <linux/scatterlist.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -119,14 +120,17 @@ cryptoloop_transfer(struct loop_device *lo, int cmd, .tfm = tfm, .flags = CRYPTO_TFM_REQ_MAY_SLEEP, }; -struct scatterlist sg_out = {NULL , }; -struct scatterlist sg_in = {NULL , }; +struct scatterlist sg_out; +struct scatterlist sg_in;encdec_cbc_t encdecfunc;struct page *in_page, *out_page;unsigned in_offs, out_offs;int err; +sg_init_table (&sg_out,1 ); +sg_init_table (&sg_in,1 ); +if (cmd ==READ ) { in_page = raw_page; in_offs = raw_off;
@@ -146,11 +150,11 @@ cryptoloop_transfer(struct loop_device *lo, int cmd,u32 iv[4 ] = {0 , }; iv[0 ] =cpu_to_le32 (IV &0xffffffff ); - sg_in.page = in_page; +sg_set_page (&sg_in, in_page); sg_in.offset = in_offs; sg_in.length = sz; - sg_out.page = out_page; +sg_set_page (&sg_out, out_page); sg_out.offset = out_offs; sg_out.length = sz;
drivers/block/ub.c +5 -3
@@ -25,6 +25,7 @@#include <linux/usb_usual.h> #include <linux/blkdev.h> #include <linux/timer.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #define DRV_NAME "ub"
@@ -656,6 +657,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)if ((cmd =ub_get_cmd (lun)) ==NULL )return -1 ;memset (cmd,0 ,sizeof (struct ub_scsi_cmd )); +sg_init_table (cmd->sgv,UB_MAX_REQ_SG );blkdev_dequeue_request (rq);
@@ -1310,7 +1312,7 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) pipe = sc->send_bulk_pipe; sc->last_pipe = pipe;usb_fill_bulk_urb (&sc->work_urb, sc->dev, pipe, -page_address (sg->page) + sg->offset, sg->length, +page_address (sg_page (sg)) + sg->offset, sg->length, ub_urb_complete, sc); sc->work_urb.actual_length =0 ; sc->work_urb.error_count =0 ;
@@ -1427,7 +1429,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd) scmd->state =UB_CMDST_INIT ; scmd->nsg =1 ; sg = &scmd->sgv[0 ]; - sg->page =virt_to_page (sc->top_sense); +sg_set_page (sg,virt_to_page (sc->top_sense)); sg->offset = (unsigned long )sc->top_sense & (PAGE_SIZE -1 ); sg->length =UB_SENSE_SIZE ; scmd->len =UB_SENSE_SIZE ;
@@ -1863,7 +1865,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, cmd->state =UB_CMDST_INIT ; cmd->nsg =1 ; sg = &cmd->sgv[0 ]; - sg->page =virt_to_page (p); +sg_set_page (sg,virt_to_page (p)); sg->offset = (unsigned long )p & (PAGE_SIZE -1 ); sg->length =8 ; cmd->len =8 ;
drivers/ide/cris/ide-cris.c +2 -2
@@ -934,11 +934,11 @@ static int cris_ide_build_dmatable (ide_drive_t *drive)* than two possibly non-adjacent physical 4kB pages. */ /* group sequential buffers into one large buffer */ - addr =page_to_phys (sg->page) + sg->offset; + addr =page_to_phys (sg_page (sg)) + sg->offset; size =sg_dma_len (sg);while (--i) { sg =sg_next (sg); -if ((addr + size) !=page_to_phys (sg->page) + sg->offset) +if ((addr + size) !=page_to_phys (sg_page (sg)) + sg->offset)break ; size +=sg_dma_len (sg); }
drivers/ide/ide-probe.c +3 -1
@@ -1337,12 +1337,14 @@ static int hwif_init(ide_hwif_t *hwif)if (!hwif->sg_max_nents) hwif->sg_max_nents =PRD_ENTRIES ; - hwif->sg_table =kzalloc (sizeof (struct scatterlist )*hwif->sg_max_nents, + hwif->sg_table =kmalloc (sizeof (struct scatterlist )*hwif->sg_max_nents,GFP_KERNEL );if (!hwif->sg_table) {printk (KERN_ERR "%s: unable to allocate SG table.\n" , hwif->name); goto out; } + +sg_init_table (hwif->sg_table, hwif->sg_max_nents);if (init_irq (hwif) ==0 ) goto done;
drivers/ide/ide-taskfile.c +1 -1
@@ -278,7 +278,7 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) hwif->cursg = sg; } - page = cursg->page; + page =sg_page (cursg); offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */
drivers/ide/mips/au1xxx-ide.c +2 -2
@@ -276,7 +276,7 @@ static int auide_build_dmatable(ide_drive_t *drive)if (iswrite) {if (!put_source_flags (ahwif->tx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
@@ -285,7 +285,7 @@ static int auide_build_dmatable(ide_drive_t *drive) }else {if (!put_dest_flags (ahwif->rx_chan, - (void *)(page_address (sg->page) + (void *)(page_address (sg_page (sg)) + sg->offset), tc, flags)) { printk(KERN_ERR "%s failed %d\n",
drivers/ieee1394/dma.c +1 -1
@@ -111,7 +111,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,unsigned long va = (unsigned long )dma->kvirt + (i <<PAGE_SHIFT ); - dma->sglist[i].page =vmalloc_to_page ((void *)va); +sg_set_page (&dma->sglist[i],vmalloc_to_page ((void *)va)); dma->sglist[i].length =PAGE_SIZE ; }
drivers/ieee1394/sbp2.c +1 -1
@@ -1466,7 +1466,7 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, cmd->dma_size = sgpnt[0 ].length; cmd->dma_type =CMD_DMA_PAGE ; cmd->cmd_dma =dma_map_page (hi->host->device.parent, - sgpnt[0 ].page, sgpnt[0 ].offset, +sg_page (&sgpnt[0 ]), sgpnt[0 ].offset, cmd->dma_size, cmd->dma_dir); orb->data_descriptor_lo = cmd->cmd_dma;
drivers/infiniband/core/umem.c +7 -4
@@ -55,9 +55,11 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dib_dma_unmap_sg (dev, chunk->page_list, chunk->nents,DMA_BIDIRECTIONAL );for (i =0 ; i < chunk->nents; ++i) { +struct page *page =sg_page (&chunk->page_list[i]); +if (umem->writable && dirty) -set_page_dirty_lock (chunk->page_list[i].page); -put_page (chunk->page_list[i].page); +set_page_dirty_lock (page); +put_page (page); }kfree (chunk);
@@ -164,11 +166,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, } chunk->nents =min_t (int, ret,IB_UMEM_MAX_PAGE_CHUNK ); +sg_init_table (chunk->page_list, chunk->nents);for (i =0 ; i < chunk->nents; ++i) {if (vma_list && !is_vm_hugetlb_page (vma_list[i + off])) umem->hugetlb =0 ; - chunk->page_list[i].page = page_list[i + off]; +sg_set_page (&chunk->page_list[i], page_list[i + off]); chunk->page_list[i].offset =0 ; chunk->page_list[i].length =PAGE_SIZE ; }
@@ -179,7 +182,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, DMA_BIDIRECTIONAL);if (chunk->nmap <=0 ) {for (i =0 ; i < chunk->nents; ++i) -put_page (chunk->page_list[i].page); +put_page (sg_page (&chunk->page_list[i]));kfree (chunk); ret = -ENOMEM ;
drivers/infiniband/hw/ipath/ipath_dma.c +2 -2
@@ -108,7 +108,7 @@ static int ipath_map_sg(struct ib_device *dev, struct scatterlist *sgl,BUG_ON (!valid_dma_direction (direction));for_each_sg (sgl, sg, nents, i) { - addr = (u64 )page_address (sg->page); + addr = (u64 )page_address (sg_page (sg));/* TODO: handle highmem pages */ if (!addr) { ret =0 ;
@@ -127,7 +127,7 @@ static void ipath_unmap_sg(struct ib_device *dev,static u64 ipath_sg_dma_address (struct ib_device *dev,struct scatterlist *sg) { -u64 addr = (u64 )page_address (sg->page); +u64 addr = (u64 )page_address (sg_page (sg));if (addr) addr += sg->offset;
drivers/infiniband/hw/ipath/ipath_mr.c +1 -1
@@ -225,7 +225,7 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,for (i =0 ; i < chunk->nents; i++) {void *vaddr; - vaddr =page_address (chunk->page_list[i].page); + vaddr =page_address (sg_page (&chunk->page_list[i]));if (!vaddr) { ret =ERR_PTR (-EINVAL ); goto bail;
drivers/infiniband/hw/mthca/mthca_memfree.c +15 -9
@@ -71,7 +71,7 @@ static void mthca_free_icm_pages(struct mthca_dev *dev, struct mthca_icm_chunk * PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -81,7 +81,7 @@ static void mthca_free_icm_coherent(struct mthca_dev *dev, struct mthca_icm_chunfor (i =0 ; i < chunk->npages; ++i) {dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); } }
@@ -107,10 +107,13 @@ void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm, int coherent)static int mthca_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -157,6 +160,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MTHCA_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -304,7 +308,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj, dma_addr_t *dma_h* so if we found the page, dma_handle has already * been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
@@ -445,6 +449,7 @@ static u64 mthca_uarc_virt(struct mthca_dev *dev, struct mthca_uar *uar, int pagint mthca_map_user_db (struct mthca_dev *dev,struct mthca_uar *uar,struct mthca_user_db_table *db_tab,int index,u64 uaddr) { +struct page *pages[1 ];int ret =0 ;u8 status;int i;
@@ -472,16 +477,17 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, } ret =get_user_pages (current, current->mm, uaddr &PAGE_MASK ,1 ,1 ,0 , - &db_tab->page[i].mem.page,NULL ); + pages,NULL );if (ret <0 ) goto out; +sg_set_page (&db_tab->page[i].mem, pages[0 ]); db_tab->page[i].mem.length =MTHCA_ICM_PAGE_SIZE ; db_tab->page[i].mem.offset = uaddr & ~PAGE_MASK ; ret =pci_map_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE );if (ret <0 ) { -put_page (db_tab->page[i].mem.page); +put_page (pages[0 ]); goto out; }
@@ -491,7 +497,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, ret = -EINVAL ;if (ret) {pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); goto out; }
@@ -557,7 +563,7 @@ void mthca_cleanup_user_db_tab(struct mthca_dev *dev, struct mthca_uar *uar,if (db_tab->page[i].uvirt) {mthca_UNMAP_ICM (dev,mthca_uarc_virt (dev, uar, i),1 , &status);pci_unmap_sg (dev->pdev, &db_tab->page[i].mem,1 ,PCI_DMA_TODEVICE ); -put_page (db_tab->page[i].mem.page); +put_page (sg_page (&db_tab->page[i].mem)); } }
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -131,7 +131,7 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, data->size, i) { - from =kmap_atomic (sg->page,KM_USER0 ); + from =kmap_atomic (sg_page (sg),KM_USER0 );memcpy (p, from + sg->offset, sg->length);
@@ -191,7 +191,7 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask, p = mem;for_each_sg (sgl, sg, sg_size, i) { - to =kmap_atomic (sg->page,KM_SOFTIRQ0 ); + to =kmap_atomic (sg_page (sg),KM_SOFTIRQ0 );memcpy (to + sg->offset, p, sg->length);
@@ -300,7 +300,7 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,for_each_sg (sgl, sg, data->dma_nents, i) {/* iser_dbg("Checking sg iobuf [%d]: phys=0x%08lX " "offset: %ld sz: %ld\n", i, -(unsigned long)page_to_phys(sg->page), +(unsigned long)page_to_phys(sg_page(sg)), (unsigned long)sg->offset, (unsigned long)sg->length); */ end_addr = ib_sg_dma_address(ibdev, sg) +
@@ -336,7 +336,7 @@ static void iser_data_buf_dump(struct iser_data_buf *data,iser_err ("sg[%d] dma_addr:0x%lX page:0x%p " "off:0x%x sz:0x%x dma_len:0x%x\n" , i, (unsigned long )ib_sg_dma_address (ibdev, sg), - sg->page, sg->offset, +sg_page (sg), sg->offset, sg->length,ib_sg_dma_len (ibdev, sg)); }
drivers/md/dm-crypt.c +11 -10
@@ -346,16 +346,17 @@ static int crypt_convert(struct crypt_config *cc, ctx->idx_out < ctx->bio_out->bi_vcnt) {struct bio_vec *bv_in =bio_iovec_idx (ctx->bio_in, ctx->idx_in);struct bio_vec *bv_out =bio_iovec_idx (ctx->bio_out, ctx->idx_out); -struct scatterlist sg_in = { - .page = bv_in->bv_page, - .offset = bv_in->bv_offset + ctx->offset_in, - .length =1 <<SECTOR_SHIFT - }; -struct scatterlist sg_out = { - .page = bv_out->bv_page, - .offset = bv_out->bv_offset + ctx->offset_out, - .length =1 <<SECTOR_SHIFT - }; +struct scatterlist sg_in, sg_out; + +sg_init_table (&sg_in,1 ); +sg_set_page (&sg_in, bv_in->bv_page); + sg_in.offset = bv_in->bv_offset + ctx->offset_in; + sg_in.length =1 <<SECTOR_SHIFT ; + +sg_init_table (&sg_out,1 ); +sg_set_page (&sg_out, bv_out->bv_page); + sg_out.offset = bv_out->bv_offset + ctx->offset_out; + sg_out.length =1 <<SECTOR_SHIFT ; ctx->offset_in += sg_in.length;if (ctx->offset_in >= bv_in->bv_len) {
drivers/media/common/saa7146_core.c +2 -1
@@ -112,12 +112,13 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/media/video/ivtv/ivtv-udma.c +2 -2
@@ -63,10 +63,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_infomemcpy (page_address (dma->bouncemap[map_offset]) + offset, src, len);kunmap_atomic (src,KM_BOUNCE_READ );local_irq_restore (flags); - dma->SGlist[map_offset].page = dma->bouncemap[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->bouncemap[map_offset]); }else { - dma->SGlist[map_offset].page = dma->map[map_offset]; +sg_set_page (&dma->SGlist[map_offset], dma->map[map_offset]); } offset =0 ; map_offset++;
drivers/media/video/videobuf-dma-sg.c +5 -3
@@ -60,12 +60,13 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist =kcalloc (nr_pages,sizeof (struct scatterlist ),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);for (i =0 ; i < nr_pages; i++, virt +=PAGE_SIZE ) { pg =vmalloc_to_page (virt);if (NULL == pg) goto err;BUG_ON (PageHighMem (pg)); - sglist[i].page = pg; +sg_set_page (&sglist[i], pg); sglist[i].length =PAGE_SIZE ; }return sglist;
@@ -86,13 +87,14 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) sglist =kcalloc (nr_pages,sizeof (*sglist),GFP_KERNEL );if (NULL == sglist)return NULL ; +sg_init_table (sglist, nr_pages);if (NULL == pages[0 ]) goto nopage;if (PageHighMem (pages[0 ]))/* DMA to highmem pages might not work */ goto highmem; - sglist[0 ].page = pages[0 ]; +sg_set_page (&sglist[0 ], pages[0 ]); sglist[0 ].offset = offset; sglist[0 ].length =PAGE_SIZE - offset;for (i =1 ; i < nr_pages; i++) {
@@ -100,7 +102,7 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset) goto nopage;if (PageHighMem (pages[i])) goto highmem; - sglist[i].page = pages[i]; +sg_set_page (&sglist[i], pages[i]); sglist[i].length =PAGE_SIZE ; }return sglist;
drivers/mmc/card/queue.c +8 -7
@@ -13,6 +13,7 @@#include <linux/blkdev.h> #include <linux/freezer.h> #include <linux/kthread.h> +#include <linux/scatterlist.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h>
@@ -153,19 +154,21 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lockblk_queue_max_hw_segments (mq->queue, bouncesz /512 );blk_queue_max_segment_size (mq->queue, bouncesz); - mq->sg =kzalloc (sizeof (struct scatterlist ), + mq->sg =kmalloc (sizeof (struct scatterlist ),GFP_KERNEL );if (!mq->sg) { ret = -ENOMEM ; goto cleanup_queue; } +sg_init_table (mq->sg,1 ); - mq->bounce_sg =kzalloc (sizeof (struct scatterlist ) * + mq->bounce_sg =kmalloc (sizeof (struct scatterlist ) * bouncesz /512 ,GFP_KERNEL );if (!mq->bounce_sg) { ret = -ENOMEM ; goto cleanup_queue; } + sg_init_table(mq->bounce_sg, bouncesz / 512); } }#endif
@@ -302,12 +305,12 @@ static void copy_sg(struct scatterlist *dst, unsigned int dst_len,BUG_ON (dst_len ==0 );if (dst_size ==0 ) { - dst_buf =page_address (dst->page) + dst->offset; + dst_buf =page_address (sg_page (dst)) + dst->offset; dst_size = dst->length; }if (src_size ==0 ) { - src_buf =page_address (src->page) + src->offset; + src_buf =page_address (sg_page (src)) + src->offset; src_size = src->length; }
@@ -353,9 +356,7 @@ unsigned int mmc_queue_map_sg(struct mmc_queue *mq)return 1 ; } - mq->sg[0 ].page =virt_to_page (mq->bounce_buf); - mq->sg[0 ].offset =offset_in_page (mq->bounce_buf); - mq->sg[0 ].length =0 ; +sg_init_one (mq->sg, mq->bounce_buf,0 );while (sg_len) { mq->sg[0 ].length += mq->bounce_sg[sg_len -1 ].length;
drivers/mmc/host/at91_mci.c +4 -4
@@ -149,7 +149,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data sg = &data->sg[i]; - sgbuffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + sgbuffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset; amount =min (size, sg->length); size -= amount;
@@ -226,7 +226,7 @@ static void at91_mci_pre_dma_read(struct at91mci_host *host) sg = &data->sg[host->transfer_index++];pr_debug ("sg = %p\n" , sg); - sg->dma_address =dma_map_page (NULL , sg->page, sg->offset, sg->length,DMA_FROM_DEVICE ); + sg->dma_address =dma_map_page (NULL ,sg_page (sg), sg->offset, sg->length,DMA_FROM_DEVICE );pr_debug ("dma address = %08X, length = %d\n" , sg->dma_address, sg->length);
@@ -283,7 +283,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)int index;/* Swap the contents of the buffer */ - buffer =kmap_atomic (sg->page,KM_BIO_SRC_IRQ ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_BIO_SRC_IRQ ) + sg->offset;pr_debug ("buffer = %p, length = %d\n" , buffer, sg->length);for (index =0 ; index < (sg->length /4 ); index++)
@@ -292,7 +292,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)kunmap_atomic (buffer,KM_BIO_SRC_IRQ ); } -flush_dcache_page (sg->page); +flush_dcache_page (sg_page (sg)); }/* Is there another transfer to trigger? */
drivers/mmc/host/au1xmmc.c +4 -4
@@ -340,7 +340,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)/* This is the pointer to the data buffer */ sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len = data->sg[host->pio.index].length - host->pio.offset;
@@ -400,7 +400,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)if (host->pio.index < host->dma.len) { sg = &data->sg[host->pio.index]; - sg_ptr =page_address (sg->page) + sg->offset + host->pio.offset; + sg_ptr =page_address (sg_page (sg)) + sg->offset + host->pio.offset;/* This is the space left inside the buffer */ sg_len =sg_dma_len (&data->sg[host->pio.index]) - host->pio.offset;
@@ -613,13 +613,13 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)if (host->flags &HOST_F_XMIT ){ ret =au1xxx_dbdma_put_source_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }else { ret =au1xxx_dbdma_put_dest_flags (channel, - (void *) (page_address (sg->page) + + (void *) (page_address (sg_page (sg)) + sg->offset), len, flags); }
drivers/mmc/host/imxmmc.c +1 -1
@@ -262,7 +262,7 @@ static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data) }/* Convert back to virtual address */ - host->data_ptr = (u16 *)(page_address (data->sg->page) + data->sg->offset); + host->data_ptr = (u16 *)(page_address (sg_page (data->sg)) + data->sg->offset); host->data_cnt =0 ;clear_bit (IMXMCI_PEND_DMA_DATA_b, &host->pending_events);
drivers/mmc/host/mmc_spi.c +4 -4
@@ -813,7 +813,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, && dir == DMA_FROM_DEVICE) dir =DMA_BIDIRECTIONAL ; - dma_addr =dma_map_page (dma_dev, sg->page,0 , + dma_addr =dma_map_page (dma_dev,sg_page (sg),0 ,PAGE_SIZE , dir);if (direction ==DMA_TO_DEVICE ) t->tx_dma = dma_addr + sg->offset;
@@ -822,7 +822,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, }/* allow pio too; we don't allow highmem */ - kmap_addr =kmap (sg->page); + kmap_addr =kmap (sg_page (sg));if (direction ==DMA_TO_DEVICE ) t->tx_buf = kmap_addr + sg->offset;else
@@ -855,8 +855,8 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,/* discard mappings */ if (direction ==DMA_FROM_DEVICE ) -flush_kernel_dcache_page (sg->page); -kunmap (sg->page); +flush_kernel_dcache_page (sg_page (sg)); +kunmap (sg_page (sg));if (dma_dev)dma_unmap_page (dma_dev, dma_addr,PAGE_SIZE , dir);
drivers/mmc/host/omap.c +2 -2
@@ -24,10 +24,10 @@#include <linux/mmc/host.h> #include <linux/mmc/card.h> #include <linux/clk.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/scatterlist.h> #include <asm/mach-types.h> #include <asm/arch/board.h>
@@ -383,7 +383,7 @@ mmc_omap_sg_to_buf(struct mmc_omap_host *host) sg = host->data->sg + host->sg_idx; host->buffer_bytes_left = sg->length; - host->buffer =page_address (sg->page) + sg->offset; + host->buffer =page_address (sg_page (sg)) + sg->offset;if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; }
drivers/mmc/host/sdhci.c +1 -1
@@ -231,7 +231,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host)static inline char *sdhci_sg_to_buffer (struct sdhci_host * host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline int sdhci_next_sg (struct sdhci_host * host)
drivers/mmc/host/tifm_sd.c +4 -4
@@ -192,7 +192,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt);
@@ -241,18 +241,18 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) } off = sg[host->sg_pos].offset + host->block_pos; - pg =nth_page (sg[host->sg_pos].page, off >>PAGE_SHIFT ); + pg =nth_page (sg_page (&sg[host->sg_pos]), off >>PAGE_SHIFT ); p_off =offset_in_page (off); p_cnt =PAGE_SIZE - p_off; p_cnt =min (p_cnt, cnt); p_cnt =min (p_cnt, t_size);if (r_data->flags &MMC_DATA_WRITE ) -tifm_sd_copy_page (host->bounce_buf.page, +tifm_sd_copy_page (sg_page (&host->bounce_buf), r_data->blksz - t_size, pg, p_off, p_cnt);else if (r_data->flags &MMC_DATA_READ ) -tifm_sd_copy_page (pg, p_off, host->bounce_buf.page, +tifm_sd_copy_page (pg, p_off,sg_page (&host->bounce_buf), r_data->blksz - t_size, p_cnt); t_size -= p_cnt;
drivers/mmc/host/wbsd.c +3 -3
@@ -269,7 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host *host)static inline char *wbsd_sg_to_buffer (struct wbsd_host *host) { -return page_address (host->cur_sg->page) + host->cur_sg->offset; +return page_address (sg_page (host->cur_sg)) + host->cur_sg->offset; }static inline void wbsd_sg_to_dma (struct wbsd_host *host,struct mmc_data *data)
@@ -283,7 +283,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (dmabuf, sgbuf, sg[i].length); dmabuf += sg[i].length; }
@@ -300,7 +300,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data) len = data->sg_len;for (i =0 ; i < len; i++) { - sgbuf =page_address (sg[i].page) + sg[i].offset; + sgbuf =page_address (sg_page (&sg[i])) + sg[i].offset;memcpy (sgbuf, dmabuf, sg[i].length); dmabuf += sg[i].length; }
drivers/net/mlx4/icm.c +9 -5
@@ -60,7 +60,7 @@ static void mlx4_free_icm_pages(struct mlx4_dev *dev, struct mlx4_icm_chunk *chu PCI_DMA_BIDIRECTIONAL);for (i =0 ; i < chunk->npages; ++i) -__free_pages (chunk->mem[i].page, +__free_pages (sg_page (&chunk->mem[i]),get_order (chunk->mem[i].length)); }
@@ -70,7 +70,7 @@ static void mlx4_free_icm_coherent(struct mlx4_dev *dev, struct mlx4_icm_chunk *for (i =0 ; i < chunk->npages; ++i)dma_free_coherent (&dev->pdev->dev, chunk->mem[i].length, -lowmem_page_address (chunk->mem[i].page), +lowmem_page_address (sg_page (&chunk->mem[i])),sg_dma_address (&chunk->mem[i])); }
@@ -95,10 +95,13 @@ void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent)static int mlx4_alloc_icm_pages (struct scatterlist *mem,int order,gfp_t gfp_mask) { - mem->page =alloc_pages (gfp_mask, order); -if (!mem->page) +struct page *page; + + page =alloc_pages (gfp_mask, order); +if (!page)return -ENOMEM ; +sg_set_page (mem, page); mem->length =PAGE_SIZE << order; mem->offset =0 ;return 0 ;
@@ -145,6 +148,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,if (!chunk) goto fail; +sg_init_table (chunk->mem,MLX4_ICM_CHUNK_LEN ); chunk->npages =0 ; chunk->nsg =0 ;list_add_tail (&chunk->list, &icm->chunk_list);
@@ -334,7 +338,7 @@ void *mlx4_table_find(struct mlx4_icm_table *table, int obj, dma_addr_t *dma_han* been assigned to. */ if (chunk->mem[i].length > offset) { - page = chunk->mem[i].page; + page =sg_page (&chunk->mem[i]); goto out; } offset -= chunk->mem[i].length;
drivers/net/ppp_mppe.c +2 -4
@@ -55,7 +55,7 @@#include <linux/mm.h> #include <linux/ppp_defs.h> #include <linux/ppp-comp.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include "ppp_mppe.h"
@@ -68,9 +68,7 @@ MODULE_VERSION("1.0.2");static unsigned int setup_sg (struct scatterlist *sg,const void *address,unsigned int length) { - sg[0 ].page =virt_to_page (address); - sg[0 ].offset =offset_in_page (address); - sg[0 ].length = length; +sg_init_one (sg, address, length);return length; }
drivers/scsi/3w-9xxx.c +2 -2
@@ -1840,7 +1840,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, (scsi_bufflen(srb) < TW_MIN_SGL_LENGTH)) {if (srb->sc_data_direction ==DMA_TO_DEVICE || srb->sc_data_direction ==DMA_BIDIRECTIONAL ) {struct scatterlist *sg =scsi_sglist (srb); -char *buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; +char *buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (tw_dev->generic_buffer_virt[request_id], buf, sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 ); }
@@ -1919,7 +1919,7 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int rechar *buf;unsigned long flags =0 ;local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buf, tw_dev->generic_buffer_virt[request_id], sg->length);kunmap_atomic (buf - sg->offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/3w-xxxx.c +1 -1
@@ -1469,7 +1469,7 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,struct scatterlist *sg =scsi_sglist (cmd);local_irq_save (flags); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len);memcpy (buf, data, transfer_len);
drivers/scsi/NCR5380.c +2 -2
@@ -298,7 +298,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)if (cmd->use_sg) { cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.buffers_residual = cmd->use_sg -1 ; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset; cmd->SCp.this_residual = cmd->SCp.buffer->length; }else {
@@ -2143,7 +2143,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { ++cmd->SCp.buffer; --cmd->SCp.buffers_residual; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page)+ + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer))+ cmd->SCp.buffer->offset;dprintk (NDEBUG_INFORMATION , ("scsi%d : %d bytes and %d buffers left\n" , instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual)); }
drivers/scsi/NCR53c406a.c +2 -2
@@ -875,7 +875,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_write (page_address (sg->page) + sg->offset, +NCR53c406a_pio_write (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
@@ -897,7 +897,7 @@ static void NCR53c406a_intr(void *dev_id)outb (TRANSFER_INFO |DMA_OP ,CMD_REG );#if USE_PIO scsi_for_each_sg (current_SC, sg,scsi_sg_count (current_SC), i) { -NCR53c406a_pio_read (page_address (sg->page) + sg->offset, +NCR53c406a_pio_read (page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 ;
drivers/scsi/aacraid/aachba.c +1 -1
@@ -356,7 +356,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigneint transfer_len;struct scatterlist *sg =scsi_sglist (scsicmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset; transfer_len =min (sg->length, len + offset); transfer_len -= offset;
drivers/scsi/aha1542.c +3 -3
@@ -49,7 +49,7 @@#include "aha1542.h" #define SCSI_BUF_PA (address) isa_virt_to_bus(address) -#define SCSI_SG_PA (sgent) (isa_page_to_bus((sgent)->page) + (sgent)->offset) +#define SCSI_SG_PA (sgent) (isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)static void BAD_DMA (void *address,unsigned int length) {
@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt, {printk (KERN_CRIT "sgpnt[%d:%d] page %p/0x%llx length %u\n" , badseg, nseg, -page_address (sgp->page) + sgp->offset, +page_address (sg_page (sgp)) + sgp->offset, (unsigned long long )SCSI_SG_PA (sgp), sgp->length);
@@ -712,7 +712,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))printk (KERN_CRIT "Bad segment list supplied to aha1542.c (%d, %d)\n" , SCpnt->use_sg, i);scsi_for_each_sg (SCpnt, sg, SCpnt->use_sg, i) {printk (KERN_CRIT "%d: %p %d\n" , i, - (page_address (sg->page) + + (page_address (sg_page (sg)) + sg->offset), sg->length); };printk (KERN_CRIT "cptr %x: " , (unsigned int ) cptr);
drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
@@ -1343,7 +1343,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \/* 4 bytes: Areca io control code */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (scsi_sg_count (cmd) >1 ) { retvalue =ARCMSR_MESSAGE_FAIL ; goto message_out;
@@ -1593,7 +1593,7 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,strncpy (&inqdata[32 ],"R001" ,4 );/* Product Revision */ sg =scsi_sglist (cmd); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memcpy (buffer, inqdata,sizeof (inqdata)); sg =scsi_sglist (cmd);
drivers/scsi/fdomain.c +3 -3
@@ -1321,7 +1321,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id)if (current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; }else break ;
@@ -1354,7 +1354,7 @@ static irqreturn_t do_fdomain_16x0_intr(int irq, void *dev_id) && current_SC->SCp.buffers_residual) { --current_SC->SCp.buffers_residual; ++current_SC->SCp.buffer; - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.buffer->offset; + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; } }
@@ -1439,7 +1439,7 @@ static int fdomain_16x0_queue(struct scsi_cmnd *SCpnt,if (scsi_sg_count (current_SC)) { current_SC->SCp.buffer =scsi_sglist (current_SC); - current_SC->SCp.ptr =page_address (current_SC->SCp.buffer->page) + current_SC->SCp.ptr =page_address (sg_page (current_SC->SCp.buffer)) + current_SC->SCp.buffer->offset; current_SC->SCp.this_residual = current_SC->SCp.buffer->length; current_SC->SCp.buffers_residual =scsi_sg_count (current_SC) -1 ;
drivers/scsi/gdth.c +2 -2
@@ -2374,13 +2374,13 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow; -if (!sl->page) { +if (!sg_page (sl)) {printk ("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n" , ha->hanum);return ; }local_irq_save (flags); - address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; + address =kmap_atomic (sg_page (sl),KM_BIO_SRC_IRQ ) + sl->offset;if (to_buffer)memcpy (buffer, address, cpnow);else
drivers/scsi/ibmmca.c +1 -1
@@ -1828,7 +1828,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))BUG_ON (scsi_sg_count (cmd) >16 );scsi_for_each_sg (cmd, sg,scsi_sg_count (cmd), i) { -ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg->page) + sg->offset); +ld (shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg_page (sg)) + sg->offset);ld (shpnt)[ldn].sge[i].byte_length = sg->length; } scb->enable |=IM_POINTER_TO_LIST ;
drivers/scsi/ide-scsi.c +6 -6
@@ -175,18 +175,18 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignewhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_input_bytes (drive, buf + pc->b_count, count); }
@@ -212,18 +212,18 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignwhile (bcount) { count =min (pc->sg->length - pc->b_count, bcount); -if (PageHighMem (pc->sg->page)) { +if (PageHighMem (sg_page (pc->sg))) {unsigned long flags;local_irq_save (flags); - buf =kmap_atomic (pc->sg->page,KM_IRQ0 ) + + buf =kmap_atomic (sg_page (pc->sg),KM_IRQ0 ) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count);kunmap_atomic (buf - pc->sg->offset,KM_IRQ0 );local_irq_restore (flags); }else { - buf =page_address (pc->sg->page) + pc->sg->offset; + buf =page_address (sg_page (pc->sg)) + pc->sg->offset; drive->hwif->atapi_output_bytes (drive, buf + pc->b_count, count); }
drivers/scsi/imm.c +2 -2
@@ -706,7 +706,7 @@ static int imm_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset;/*
@@ -845,7 +845,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/ipr.c +12 -7
@@ -2872,6 +2872,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len) } scatterlist = sglist->scatterlist; +sg_init_table (scatterlist, num_elem); sglist->order = order; sglist->num_sg = num_elem;
@@ -2884,12 +2885,12 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)/* Free up what we already allocated */ for (j = i -1 ; j >=0 ; j--) -__free_pages (scatterlist[j].page, order); +__free_pages (sg_page (&scatterlist[j]), order);kfree (sglist);return NULL ; } - scatterlist[i].page = page; +sg_set_page (&scatterlist[i], page); }return sglist;
@@ -2910,7 +2911,7 @@ static void ipr_free_ucode_buffer(struct ipr_sglist *sglist)int i;for (i =0 ; i < sglist->num_sg; i++) -__free_pages (sglist->scatterlist[i].page, sglist->order); +__free_pages (sg_page (&sglist->scatterlist[i]), sglist->order);kfree (sglist); }
@@ -2940,9 +2941,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, scatterlist = sglist->scatterlist;for (i =0 ; i < (len / bsize_elem); i++, buffer += bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = bsize_elem;
@@ -2953,9 +2956,11 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist, }if (len % bsize_elem) { - kaddr =kmap (scatterlist[i].page); +struct page *page =sg_page (&scatterlist[i]); + + kaddr =kmap (page);memcpy (kaddr, buffer, len % bsize_elem); -kunmap (scatterlist[i].page); +kunmap (page); scatterlist[i].length = len % bsize_elem; }
drivers/scsi/ips.c +3 -3
@@ -1515,7 +1515,7 @@ static int ips_is_passthru(struct scsi_cmnd *SC)/* kmap_atomic() ensures addressability of the user buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buffer =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;if (buffer && buffer[0 ] =='C' && buffer[1 ] =='O' && buffer[2 ] =='P' && buffer[3 ] =='P' ) {kunmap_atomic (buffer - sg->offset,KM_IRQ0 );
@@ -3523,7 +3523,7 @@ ips_scmd_buf_write(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (buffer, &cdata[xfer_cnt], min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
@@ -3556,7 +3556,7 @@ ips_scmd_buf_read(struct scsi_cmnd *scmd, void *data, unsigned int count)/* kmap_atomic() ensures addressability of the data buffer.*/ /* local_irq_save() protects the KM_IRQ0 address slot. */ local_irq_save (flags); - buffer =kmap_atomic (sg[i].page,KM_IRQ0 ) + sg[i].offset; + buffer =kmap_atomic (sg_page (&sg[i]),KM_IRQ0 ) + sg[i].offset;memcpy (&cdata[xfer_cnt], buffer, min_cnt);kunmap_atomic (buffer - sg[i].offset,KM_IRQ0 );local_irq_restore (flags);
drivers/scsi/iscsi_tcp.c +7 -8
@@ -70,9 +70,7 @@ module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);static inline void iscsi_buf_init_iov (struct iscsi_buf *ibuf,char *vbuf,int size) { - ibuf->sg.page =virt_to_page (vbuf); - ibuf->sg.offset =offset_in_page (vbuf); - ibuf->sg.length = size; +sg_init_one (&ibuf->sg, vbuf, size); ibuf->sent =0 ; ibuf->use_sendmsg =1 ; }
@@ -80,13 +78,14 @@ iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)static inline void iscsi_buf_init_sg (struct iscsi_buf *ibuf,struct scatterlist *sg) { - ibuf->sg.page = sg->page; +sg_init_table (&ibuf->sg,1 ); +sg_set_page (&ibuf->sg,sg_page (sg)); ibuf->sg.offset = sg->offset; ibuf->sg.length = sg->length;/* * Fastpath: sg element fits into single page */ -if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg->page)) +if (sg->length + sg->offset <=PAGE_SIZE && !PageSlab (sg_page (sg))) ibuf->use_sendmsg =0 ;else ibuf->use_sendmsg =1 ;
@@ -716,7 +715,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)for (i = tcp_ctask->sg_count; i <scsi_sg_count (sc); i++) {char *dest; - dest =kmap_atomic (sg[i].page,KM_SOFTIRQ0 ); + dest =kmap_atomic (sg_page (&sg[i]),KM_SOFTIRQ0 ); rc =iscsi_ctask_copy (tcp_conn, ctask, dest + sg[i].offset, sg[i].length, offset);kunmap_atomic (dest,KM_SOFTIRQ0 );
@@ -1103,9 +1102,9 @@ iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)* slab case. */ if (buf->use_sendmsg) - res =sock_no_sendpage (sk, buf->sg.page, offset, size, flags); + res =sock_no_sendpage (sk,sg_page (&buf->sg), offset, size, flags);else - res = tcp_conn->sendpage (sk, buf->sg.page, offset, size, flags); + res = tcp_conn->sendpage (sk,sg_page (&buf->sg), offset, size, flags);if (res >=0 ) { conn->txdata_octets += res;
drivers/scsi/megaraid.c +3 -3
@@ -658,7 +658,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)struct scatterlist *sg; sg =scsi_sglist (cmd); - buf =kmap_atomic (sg->page,KM_IRQ0 ) + sg->offset; + buf =kmap_atomic (sg_page (sg),KM_IRQ0 ) + sg->offset;memset (buf,0 , cmd->cmnd[4 ]);kunmap_atomic (buf - sg->offset,KM_IRQ0 );
@@ -1542,9 +1542,9 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)if ( cmd->cmnd[0 ] ==INQUIRY && !islogical ) { sgl =scsi_sglist (cmd); -if ( sgl->page ) { +if (sg_page (sgl) ) { c = *(unsigned char *) -page_address ((&sgl[0 ])->page) + +page_address ((sg_page (&sgl[0 ]))) + (&sgl[0 ])->offset; }else { printk(KERN_WARNING
drivers/scsi/megaraid/megaraid_mbox.c +4 -4
@@ -1584,9 +1584,9 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)caddr_t vaddr; sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { vaddr = (caddr_t) - (page_address ((&sgl[0 ])->page) + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset);memset (vaddr,0 , scp->cmnd[4 ]);
@@ -2328,9 +2328,9 @@ megaraid_mbox_dpc(unsigned long devp) && IS_RAID_CH(raid_dev, scb->dev_channel)) { sgl =scsi_sglist (scp); -if (sgl->page) { +if (sg_page (sgl)) { c = *(unsigned char *) - (page_address ((&sgl[0 ])->page) + + (page_address (sg_page (&sgl[0 ])) + (&sgl[0 ])->offset); }else { con_log(CL_ANN, (KERN_WARNING
drivers/scsi/osst.c +17 -15
@@ -542,7 +542,7 @@ static int osst_verify_frame(struct osst_tape * STp, int frame_seq_number, int qif (STp->raw) {if (STp->buffer->syscall_result) {for (i=0 ; i < STp->buffer->sg_segs; i++) -memset (page_address (STp->buffer->sg[i].page), +memset (page_address (sg_page (&STp->buffer->sg[i])),0 , STp->buffer->sg[i].length);strcpy (STp->buffer->b_data,"READ ERROR ON FRAME" ); }else
@@ -4437,7 +4437,7 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)for (i =0 , b_size =0 ; (i < STp->buffer->sg_segs) && ((b_size + STp->buffer->sg[i].length) <=OS_DATA_SIZE ); b_size += STp->buffer->sg[i++].length); - STp->buffer->aux = (os_aux_t *) (page_address (STp->buffer->sg[i].page) +OS_DATA_SIZE - b_size); + STp->buffer->aux = (os_aux_t *) (page_address (sg_page (&STp->buffer->sg[i])) +OS_DATA_SIZE - b_size);#if DEBUG printk (OSST_DEB_MSG "%s:D: b_data points to %p in segment 0 at %p\n" , name, STp->buffer->b_data,page_address (STp->buffer->sg[0 ].page));
@@ -5252,25 +5252,26 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)/* Try to allocate the first segment up to OS_DATA_SIZE and the others big enough to reach the goal (code assumes no segments in place) */ for (b_size =OS_DATA_SIZE , order =OSST_FIRST_ORDER ; b_size >=PAGE_SIZE ; order--, b_size /=2 ) { - STbuffer->sg[0 ].page =alloc_pages (priority, order); +struct page *page =alloc_pages (priority, order); + STbuffer->sg[0 ].offset =0 ; -if (STbuffer->sg[0 ].page !=NULL ) { +if (page !=NULL ) { +sg_set_page (&STbuffer->sg[0 ], page); STbuffer->sg[0 ].length = b_size; - STbuffer->b_data =page_address (STbuffer->sg[0 ].page); + STbuffer->b_data =page_address (page);break ; } } -if (STbuffer->sg[0 ].page ==NULL ) { +if (sg_page (&STbuffer->sg[0 ]) ==NULL ) {printk (KERN_NOTICE "osst :I: Can't allocate tape buffer main segment.\n" );return 0 ; }/* Got initial segment of 'bsize,order', continue with same size if possible, except for AUX */ for (segs=STbuffer->sg_segs=1 , got=b_size; segs < max_segs && got <OS_FRAME_SIZE ; ) { - STbuffer->sg[segs].page = -alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); +struct page *page =alloc_pages (priority, (OS_FRAME_SIZE - got <=PAGE_SIZE ) ?0 : order); STbuffer->sg[segs].offset =0 ; -if (STbuffer->sg[segs].page ==NULL ) { +if (page ==NULL ) {if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size /2 && order) { b_size /=2 ;/* Large enough for the rest of the buffers */ order--;
@@ -5284,6 +5285,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)normalize_buffer (STbuffer);return 0 ; } +sg_set_page (&STbuffer->sg[segs], page); STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <=PAGE_SIZE /2 ) ? (OS_FRAME_SIZE - got) : b_size; got += STbuffer->sg[segs].length; STbuffer->buffer_size = got;
@@ -5316,7 +5318,7 @@ static void normalize_buffer(struct osst_buffer *STbuffer) b_size < STbuffer->sg[i].length; b_size *= 2, order++); -__free_pages (STbuffer->sg[i].page, order); +__free_pages (sg_page (&STbuffer->sg[i]), order); STbuffer->buffer_size -= STbuffer->sg[i].length; }#if DEBUG
@@ -5344,7 +5346,7 @@ static int append_to_buffer(const char __user *ubp, struct osst_buffer *st_bp, ifor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_from_user (page_address (st_bp->sg[i].page) + offset, ubp, cnt); + res =copy_from_user (page_address (sg_page (&st_bp->sg[i])) + offset, ubp, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5377,7 +5379,7 @@ static int from_buffer(struct osst_buffer *st_bp, char __user *ubp, int do_countfor ( ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count; - res =copy_to_user (ubp,page_address (st_bp->sg[i].page) + offset, cnt); + res =copy_to_user (ubp,page_address (sg_page (&st_bp->sg[i])) + offset, cnt);if (res)return (-EFAULT ); do_count -= cnt;
@@ -5410,7 +5412,7 @@ static int osst_zero_buffer_tail(struct osst_buffer *st_bp) i < st_bp->sg_segs && do_count > 0; i++) { cnt = st_bp->sg[i].length - offset < do_count ? st_bp->sg[i].length - offset : do_count ; -memset (page_address (st_bp->sg[i].page) + offset,0 , cnt); +memset (page_address (sg_page (&st_bp->sg[i])) + offset,0 , cnt); do_count -= cnt; offset =0 ; }
@@ -5430,7 +5432,7 @@ static int osst_copy_to_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (page_address (st_bp->sg[i].page), ptr, cnt); +memcpy (page_address (sg_page (&st_bp->sg[i])), ptr, cnt); do_count -= cnt; ptr += cnt; }
@@ -5451,7 +5453,7 @@ static int osst_copy_from_buffer(struct osst_buffer *st_bp, unsigned char *ptr)for (i =0 ; i < st_bp->sg_segs && do_count >0 ; i++) { cnt = st_bp->sg[i].length < do_count ? st_bp->sg[i].length : do_count ; -memcpy (ptr,page_address (st_bp->sg[i].page), cnt); +memcpy (ptr,page_address (sg_page (&st_bp->sg[i])), cnt); do_count -= cnt; ptr += cnt; }
drivers/scsi/pcmcia/sym53c500_cs.c +3 -3
@@ -443,7 +443,7 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_write (fast_pio, port_base, -page_address (sg->page) + sg->offset, +page_address (sg_page (sg)) + sg->offset, sg->length); }REG0 (port_base);
@@ -463,8 +463,8 @@ SYM53C500_intr(int irq, void *dev_id)scsi_for_each_sg (curSC, sg,scsi_sg_count (curSC), i) {SYM53C500_pio_read (fast_pio, port_base, -page_address (sg->page) + sg->offset, - sg->length); +page_address (sg_page (sg)) + sg->offset, + sg->length); }REG0 (port_base); }
drivers/scsi/ppa.c +2 -2
@@ -609,7 +609,7 @@ static int ppa_completion(struct scsi_cmnd *cmd) cmd->SCp.this_residual = cmd->SCp.buffer->length; cmd->SCp.ptr = -page_address (cmd->SCp.buffer->page) + +page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; } }
@@ -756,7 +756,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)/* if many buffers are available, start filling the first */ cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer; cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =page_address (cmd->SCp.buffer->page) + + cmd->SCp.ptr =page_address (sg_page (cmd->SCp.buffer)) + cmd->SCp.buffer->offset; }else {/* else fill the only available buffer */
drivers/scsi/qlogicfas408.c +1 -1
@@ -317,7 +317,7 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)return ((priv->qabort ==1 ?DID_ABORT :DID_RESET ) <<16 ); } - buf =page_address (sg->page) + sg->offset; + buf =page_address (sg_page (sg)) + sg->offset;if (ql_pdma (priv, phase, buf, sg->length))break ; }
drivers/scsi/scsi_debug.c +2 -2
@@ -625,7 +625,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,scsi_for_each_sg (scp, sg, scp->use_sg, k) {if (active) { kaddr = (unsigned char *) -kmap_atomic (sg->page,KM_USER0 ); +kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return (DID_ERROR <<16 ); kaddr_off = (unsigned char *)kaddr + sg->offset;
@@ -672,7 +672,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr, sg =scsi_sglist (scp); req_len = fin =0 ;for (k =0 ; k < scp->use_sg; ++k, sg =sg_next (sg)) { - kaddr = (unsigned char *)kmap_atomic (sg->page,KM_USER0 ); + kaddr = (unsigned char *)kmap_atomic (sg_page (sg),KM_USER0 );if (NULL == kaddr)return -1 ; kaddr_off = (unsigned char *)kaddr + sg->offset;
drivers/scsi/scsi_lib.c +10 -3
@@ -295,7 +295,7 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,int i, err, nr_vecs =0 ;for_each_sg (sgl, sg, nsegs, i) { - page = sg->page; + page =sg_page (sg); off = sg->offset; len = sg->length; data_len += len;
@@ -764,7 +764,7 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)if (unlikely (!sgl)) goto enomem; -memset (sgl,0 ,sizeof (*sgl) * sgp->size); +sg_init_table (sgl, sgp->size);/* * first loop through, set initial index and return value
@@ -781,6 +781,13 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)sg_chain (prev,SCSI_MAX_SG_SEGMENTS , sgl);/* +* if we have nothing left, mark the last segment as +* end-of-list +*/ +if (!left) +sg_mark_end (sgl, this); + +/* * don't allow subsequent mempool allocs to sleep, it would * violate the mempool principle. */
@@ -2353,7 +2360,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count, *offset = *offset - len_complete + sg->offset;/* Assumption: contiguous pages can be accessed as "page + i" */ - page =nth_page (sg->page, (*offset >>PAGE_SHIFT )); + page =nth_page (sg_page (sg), (*offset >>PAGE_SHIFT )); *offset &= ~PAGE_MASK ;/* Bytes in this sg-entry from *offset to the end of the page */
drivers/scsi/sg.c +15 -15
@@ -1169,7 +1169,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length;if (offset < len) { - page =virt_to_page (page_address (sg->page) + offset); + page =virt_to_page (page_address (sg_page (sg)) + offset);get_page (page);/* increment page count */ break ; }
@@ -1717,13 +1717,13 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,goto out_unlock; */ } - sgl[0 ].page = pages[0 ]; +sg_set_page (sgl, pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { - sgl[i].page = pages[i]; +sg_set_page (&sgl[i], pages[i]); sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -1754,7 +1754,7 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,int i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
@@ -1854,7 +1854,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) scatter_elem_sz_prev = ret_sz; } } - sg->page = p; +sg_set_page (sg, p); sg->length = (ret_sz > num) ? num : ret_sz; SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
@@ -1907,14 +1907,14 @@ sg_write_xfer(Sg_request * srp) onum =1 ; ksglen = sg->length; - p =page_address (sg->page); + p =page_address (sg_page (sg));for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,1 , &usglen, &up);if (res)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -1991,12 +1991,12 @@ sg_remove_scat(Sg_scatter_hold * schp) }else {int k; -for (k =0 ; (k < schp->k_use_sg) && sg->page; +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) {SCSI_LOG_TIMEOUT (5 ,printk ("sg_remove_scat: k=%d, pg=0x%p, len=%d\n" , - k, sg->page, sg->length)); -sg_page_free (sg->page, sg->length); + k,sg_page (sg), sg->length)); +sg_page_free (sg_page (sg), sg->length); } }kfree (schp->buffer);
@@ -2038,7 +2038,7 @@ sg_read_xfer(Sg_request * srp) }else onum =1 ; - p =page_address (sg->page); + p =page_address (sg_page (sg)); ksglen = sg->length;for (j =0 , k =0 ; j < onum; ++j) { res =sg_u_iovec (hp, iovec_count, j,0 , &usglen, &up);
@@ -2046,7 +2046,7 @@ sg_read_xfer(Sg_request * srp)return res;for (; p; sg =sg_next (sg), ksglen = sg->length, - p =page_address (sg->page)) { + p =page_address (sg_page (sg))) {if (usglen <=0 )break ;if (ksglen > usglen) {
@@ -2092,15 +2092,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)if ((!outp) || (num_read_xfer <=0 ))return 0 ; -for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, sg =sg_next (sg)) { +for (k =0 ; (k < schp->k_use_sg) &&sg_page (sg); ++k, sg =sg_next (sg)) { num = sg->length;if (num > num_read_xfer) { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num_read_xfer))return -EFAULT ;break ; }else { -if (__copy_to_user (outp,page_address (sg->page), +if (__copy_to_user (outp,page_address (sg_page (sg)), num))return -EFAULT ; num_read_xfer -= num;
drivers/scsi/st.c +4 -4
@@ -3797,7 +3797,7 @@ static void buf_to_sg(struct st_buffer *STbp, unsigned int length) sg = &(STbp->sg[0 ]); frp = STbp->frp;for (i=count=0 ; count < length; i++) { - sg[i].page = frp[i].page; +sg_set_page (&sg[i], frp[i].page);if (length - count > frp[i].length) sg[i].length = frp[i].length;else
@@ -4446,14 +4446,14 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa }/* Populate the scatter/gather list */ - sgl[0 ].page = pages[0 ]; +sg_set_page (&sgl[0 ], pages[0 ]); sgl[0 ].offset = uaddr & ~PAGE_MASK ;if (nr_pages >1 ) { sgl[0 ].length =PAGE_SIZE - sgl[0 ].offset; count -= sgl[0 ].length;for (i=1 ; i < nr_pages ; i++) { +sg_set_page (&sgl[i], pages[i]);; sgl[i].offset =0 ; - sgl[i].page = pages[i]; sgl[i].length = count <PAGE_SIZE ? count :PAGE_SIZE ; count -=PAGE_SIZE ; }
@@ -4483,7 +4483,7 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pint i;for (i=0 ; i < nr_pages; i++) { -struct page *page = sgl[i].page; +struct page *page =sg_page (&sgl[i]);if (dirtied)SetPageDirty (page);
drivers/scsi/tmscsim.c +1 -4
@@ -430,10 +430,7 @@ static __inline__ void dc390_Going_remove (struct dc390_dcb* pDCB, struct dc390_static struct scatterlist *dc390_sg_build_single (struct scatterlist *sg,void *addr,unsigned int length) { -memset (sg,0 ,sizeof (struct scatterlist )); - sg->page =virt_to_page (addr); - sg->length = length; - sg->offset = (unsigned long )addr & ~PAGE_MASK ; +sg_init_one (sg, addr, length);return sg; }
drivers/scsi/ultrastor.c +1 -1
@@ -681,7 +681,7 @@ static inline void build_sg_list(struct mscp *mscp, struct scsi_cmnd *SCpnt) max =scsi_sg_count (SCpnt);scsi_for_each_sg (SCpnt, sg, max, i) { - mscp->sglist[i].address =isa_page_to_bus (sg->page) + sg->offset; + mscp->sglist[i].address =isa_page_to_bus (sg_page (sg)) + sg->offset; mscp->sglist[i].num_bytes = sg->length; transfer_length += sg->length; }
drivers/scsi/wd7000.c +1 -1
@@ -1123,7 +1123,7 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,any2scsi (scb->maxlen, nseg *sizeof (Sgb));scsi_for_each_sg (SCpnt, sg, nseg, i) { -any2scsi (sgb[i].ptr,isa_page_to_bus (sg->page) + sg->offset); +any2scsi (sgb[i].ptr,isa_page_to_bus (sg_page (sg)) + sg->offset);any2scsi (sgb[i].len, sg->length); } }else {
drivers/usb/core/message.c +2 -2
@@ -438,12 +438,12 @@ int usb_sg_init ( io->urbs[i]->transfer_buffer =NULL ;#else io->urbs[i]->transfer_buffer = -page_address (sg[i].page) + sg[i].offset; +page_address (sg_page (&sg[i])) + sg[i].offset;#endif }else {/* hc may use _only_ transfer_buffer */ io->urbs [i]->transfer_buffer = -page_address (sg [i].page) + sg [i].offset; +page_address (sg_page (&sg[i])) + sg [i].offset; len = sg [i].length; }
drivers/usb/image/microtek.c +2 -2
@@ -519,7 +519,7 @@ static void mts_do_sg (struct urb* transfer) context->fragment++; mts_int_submit_urb(transfer, context->data_pipe, - page_address(sg[context->fragment].page) + + page_address(sg_page(&sg[context->fragment])) + sg[context->fragment].offset, sg[context->fragment].length, context->fragment + 1 == scsi_sg_count(context->srb) ?
@@ -557,7 +557,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)return ; }else { sg =scsi_sglist (srb); - desc->context.data =page_address (sg[0 ].page) + sg[0 ].offset; + desc->context.data =page_address (sg_page (&sg[0 ])) + sg[0 ].offset; desc->context.data_length = sg[0 ].length; }
drivers/usb/misc/usbtest.c +3 -2
@@ -360,9 +360,10 @@ static void free_sglist (struct scatterlist *sg, int nents)if (!sg)return ;for (i =0 ; i < nents; i++) { -if (!sg [i].page) +struct page *page =sg_page (&sg[i]); +if (!page)continue ; -kfree (page_address (sg [i].page) + sg [i].offset); +kfree (page_address (page) + sg [i].offset); }kfree (sg); }
drivers/usb/storage/protocol.c +1 -1
@@ -195,7 +195,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,* the *offset and *index values for the next loop. */ cnt =0 ;while (cnt < buflen) { -struct page *page = sg->page + +struct page *page =sg_page (sg) + ((sg->offset + *offset) >>PAGE_SHIFT );unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE -1 );
fs/ecryptfs/crypto.c +11 -5
@@ -283,7 +283,7 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, pg =virt_to_page (addr); offset =offset_in_page (addr);if (sg) { - sg[i].page = pg; +sg_set_page (&sg[i], pg); sg[i].offset = offset; } remainder_of_page =PAGE_CACHE_SIZE - offset;
@@ -713,10 +713,13 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return encrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
@@ -742,10 +745,13 @@ ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat, {struct scatterlist src_sg, dst_sg; - src_sg.page = src_page; +sg_init_table (&src_sg,1 ); +sg_init_table (&dst_sg,1 ); + +sg_set_page (&src_sg, src_page); src_sg.offset = src_offset; src_sg.length = size; - dst_sg.page = dst_page; +sg_set_page (&dst_sg, dst_page); dst_sg.offset = dst_offset; dst_sg.length = size;return decrypt_scatterlist (crypt_stat, &dst_sg, &src_sg, size, iv);
fs/ecryptfs/keystore.c +3 -0
@@ -1040,6 +1040,9 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, };int rc =0 ; +sg_init_table (&dst_sg,1 ); +sg_init_table (&src_sg,1 ); +if (unlikely (ecryptfs_verbosity >0 )) { ecryptfs_printk( KERN_DEBUG, "Session key encryption key (size [%d]):\n",
fs/nfsd/nfs4recover.c +3 -5
@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) {struct xdr_netobj cksum;struct hash_desc desc; -struct scatterlist sg[1 ]; +struct scatterlist sg;__be32 status = nfserr_resource; dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",
@@ -102,11 +102,9 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname)if (cksum.data ==NULL ) goto out; - sg[0 ].page =virt_to_page (clname->data); - sg[0 ].offset =offset_in_page (clname->data); - sg[0 ].length = clname->len; +sg_init_one (&sg, clname->data, clname->len); -if (crypto_hash_digest (&desc, sg, sg->length, cksum.data)) +if (crypto_hash_digest (&desc, &sg, sg.length, cksum.data)) goto out;md5_to_hex (dname, cksum.data);
include/asm-alpha/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-arm/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page;/* buffer page */ +unsigned long page_link;unsigned int offset;/* buffer offset */ dma_addr_t dma_address;/* dma address */ unsigned int length;/* length */
include/asm-avr32/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-blackfin/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/mm.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-cris/scatterlist.h +1 -1
@@ -6,7 +6,7 @@ struct scatterlist {unsigned int length;/* The following is i386 highmem junk - not used by us */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ };
include/asm-frv/scatterlist.h +1 -1
@@ -22,7 +22,7 @@* and that's it. There's no excuse for not highmem enabling YOUR driver. /jens */ struct scatterlist { -struct page *page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-h8300/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-ia64/scatterlist.h +1 -1
@@ -9,7 +9,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;/* buffer length */
include/asm-m32r/scatterlist.h +1 -1
@@ -6,7 +6,7 @@struct scatterlist {char * address;/* Location data is to be transferred to, NULL for * highmem page */ -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;
include/asm-m68k/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-m68knommu/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-mips/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-parisc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-powerpc/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/dma.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-s390/scatterlist.h +1 -1
@@ -2,7 +2,7 @@#define _ASMS390_SCATTERLIST_Hstruct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length; };
include/asm-sh/scatterlist.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sh64/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page * page;/* Location for highmem page, if any */ +unsigned long page_link;unsigned int offset;/* for highmem, page offset */ dma_addr_t dma_address;unsigned int length;
include/asm-sparc/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <linux/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-sparc64/scatterlist.h +4 -1
@@ -6,7 +6,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;
include/asm-v850/scatterlist.h +1 -1
@@ -17,7 +17,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned offset;dma_addr_t dma_address;unsigned length;
include/asm-x86/dma-mapping_32.h +2 -2
@@ -45,9 +45,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,WARN_ON (nents ==0 || sglist[0 ].length ==0 );for_each_sg (sglist, sg, nents, i) { -BUG_ON (!sg->page); +BUG_ON (!sg_page (sg)); - sg->dma_address =page_to_phys (sg->page) + sg->offset; + sg->dma_address =page_to_phys (sg_page (sg)) + sg->offset; }flush_write_buffers ();
include/asm-x86/scatterlist_32.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/asm-x86/scatterlist_64.h +4 -1
@@ -4,7 +4,10 @@#include <asm/types.h> struct scatterlist { -struct page *page; +#ifdef CONFIG_DEBUG_SG +unsigned long sg_magic; +#endif +unsigned long page_link;unsigned int offset;unsigned int length;dma_addr_t dma_address;
include/asm-xtensa/scatterlist.h +1 -1
@@ -14,7 +14,7 @@#include <asm/types.h> struct scatterlist { -struct page *page; +unsigned long page_link;unsigned int offset;dma_addr_t dma_address;unsigned int length;
include/linux/scatterlist.h +120 -15
176 lines not on this page · raw message
lib/Kconfig.debug +10 -0
@@ -389,6 +389,16 @@ config DEBUG_LIST If unsure, say N. +config DEBUG_SG + bool "Debug SG table operations" + depends on DEBUG_KERNEL + help + Enable this to turn on checks on scatter-gather tables. This can + help find problems with drivers that do not properly initialize + their sg tables. + + If unsure, say N. + config FRAME_POINTER bool "Compile the kernel with frame pointers" depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BFIN)
lib/swiotlb.c +1 -1
@@ -35,7 +35,7 @@#define OFFSET (val,align) ((unsigned long) \ ( (val) & ( (align) - 1))) -#define SG_ENT_VIRT_ADDRESS (sg) (page_address((sg)->page) + (sg)->offset) +#define SG_ENT_VIRT_ADDRESS (sg) (page_address(sg_page((sg)) + (sg)->offset))#define SG_ENT_PHYS_ADDRESS (sg) virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))/*
net/core/skbuff.c +2 -2
@@ -2045,7 +2045,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy >0 ) {if (copy > len) copy = len; - sg[elt].page =virt_to_page (skb->data + offset); +sg_set_page (&sg[elt],virt_to_page (skb->data + offset)); sg[elt].offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg[elt].length = copy; elt++;
@@ -2065,7 +2065,7 @@ skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)if (copy > len) copy = len; - sg[elt].page = frag->page; +sg_set_page (&sg[elt], frag->page); sg[elt].offset = frag->page_offset+offset-start; sg[elt].length = copy; elt++;
net/ieee80211/ieee80211_crypt_tkip.c +5 -8
@@ -390,9 +390,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (tkey->tx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -485,9 +483,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -12 ;crypto_blkcipher_setkey (tkey->rx_tfm_arc4, rc4key,16 ); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 )) {if (net_ratelimit ()) { printk(KERN_DEBUG ": TKIP: failed to decrypt "
@@ -539,11 +535,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,printk (KERN_WARNING "michael_mic: tfm_michael == NULL\n" );return -1 ; } - sg[0 ].page =virt_to_page (hdr); +sg_init_table (sg,2 ); +sg_set_page (&sg[0 ],virt_to_page (hdr)); sg[0 ].offset =offset_in_page (hdr); sg[0 ].length =16 ; - sg[1 ].page =virt_to_page (data); +sg_set_page (&sg[1 ],virt_to_page (data)); sg[1 ].offset =offset_in_page (data); sg[1 ].length = data_len;
net/ieee80211/ieee80211_crypt_wep.c +2 -6
@@ -170,9 +170,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) icv[3 ] = crc >>24 ;crypto_blkcipher_setkey (wep->tx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = len +4 ; +sg_init_one (&sg, pos, len +4 );return crypto_blkcipher_encrypt (&desc, &sg, &sg, len +4 ); }
@@ -212,9 +210,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) plen = skb->len - hdr_len -8 ;crypto_blkcipher_setkey (wep->rx_tfm, key, klen); - sg.page =virt_to_page (pos); - sg.offset =offset_in_page (pos); - sg.length = plen +4 ; +sg_init_one (&sg, pos, plen +4 );if (crypto_blkcipher_decrypt (&desc, &sg, &sg, plen +4 ))return -7 ;
net/mac80211/wep.c +2 -6
@@ -138,9 +138,7 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key, *icv =cpu_to_le32 (~crc32_le (~0 , data, data_len));crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_encrypt (&desc, &sg, &sg, sg.length); }
@@ -204,9 +202,7 @@ int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,__le32 crc;crypto_blkcipher_setkey (tfm, rc4key, klen); - sg.page =virt_to_page (data); - sg.offset =offset_in_page (data); - sg.length = data_len +WEP_ICV_LEN ; +sg_init_one (&sg, data, data_len +WEP_ICV_LEN );crypto_blkcipher_decrypt (&desc, &sg, &sg, sg.length); crc =cpu_to_le32 (~crc32_le (~0 , data, data_len));
net/sctp/auth.c +2 -1
@@ -726,7 +726,8 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,/* set up scatter list */ end =skb_tail_pointer (skb); - sg.page =virt_to_page (auth); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (auth)); sg.offset = (unsigned long )(auth) %PAGE_SIZE ; sg.length = end - (unsigned char *)auth;
net/sctp/sm_make_chunk.c +4 -2
@@ -1513,7 +1513,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,struct hash_desc desc;/* Sign the message. */ - sg.page =virt_to_page (&cookie->c); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (&cookie->c)); sg.offset = (unsigned long )(&cookie->c) %PAGE_SIZE ; sg.length = bodysize; keylen =SCTP_SECRET_SIZE ;
@@ -1585,7 +1586,8 @@ struct sctp_association *sctp_unpack_cookie(/* Check the signature. */ keylen =SCTP_SECRET_SIZE ; - sg.page =virt_to_page (bear_cookie); +sg_init_table (&sg,1 ); +sg_set_page (&sg,virt_to_page (bear_cookie)); sg.offset = (unsigned long )(bear_cookie) %PAGE_SIZE ; sg.length = bodysize; key = (char *)ep->secret_key[ep->current_key];
net/sunrpc/auth_gss/gss_krb5_crypto.c +5 -5
@@ -197,9 +197,9 @@ encryptor(struct scatterlist *sg, void *data)int i = (page_pos + outbuf->page_base) >>PAGE_CACHE_SHIFT ; in_page = desc->pages[i]; }else { - in_page = sg->page; + in_page =sg_page (sg); } - desc->infrags[desc->fragno].page = in_page; +sg_set_page (&desc->infrags[desc->fragno], in_page); desc->fragno++; desc->fraglen += sg->length; desc->pos += sg->length;
@@ -215,11 +215,11 @@ encryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->outfrags[0 ].page = sg->page; +sg_set_page (&desc->outfrags[0 ],sg_page (sg)); desc->outfrags[0 ].offset = sg->offset + sg->length - fraglen; desc->outfrags[0 ].length = fraglen; desc->infrags[0 ] = desc->outfrags[0 ]; - desc->infrags[0 ].page = in_page; +sg_set_page (&desc->infrags[0 ], in_page); desc->fragno =1 ; desc->fraglen = fraglen; }else {
@@ -287,7 +287,7 @@ decryptor(struct scatterlist *sg, void *data)if (ret)return ret;if (fraglen) { - desc->frags[0 ].page = sg->page; +sg_set_page (&desc->frags[0 ],sg_page (sg)); desc->frags[0 ].offset = sg->offset + sg->length - fraglen; desc->frags[0 ].length = fraglen; desc->fragno =1 ;
net/sunrpc/xdr.c +1 -1
@@ -1059,7 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, do { if (thislen > page_len) thislen = page_len; - sg->page = buf->pages[i]; + sg_set_page(sg, buf->pages[i]); sg->offset = page_offset; sg->length = thislen; ret = actor(sg, data);
net/xfrm/xfrm_algo.c +2 -2
@@ -552,7 +552,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page =virt_to_page (skb->data + offset); +sg_set_page (&sg,virt_to_page (skb->data + offset)); sg.offset = (unsigned long )(skb->data + offset) %PAGE_SIZE ; sg.length = copy;
@@ -577,7 +577,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,if (copy > len) copy = len; - sg.page = frag->page; +sg_set_page (&sg, frag->page); sg.offset = frag->page_offset + offset-start; sg.length = copy;
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 11 lines · Jens Axboe
Quoted 7 lines · Mark Lord
Quoted 3 lines · Jens
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I hope nothing is missing
linux/scatterlist.hincludes...Patch fails on
drivers/scsi/scsi_lib.c.I replaced that part of the patch with this updated portion instead:
Hmm, what are you applying against? Must be a clean tree, throw away any patches that you already applied in this thread.
Squeaky-clean linux-2.6.23 + patch-2.6.23-git13 + your patch. Fails on scsi_lib.c.
-ml
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens AxboeQuoted 6 lines · Mark Lord
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines · Jens
Quoted 3 lines
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I hope nothing is missing
linux/scatterlist.hincludes...
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Patch fails on
drivers/scsi/scsi_lib.c.I replaced that part of the patch with this updated portion instead:
Hmm, what are you applying against? Must be a clean tree, throw away any patches that you already applied in this thread.
Updated below.
I'll re-pull everything fresh again from kernel.org and rebuild with the "updated below" patch you posted. Thanks.
Re: [bug] ata subsystem related crash with latest -git
Quoted 11 lines · Mark Lord
Quoted 11 lines · Mark Lord
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines · Jens
Quoted 2 lines
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations.
I hope
Quoted 1 line
Quoted 1 line
nothing is missing
linux/scatterlist.hincludes...Patch fails on
drivers/scsi/scsi_lib.c.I replaced that part of the patch with this updated portion instead:
Quoted 8 lines
Quoted 4 lines
Hmm, what are you applying against? Must be a clean tree, throw away any patches that you already applied in this thread.
Updated below.
I'll re-pull everything fresh again from kernel.org and rebuild with the "updated below" patch you posted. Thanks.
Okay, fresh pull of everything from kernel.org, and now your latest patch does apply cleanly to -git13.
Something weird (at this end).
Thanks.
Re: [bug] ata subsystem related crash with latest -git
Quoted 15 lines · Mark Lord
Quoted 14 lines · Mark Lord
Quoted 14 lines · Mark Lord
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines · Jens
Quoted 2 lines
OK, I think that covers every arch out there. I haven't been able to compile any of them, but it's mostly search'n replace operations. I
hope
Quoted 1 line
Quoted 1 line
nothing is missing
linux/scatterlist.hincludes...Patch fails on
drivers/scsi/scsi_lib.c.I replaced that part of the patch with this updated portion instead:
Hmm, what are you applying against? Must be a clean tree, throw away any patches that you already applied in this thread.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Updated below.
I'll re-pull everything fresh again from kernel.org and rebuild with the "updated below" patch you posted. Thanks.
Okay, fresh pull of everything from kernel.org, and now your latest patch does apply cleanly to -git13.
Something weird (at this end).
Thanks for confirming, I did double check that my HEAD was uptodate - and it is.
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens Axboearch/x86/kernel/pci-gart_64.c static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg, · line 305
Quoted 2 lines · Jens Axboe
arch/x86/kernel/pci-gart_64.c +1
-1-unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;
Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
static inline unsigned long sg_phys(struct scatterlist *sg)
{
return page_to_phys(sg_page(sg)) + sg->offset;
}would be a good thing to have?
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address, so adding that helper function that abstracts the sg access would be helpful in hiding some of the cruft?
Linus
Re: [bug] ata subsystem related crash with latest -git
Quoted 9 lines · Linus Torvalds
arch/x86/kernel/pci-gart_64.c static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg, · line 305
Quoted 2 lines · Jens Axboe
arch/x86/kernel/pci-gart_64.c +1
-1-unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
Quoted 6 lines
static inline unsigned long sg_phys(struct scatterlist *sg) { return page_to_phys(sg_page(sg)) + sg->offset; }would be a good thing to have?
Sure thing, it's used quite a lot.
Quoted 5 lines
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address, so adding that helper function that abstracts the sg access would be helpful in hiding some of the cruft?
I'll add it to the mix.
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 10 lines · Jens Axboe
Quoted 9 lines · Linus Torvalds
arch/x86/kernel/pci-gart_64.c static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg, · line 305
Quoted 2 lines · Jens Axboe
arch/x86/kernel/pci-gart_64.c +1
-1-unsigned long addr =page_to_phys (s->page) + s->offset; +unsigned long addr =page_to_phys (sg_page (s)) + s->offset;Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
Quoted 8 lines
Quoted 6 lines
static inline unsigned long sg_phys(struct scatterlist *sg) { return page_to_phys(sg_page(sg)) + sg->offset; }would be a good thing to have?
Sure thing, it's used quite a lot.
Actually, only 11 occurrences in the patch. But still a nice little cleanup.
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
In reply to Linus TorvaldsQuoted 16 lines · On Thu, 18 Oct 2007 09:55:04 -0700 (PDT) Linus Torvalds…
Quoted 4 lines · Jens Axboe
(quoted diff) +0
-1- unsigned long addr = page_to_phys(s->page) +
s->offset;(quoted diff) +1
-0+ unsigned long addr = page_to_phys(sg_page(s)) +
s->offset;Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
static inline unsigned long sg_phys(struct scatterlist *sg) { return page_to_phys(sg_page(sg)) + sg->offset; }
Quoted 6 lines
would be a good thing to have?
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address
.... but will that work for systems with IOMMU ? or is it fundamentally the wrong interface
Re: [bug] ata subsystem related crash with latest -git
Quoted 21 lines · Arjan van de Ven
Quoted 18 lines · On Thu, 18 Oct 2007 09:55:04 -0700 (PDT) Linus Torvalds…
Quoted 4 lines · Jens Axboe
(quoted diff) +0
-1- unsigned long addr = page_to_phys(s->page) +
s->offset;(quoted diff) +1
-0+ unsigned long addr = page_to_phys(sg_page(s)) +
s->offset;Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
static inline unsigned long sg_phys(struct scatterlist *sg) { return page_to_phys(sg_page(sg)) + sg->offset; }would be a good thing to have?
Quoted 7 lines
Quoted 4 lines
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address
.... but will that work for systems with IOMMU ? or is it fundamentally the wrong interface
They use foo_to_bus() on the address. sg_phys() should of course only be used where the user previously did page_to_phys() on the sg page.
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 27 lines · On Thu, 18 Oct 2007 19:14:29 +0200 Jens Axboe <[email protected]> wrote:
Quoted 26 lines · Arjan van de Ven
Quoted 22 lines · On Thu, 18 Oct 2007 09:55:04 -0700 (PDT) Linus Torvalds…
Quoted 4 lines · Jens Axboe
(quoted diff) +0
-1- unsigned long addr = page_to_phys(s->page) +
s->offset;(quoted diff) +1
-0+ unsigned long addr = page_to_phys(sg_page(s)) +
s->offset;Umm. May I suggest (I haven't read the whole thread yet, maybe somebody else already did) that
static inline unsigned long sg_phys(struct scatterlist *sg) { return page_to_phys(sg_page(sg)) + sg->offset; }would be a good thing to have?
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address
Quoted 5 lines
Quoted 2 lines
.... but will that work for systems with IOMMU ? or is it fundamentally the wrong interface
They use
foo_to_bus()on the address.sg_phys()should of course only be used where the user previously didpage_to_phys()on the sg page.
I can take care of IOMMU stuff when I'll send IOMMU merging fix patchset:
Re: [bug] ata subsystem related crash with latest -git
In reply to Linus TorvaldsQuoted 1 line · Linus Torvalds
Very few drivers should care so much about the *page* itself (or the offset). That's something that the generic allocation code etc cares about, but the driver is almost bound to care mostly about the actual DMA address, so adding that helper function that abstracts the sg access would be helpful in hiding some of the cruft?
FWIW libata cares about both. When doing DMA, it cares about the DMA address. When doing PIO, it cares about the actual page, because it does a kmap before sending the data through a 16-bit/32-bit data FIFO.
Jeff
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens Axboeblock/ll_rw_blk.c void blk_queue_max_phys_segments(struct request_queue *q, · line 634
Quoted 8 lines · Jens Axboe
block/ll_rw_blk.c +1
-1@@ -631,7 +631,7 @@ void blk_queue_max_phys_segments(struct request_queue *q,printk ("%s: set to minimum %d\n" , __FUNCTION__, max_segments); } - q->max_phys_segments = max_segments; + q->max_phys_segments = max_segments -1 ;
this one crashes too, if added ontop of all the other fixes so far.
Ingo
[ 34.711185] EXT3-fs: mounted filesystem with ordered data mode. [ 34.716991] VFS: Mounted root (ext3 filesystem) readonly. [ 34.722712] Freeing unused kernel memory: 372k freed [ 36.112742] BUG: unable to handle kernel paging request at virtual address 7c8b1000 [ 36.120246] printing eip: 784e9490 *pde = 00dda027 *pte = 048b1000 [ 36.126486] Oops: 0000 [#1] DEBUG_PAGEALLOC [ 36.130645] [ 36.132119] Pid: 0, comm: swapper Not tainted (2.6.23 #15) [ 36.137579] EIP: 0060:[<784e9490>] EFLAGS: 00010006 CPU: 0 [ 36.143043] EIP is at ata_qc_issue+0xd0/0x340 [ 36.147371] EAX: 3f896000 EBX: 7c8b1000 ECX: 00000008 EDX: 00000008 [ 36.153610] ESI: 7c86de80 EDI: 7c8b0f80 EBP: 7b54007c ESP: 78a13e28 [ 36.159851] DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068 [ 36.165223] Process swapper (pid: 0, ti=78a12000 task=789753e0 task.ti=78a12000) [ 36.172416] Stack: 7c8b1000 7b540000 7b540000 00000000 7c8b0ff0 7b54007c 7c86de80 7b5417a4 [ 36.180735] 784c24a0 784ef62e 784f2183 7b52de98 7c86de80 7b540000 7b5417a4 7c86de80 [ 36.189055] 7b540000 7b524004 784f2270 784ef310 784c24a0 7c86de80 00000206 7b524004 [ 36.197374] Call Trace: [ 36.199975] [<784c24a0>] scsi_done+0x0/0x20 [ 36.204221] [<784ef62e>] ata_scsi_translate+0xbe/0x140 [ 36.209420] [<784f2183>] ata_scsi_queuecmd+0x33/0x200 [ 36.214533] [<784f2270>] ata_scsi_queuecmd+0x120/0x200 [ 36.219733] [<784ef310>] ata_scsi_rw_xlat+0x0/0x220 [ 36.224672] [<784c24a0>] scsi_done+0x0/0x20 [ 36.228918] [<784c2d22>] scsi_dispatch_cmd+0x152/0x290 [ 36.234118] [<78135c67>] trace_hardirqs_on+0x67/0xb0 [ 36.239145] [<784c8c4e>] scsi_request_fn+0x1be/0x370 [ 36.244171] [<78408096>] blk_run_queue+0x36/0x80 [ 36.248850] [<784c7530>] scsi_next_command+0x30/0x50 [ 36.253877] [<784c76bb>] scsi_end_request+0xab/0xe0 [ 36.258817] [<784c83c9>] scsi_io_completion+0xa9/0x3d0 [ 36.264016] [<78135c67>] trace_hardirqs_on+0x67/0xb0 [ 36.269043] [<78405125>] blk_done_softirq+0x45/0x80 [ 36.273983] [<78405153>] blk_done_softirq+0x73/0x80 [ 36.278922] [<7811d4c3>] __do_softirq+0x53/0xb0 [ 36.283515] [<7811d588>] do_softirq+0x68/0x70 [ 36.287935] [<78105351>] do_IRQ+0x51/0x90 [ 36.292008] [<78135c9c>] trace_hardirqs_on+0x9c/0xb0 [ 36.297034] [<7810388e>] common_interrupt+0x2e/0x40 [ 36.301974] [<78100c55>] cpu_idle+0x35/0x60 [ 36.306220] [<78a14b35>] start_kernel+0x265/0x300 [ 36.310987] [<78a14380>] unknown_bootoption+0x0/0x1e0 [ 36.316100] ======================= [ 36.319653] Code: 84 d9 01 00 00 7e 32 31 d2 89 f6 8b 1c 24 83 c2 01 8b 03 2b 05 f8 ec d7 78 c1 f8 05 c1 e0 0c 03 43 04 89 43 08 83 c3 10 89 1c 24 <8b> 03 a8 01 0f 85 58 02 00 00 39 ca 75 d2 f0 83 44 24 00 00 85 [ 36.338458] EIP: [<784e9490>] ata_qc_issue+0xd0/0x340 SS:ESP 0068:78a13e28 [ 36.345305] Kernel panic - not syncing: Fatal exception in interrupt
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens AxboeQuoted 8 lines · Jens Axboe
Quoted 7 lines · Linus Torvalds
Quoted 3 lines · Ingo Molnar
nope, this did not help. First bootup went fine, second bootup crashed again (see below), without hitting the
BUG_ON().
Quoted 8 lines
Quoted 8 lines
I think you'll always hit it if you have a scatter-gather list that is exactly filled up.
Why? Because those things do "
sg_next()" on the last entry, and as mentioned, that ends up actually accessing one past the end - even if the end result is not actually ever *used* (because we just effectively incremented it to past the last entry when the code was done with the SG list).
Well, hang on - where does it end up doing sg_next() on the LAST sg entry? I'd argue that this is a bug, like it was in ll_rw_blk.c. I still agree that I should make the interface more robust, I just don't see where libata ends up doing the sg_next() on the last entry.
I'm assuming that Ingo is using the previous patches, so that blk_rq_map_sg() is using this construct:
new_segment:
if (!sg)
sg = sglist;
else
sg = sg_next(sg);and the memset() in scsi_alloc_sgtable(), which I'm pretty sure he is. I'm assuming we're not hitting pio paths, so there are no manual sg_next() calls. Ingo, if you care, can you test this one as well?
No rush, as mentioned I'll be back tomorrow morning...
drivers/ata/libata-core.c +1 -1
@@ -4664,7 +4664,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) {struct ata_port *ap = qc->ap;struct scatterlist *sg = qc->__sg; -struct scatterlist *lsg =sg_last (qc->__sg, qc->n_elem); +struct scatterlist *lsg = &qc->__sg[qc->n_elem -1 ];int n_elem, pre_n_elem, dir, trim_sg =0 ;VPRINTK ("ENTER, ata%u\n" , ap->print_id);
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 1 line · Jens Axboe
Ingo, if you care, can you test this one as well?
hm, it still crashes - find the log below.
Ingo
[ 34.653682] EXT3-fs: mounted filesystem with ordered data mode. [ 34.659487] VFS: Mounted root (ext3 filesystem) readonly. [ 34.665208] Freeing unused kernel memory: 372k freed [ 35.809988] BUG: unable to handle kernel paging request at virtual address 7c8d3000 [ 35.817483] printing eip: 784e9480 *pde = 00dda027 *pte = 048d3000 [ 35.823723] Oops: 0000 [#1] DEBUG_PAGEALLOC [ 35.827883] [ 35.829357] Pid: 47, comm: rc.sysinit Not tainted (2.6.23 #14) [ 35.835162] EIP: 0060:[<784e9480>] EFLAGS: 00010006 CPU: 0 [ 35.840626] EIP is at ata_qc_issue+0xd0/0x340 [ 35.844954] EAX: 3fd79000 EBX: 7c8d3000 ECX: 00000020 EDX: 00000020 [ 35.851194] ESI: 7c8a1a80 EDI: 7c8d2e00 EBP: 7b54007c ESP: 7c8b3d5c [ 35.857434] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068 [ 35.862807] Process rc.sysinit (pid: 47, ti=7c8b2000 task=7c86d000 task.ti=7c8b2000) [ 35.870346] Stack: 7c8d3000 7b540000 7b540000 00000000 7c8d2ff0 7b54007c 7c8a1a80 7b5417a4 [ 35.878665] 784c2490 784ef61e 784f2173 7b52de98 7c8a1a80 7b540000 7b5417a4 7c8a1a80 [ 35.886985] 7b540000 7b524004 784f2260 784ef300 784c2490 7c8a1a80 00000216 7b524004 [ 35.895304] Call Trace: [ 35.897905] [<784c2490>] scsi_done+0x0/0x20 [ 35.902151] [<784ef61e>] ata_scsi_translate+0xbe/0x140 [ 35.907350] [<784f2173>] ata_scsi_queuecmd+0x33/0x200 [ 35.912463] [<784f2260>] ata_scsi_queuecmd+0x120/0x200 [ 35.917663] [<784ef300>] ata_scsi_rw_xlat+0x0/0x220 [ 35.922602] [<784c2490>] scsi_done+0x0/0x20 [ 35.926849] [<784c2d12>] scsi_dispatch_cmd+0x152/0x290 [ 35.932049] [<78135c9c>] trace_hardirqs_on+0x9c/0xb0 [ 35.937075] [<784c8c3e>] scsi_request_fn+0x1be/0x370 [ 35.942102] [<78120f02>] del_timer+0x62/0x70 [ 35.946434] [<784072d5>] __generic_unplug_device+0x25/0x30 [ 35.951981] [<784075a5>] generic_unplug_device+0x15/0x30 [ 35.957354] [<78404e00>] blk_backing_dev_unplug+0x0/0x10 [ 35.962726] [<78404e0c>] blk_backing_dev_unplug+0xc/0x10 [ 35.968100] [<78180a9d>] block_sync_page+0x2d/0x40 [ 35.972952] [<78144dc9>] sync_page+0x29/0x40 [ 35.977286] [<7876f5dc>] __wait_on_bit_lock+0x3c/0x70 [ 35.982399] [<78144da0>] sync_page+0x0/0x40 [ 35.986645] [<78144d82>] __lock_page+0x52/0x60 [ 35.991152] [<7812adb0>] wake_bit_function+0x0/0x60 [ 35.996092] [<78144f60>] find_lock_page+0x60/0xa0 [ 36.000858] [<781473b9>] filemap_fault+0x269/0x3b0 [ 36.005711] [<78150b7f>] __do_fault+0x4f/0x3e0 [ 36.010217] [<78147150>] filemap_fault+0x0/0x3b0 [ 36.014897] [<78152640>] handle_mm_fault+0xf0/0x6c0 [ 36.019837] [<7810fd5c>] do_page_fault+0x21c/0x670 [ 36.024689] [<7812e6fd>] down_read_trylock+0x4d/0x60 [ 36.029716] [<7810fdbb>] do_page_fault+0x27b/0x670 [ 36.034568] [<7810fb40>] do_page_fault+0x0/0x670 [ 36.039248] [<787710ea>] error_code+0x6a/0x70 [ 36.043669] ======================= [ 36.047221] Code: 84 d9 01 00 00 7e 32 31 d2 89 f6 8b 1c 24 83 c2 01 8b 03 2b 05 f8 ec d7 78 c1 f8 05 c1 e0 0c 03 43 04 89 43 08 83 c3 10 89 1c 24 <8b> 03 a8 01 0f 85 58 02 00 00 39 ca 75 d2 f0 83 44 24 00 00 85 [ 36.066027] EIP: [<784e9480>] ata_qc_issue+0xd0/0x340 SS:ESP 0068:7c8b3d5c [ 100.077701] BUG: spinlock lockup on CPU#0, scsi_eh_0/32, 7b52de98 [ 100.083667] [<78414b9b>] _raw_spin_lock+0x13b/0x140 [ 100.088605] [<784c6610>] scsi_error_handler+0x0/0x4f0
Re: [bug] ata subsystem related crash with latest -git
In reply to Jens AxboeQuoted 3 lines · Jens Axboe
Well, hang on - where does it end up doing
sg_next()on the LAST sg entry?
They pretty much *all* do, as far as I can tell.
For example, to look at the very first one:
#define for_each_sg(sglist, sg, nr, __i) \ for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg))
let's say that "nr" is 1 (and that's also the allocation size), and look at what that causes.
Right. It causes us to do "sg = sg_next(sg)" once. Which will do what? It will increment sg (so that it now points past the single-entry array!) and then it will dereference that invalid entry to see if it's a chain entry!
And no, "1" is not the special case. The special case is *any* time when you iterate over as many sg entries as you allocated. You *always* have to leave the last one unused in order to avoid this "access past the end" problem.
The alternative is to rewrite the loop, but it's going to be ugly as hell, and you need to do that for *every*single*user* of sg_next(). You can re-write the above loop as something like
define for_each_sg(sglist, sg, nr, __i) for (__i = 0, sg = NULL ; __i < (nr) && sg = (sg ? sglist : sg_next(sg) ; __i++))
but the important part here is that you must do that "sg_next()" *after* you have broken out of the loop, and you must basically do it one less time than you go through the loop.
IOW, any loop that leaves "sg" pointing to past the array is inevitably buggy, because it will have accessed that last past-tne-end entry as part of tryign to decide whether it should perhaps follow a link.
Quoted 3 lines
I'd argue that this is a bug, like it was in
ll_rw_blk.c. I still agree that I should make the interface more robust, I just don't see where libata ends up doing thesg_next()on the last entry.
See above. I think the exact sequence may be:
ata_qc_issue()
(implicitly inlined) ata_sg_setup()
(explicitly inlined) dma_map_sg()
(macro) for_each_sg()
but I didn't see if there are other possible chains that get you to one of those invalid sg loops.
And no, it's *not* just for_each_sg(). Pretty much any "natural" loop over the SG list will cause it, because that's how you write loops in C: you almost always end up pointing to one past the last entry after the loop.
Linus
Ingo Molnar
Tested-byRe: [bug] ata subsystem related crash with latest -git
In reply to Jens Axboedrivers/scsi/scsi_lib.c line 42
Quoted 8 lines · Jens Axboe
drivers/scsi/scsi_lib.c +1
-1@@ -39,7 +39,7 @@* (unless chaining is used). Should ideally fit inside a single page, to * avoid a higher order allocation. */ -#define SCSI_MAX_SG_SEGMENTS 128 +#define SCSI_MAX_SG_SEGMENTS 129
this one finally made the trick and it's booting fine now, without any crashes!
Ingo
Re: [bug] ata subsystem related crash with latest -git
Quoted 14 lines · Ingo Molnar
drivers/scsi/scsi_lib.c line 42
Quoted 8 lines · Jens Axboe
drivers/scsi/scsi_lib.c +1
-1@@ -39,7 +39,7 @@* (unless chaining is used). Should ideally fit inside a single page, to * avoid a higher order allocation. */ -#define SCSI_MAX_SG_SEGMENTS 128 +#define SCSI_MAX_SG_SEGMENTS 129this one finally made the trick and it's booting fine now, without any crashes!
Super, that validates the theory the theory that Linus put forth. So the bug is clear now, this morning I'll work on proper sg looping.
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
In reply to Ingo MolnarQuoted 12 lines · Ingo Molnar
drivers/scsi/scsi_lib.c line 42
Quoted 8 lines · Jens Axboe
drivers/scsi/scsi_lib.c +1
-1@@ -39,7 +39,7 @@* (unless chaining is used). Should ideally fit inside a single page, to * avoid a higher order allocation. */ -#define SCSI_MAX_SG_SEGMENTS 128 +#define SCSI_MAX_SG_SEGMENTS 129this one finally made the trick and it's booting fine now, without any crashes!
Alas, this didn't help me here. I did manage to capture the error messages this time, and in the two machines I'm actively testing on, sata_mv is the driver that's dying in both cases. Machine A additionally has sata_nv, which is working. Machine B additionally has ata_piix, which is working. So in both cases, its sata_mv that is throwing SError complaints:
Quoted 8 lines
ata7.00: exception Emask
0x0SAct0x0SErr0x400000action0x6frozen ata7.00:edma_err0x04000080, EDMA self-disable
ata7: SError: { Handshk }
ata7.00: cmd ca/00:08:c7:40:00/00:00:00:00:00/e0 tag 0 cdb0x0data 4096 outres 50/00:00:ce:40:00/00:00:00:00:00/e0 Emask 0x100 (unknown error)ata7.00: status: { DRDY }
ata7: hard resetting link
ata7: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
Still digging... this behavior showed up after libata changes went in, FWIW.
Jeff
Re: [bug] ata subsystem related crash with latest -git
Quoted 14 lines · Jeff Garzik
Quoted 12 lines · Ingo Molnar
drivers/scsi/scsi_lib.c
Quoted 9 lines · Jens Axboe
drivers/scsi/scsi_lib.c +0
-0@@ -39,7 +39,7 @@* (unless chaining is used). Should ideally fit inside a single page, to
* avoid a higher order allocation.
*/drivers/scsi/scsi_lib.c +1
-1-#define SCSI_MAX_SG_SEGMENTS 128 +#define SCSI_MAX_SG_SEGMENTS 129this one finally made the trick and it's booting fine now, without any crashes!
Quoted 5 lines
Alas, this didn't help me here. I did manage to capture the error messages this time, and in the two machines I'm actively testing on,
sata_mvis the driver that's dying in both cases. Machine A additionally hassata_nv, which is working. Machine B additionally hasata_piix, which is working. So in both cases, itssata_mvthat is throwing SError complaints:
Theory - ata_sg_is_last() isn't returning true for the last entry. Can you double check that it correcly marks the last entry in mv_fill_sg()? Alternatively, just try this patch.
drivers/ata/sata_mv.c +5 -2
@@ -1139,6 +1139,7 @@ static void mv_fill_sg(struct ata_queued_cmd *qc)struct mv_port_priv *pp = qc->ap->private_data;struct scatterlist *sg;struct mv_sg *mv_sg; +int end_marked =0 ; mv_sg = pp->sg_tbl;ata_for_each_sg (sg, qc) {
@@ -1159,13 +1160,15 @@ static void mv_fill_sg(struct ata_queued_cmd *qc) sg_len -= len; addr += len; -if (!sg_len &&ata_sg_is_last (sg, qc)) +if (!sg_len &&ata_sg_is_last (sg, qc)) { mv_sg->flags_size |=cpu_to_le32 (EPRD_FLAG_END_OF_TBL ); + end_marked++; + } mv_sg++; } - } +BUG_ON (end_marked !=1 ); }static inline void mv_crqb_pack_cmd (__le16 *cmdw,u8 data,u8 addr,unsigned last)
Signature · 1 line
Jens Axboe
Re: [bug] ata subsystem related crash with latest -git
Quoted 13 lines · Jens Axboe
Quoted 12 lines · Jeff Garzik
Quoted 11 lines · Ingo Molnar
drivers/scsi/scsi_lib.c
Quoted 9 lines · Jens Axboe
drivers/scsi/scsi_lib.c +0
-0@@ -39,7 +39,7 @@* (unless chaining is used). Should ideally fit inside a single page, to
* avoid a higher order allocation.
*/drivers/scsi/scsi_lib.c +1
-1-#define SCSI_MAX_SG_SEGMENTS 128 +#define SCSI_MAX_SG_SEGMENTS 129this one finally made the trick and it's booting fine now, without any crashes!
Quoted 5 lines
Quoted 1 line
Alas, this didn't help me here. I did manage to capture the error messages this time, and in the two machines I'm actively testing on,
sata_mvis the driver that's dying in both cases. Machine A additionally hassata_nv, which is working. Machine B additionally hasata_piix, which is working. So in both cases, itssata_mvthat is throwing SError complaints:Theory -
ata_sg_is_last()isn't returning true for the last entry. Can you double check that it correcly marks the last entry inmv_fill_sg()? Alternatively, just try this patch.
Will check in a few minutes, after my current test: I noticed that sg_tablesize in sata_mv is not LIBATA_MAX_PRD. This is expected behavior, but I wonder if that difference -- most notably being smaller than SCSI_MAX_SG_SEGMENTS -- would trigger any latent bugs.
Anyway, we will both have answers momentarily...
Jeff
Re: [bug] ata subsystem related crash with latest -git
Quoted 1 line · Jeff Garzik
I noticed that
sg_tablesizeinsata_mvis notLIBATA_MAX_PRD. This is expected behavior, but I wonder if that difference -- most notably being smaller thanSCSI_MAX_SG_SEGMENTS-- would trigger any latent bugs.
Another sata_mv difference from the rest: the chip does not support ATAPI, so we never care about qc->pad
Jeff