| Message ID | 1461778138-23116-3-git-send-email-javier@javigon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/27/2016 07:28 PM, Javier González wrote: > Until now, the dma pool have been exclusively used to allocate the ppa > list being sent to the device. In pblk (upcoming), we use these pools to > allocate metadata too. Thus, we generalize the names of some variables > on the dma helper functions to make the code more readable. > > Signed-off-by: Javier González <javier@cnexlabs.com> > --- > drivers/lightnvm/core.c | 14 +++++++------- > drivers/nvme/host/lightnvm.c | 4 ++-- > include/linux/lightnvm.h | 2 +- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c > index 9b6c1c9..cb21331 100644 > --- a/drivers/lightnvm/core.c > +++ b/drivers/lightnvm/core.c > @@ -87,15 +87,15 @@ EXPORT_SYMBOL(nvm_unregister_tgt_type); > void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags, > dma_addr_t *dma_handler) > { > - return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags, > + return dev->ops->dev_dma_alloc(dev, dev->dma_page_pool, mem_flags, > dma_handler); > } > EXPORT_SYMBOL(nvm_dev_dma_alloc); > > -void nvm_dev_dma_free(struct nvm_dev *dev, void *ppa_list, > +void nvm_dev_dma_free(struct nvm_dev *dev, void *addr, > dma_addr_t dma_handler) > { > - dev->ops->dev_dma_free(dev->ppalist_pool, ppa_list, dma_handler); > + dev->ops->dev_dma_free(dev->dma_page_pool, addr, dma_handler); > } > EXPORT_SYMBOL(nvm_dev_dma_free); > > @@ -653,8 +653,8 @@ err: > > static void nvm_exit(struct nvm_dev *dev) > { > - if (dev->ppalist_pool) > - dev->ops->destroy_dma_pool(dev->ppalist_pool); > + if (dev->dma_page_pool) > + dev->ops->destroy_dma_pool(dev->dma_page_pool); > nvm_free(dev); > > pr_info("nvm: successfully unloaded\n"); > @@ -688,8 +688,8 @@ int nvm_register(struct request_queue *q, char *disk_name, > } > > if (dev->ops->max_phys_sect > 1) { > - dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist"); > - if (!dev->ppalist_pool) { > + dev->dma_page_pool = dev->ops->create_dma_pool(dev, "ppalist"); rename to dmapool or something similar? > + if (!dev->dma_page_pool) { > pr_err("nvm: could not create ppa pool\n"); Make sure to fix up the text here as well. Else it looks good. > ret = -ENOMEM; > goto err_init; > diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c > index 76f1199..33f2315 100644 > --- a/drivers/nvme/host/lightnvm.c > +++ b/drivers/nvme/host/lightnvm.c > @@ -565,10 +565,10 @@ static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool, > return dma_pool_alloc(pool, mem_flags, dma_handler); > } > > -static void nvme_nvm_dev_dma_free(void *pool, void *ppa_list, > +static void nvme_nvm_dev_dma_free(void *pool, void *addr, > dma_addr_t dma_handler) > { > - dma_pool_free(pool, ppa_list, dma_handler); > + dma_pool_free(pool, addr, dma_handler); > } > > static struct nvm_dev_ops nvme_nvm_dev_ops = { > diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h > index 9d8a350..7c615b0 100644 > --- a/include/linux/lightnvm.h > +++ b/include/linux/lightnvm.h > @@ -368,7 +368,7 @@ struct nvm_dev { > unsigned max_pages_per_blk; > > unsigned long *lun_map; > - void *ppalist_pool; > + void *dma_page_pool; > > struct nvm_id identity; > > -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>> if (dev->ops->max_phys_sect > 1) { >> - dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist"); >> - if (!dev->ppalist_pool) { >> + dev->dma_page_pool = dev->ops->create_dma_pool(dev, "ppalist"); > > rename to dmapool or something similar? > >> + if (!dev->dma_page_pool) { >> pr_err("nvm: could not create ppa pool\n"); > > Make sure to fix up the text here as well. Else it looks good. > >> ret = -ENOMEM; > Thanks. I'll fix it and resubmit tomorrow. Javier. -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 9b6c1c9..cb21331 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -87,15 +87,15 @@ EXPORT_SYMBOL(nvm_unregister_tgt_type); void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags, dma_addr_t *dma_handler) { - return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags, + return dev->ops->dev_dma_alloc(dev, dev->dma_page_pool, mem_flags, dma_handler); } EXPORT_SYMBOL(nvm_dev_dma_alloc); -void nvm_dev_dma_free(struct nvm_dev *dev, void *ppa_list, +void nvm_dev_dma_free(struct nvm_dev *dev, void *addr, dma_addr_t dma_handler) { - dev->ops->dev_dma_free(dev->ppalist_pool, ppa_list, dma_handler); + dev->ops->dev_dma_free(dev->dma_page_pool, addr, dma_handler); } EXPORT_SYMBOL(nvm_dev_dma_free); @@ -653,8 +653,8 @@ err: static void nvm_exit(struct nvm_dev *dev) { - if (dev->ppalist_pool) - dev->ops->destroy_dma_pool(dev->ppalist_pool); + if (dev->dma_page_pool) + dev->ops->destroy_dma_pool(dev->dma_page_pool); nvm_free(dev); pr_info("nvm: successfully unloaded\n"); @@ -688,8 +688,8 @@ int nvm_register(struct request_queue *q, char *disk_name, } if (dev->ops->max_phys_sect > 1) { - dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist"); - if (!dev->ppalist_pool) { + dev->dma_page_pool = dev->ops->create_dma_pool(dev, "ppalist"); + if (!dev->dma_page_pool) { pr_err("nvm: could not create ppa pool\n"); ret = -ENOMEM; goto err_init; diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 76f1199..33f2315 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -565,10 +565,10 @@ static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool, return dma_pool_alloc(pool, mem_flags, dma_handler); } -static void nvme_nvm_dev_dma_free(void *pool, void *ppa_list, +static void nvme_nvm_dev_dma_free(void *pool, void *addr, dma_addr_t dma_handler) { - dma_pool_free(pool, ppa_list, dma_handler); + dma_pool_free(pool, addr, dma_handler); } static struct nvm_dev_ops nvme_nvm_dev_ops = { diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 9d8a350..7c615b0 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -368,7 +368,7 @@ struct nvm_dev { unsigned max_pages_per_blk; unsigned long *lun_map; - void *ppalist_pool; + void *dma_page_pool; struct nvm_id identity;
Until now, the dma pool have been exclusively used to allocate the ppa list being sent to the device. In pblk (upcoming), we use these pools to allocate metadata too. Thus, we generalize the names of some variables on the dma helper functions to make the code more readable. Signed-off-by: Javier González <javier@cnexlabs.com> --- drivers/lightnvm/core.c | 14 +++++++------- drivers/nvme/host/lightnvm.c | 4 ++-- include/linux/lightnvm.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)