lkml.org 
[lkml]   [2015]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v3 05/11] scatterlist: use sg_phys()


    On Tue, 12 May 2015, Dan Williams wrote:

    > Coccinelle cleanup to replace open coded sg to physical address
    > translations. This is in preparation for introducing scatterlists that
    > reference pfn(s) without a backing struct page.
    >
    > // sg_phys.cocci: convert usage page_to_phys(sg_page(sg)) to sg_phys(sg)
    > // usage: make coccicheck COCCI=sg_phys.cocci MODE=patch
    >
    > virtual patch
    > virtual report
    > virtual org

    Just for information, you don't need the three lines above. There are ony
    useful when you want the semantic patch to support several kinds of
    output.

    julia

    > @@
    > struct scatterlist *sg;
    > @@
    >
    > - page_to_phys(sg_page(sg)) + sg->offset
    > + sg_phys(sg)
    >
    > @@
    > struct scatterlist *sg;
    > @@
    >
    > - page_to_phys(sg_page(sg))
    > + sg_phys(sg) - sg->offset
    >
    > Cc: Julia Lawall <Julia.Lawall@lip6.fr>
    > Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    > ---
    > arch/arm/mm/dma-mapping.c | 2 +-
    > arch/microblaze/kernel/dma.c | 2 +-
    > drivers/iommu/intel-iommu.c | 4 ++--
    > drivers/iommu/iommu.c | 2 +-
    > drivers/staging/android/ion/ion_chunk_heap.c | 4 ++--
    > 5 files changed, 7 insertions(+), 7 deletions(-)
    >
    > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
    > index 09c5fe3d30c2..43cc6a8fdacc 100644
    > --- a/arch/arm/mm/dma-mapping.c
    > +++ b/arch/arm/mm/dma-mapping.c
    > @@ -1502,7 +1502,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,
    > return -ENOMEM;
    >
    > for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) {
    > - phys_addr_t phys = page_to_phys(sg_page(s));
    > + phys_addr_t phys = sg_phys(s) - s->offset;
    > unsigned int len = PAGE_ALIGN(s->offset + s->length);
    >
    > if (!is_coherent &&
    > diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
    > index ed7ba8a11822..dcb3c594d626 100644
    > --- a/arch/microblaze/kernel/dma.c
    > +++ b/arch/microblaze/kernel/dma.c
    > @@ -61,7 +61,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
    > /* FIXME this part of code is untested */
    > for_each_sg(sgl, sg, nents, i) {
    > sg->dma_address = sg_phys(sg);
    > - __dma_sync(page_to_phys(sg_page(sg)) + sg->offset,
    > + __dma_sync(sg_phys(sg),
    > sg->length, direction);
    > }
    >
    > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
    > index 68d43beccb7e..9b9ada71e0d3 100644
    > --- a/drivers/iommu/intel-iommu.c
    > +++ b/drivers/iommu/intel-iommu.c
    > @@ -1998,7 +1998,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
    > sg_res = aligned_nrpages(sg->offset, sg->length);
    > sg->dma_address = ((dma_addr_t)iov_pfn << VTD_PAGE_SHIFT) + sg->offset;
    > sg->dma_length = sg->length;
    > - pteval = page_to_phys(sg_page(sg)) | prot;
    > + pteval = (sg_phys(sg) - sg->offset) | prot;
    > phys_pfn = pteval >> VTD_PAGE_SHIFT;
    > }
    >
    > @@ -3302,7 +3302,7 @@ static int intel_nontranslate_map_sg(struct device *hddev,
    >
    > for_each_sg(sglist, sg, nelems, i) {
    > BUG_ON(!sg_page(sg));
    > - sg->dma_address = page_to_phys(sg_page(sg)) + sg->offset;
    > + sg->dma_address = sg_phys(sg);
    > sg->dma_length = sg->length;
    > }
    > return nelems;
    > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
    > index d4f527e56679..59808fc9110d 100644
    > --- a/drivers/iommu/iommu.c
    > +++ b/drivers/iommu/iommu.c
    > @@ -1147,7 +1147,7 @@ size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
    > min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);
    >
    > for_each_sg(sg, s, nents, i) {
    > - phys_addr_t phys = page_to_phys(sg_page(s)) + s->offset;
    > + phys_addr_t phys = sg_phys(s);
    >
    > /*
    > * We are mapping on IOMMU page boundaries, so offset within
    > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
    > index 3e6ec2ee6802..b7da5d142aa9 100644
    > --- a/drivers/staging/android/ion/ion_chunk_heap.c
    > +++ b/drivers/staging/android/ion/ion_chunk_heap.c
    > @@ -81,7 +81,7 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap,
    > err:
    > sg = table->sgl;
    > for (i -= 1; i >= 0; i--) {
    > - gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
    > + gen_pool_free(chunk_heap->pool, sg_phys(sg) - sg->offset,
    > sg->length);
    > sg = sg_next(sg);
    > }
    > @@ -109,7 +109,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
    > DMA_BIDIRECTIONAL);
    >
    > for_each_sg(table->sgl, sg, table->nents, i) {
    > - gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
    > + gen_pool_free(chunk_heap->pool, sg_phys(sg) - sg->offset,
    > sg->length);
    > }
    > chunk_heap->allocated -= allocated_size;
    >
    >


    \
     
     \ /
      Last update: 2015-05-12 07:41    [W:4.036 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site