| Message ID | 20200212170733.8092-2-vgoyal@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dax: Replace bdev_dax_pgoff() with dax_pgoff() | expand |
On Wed, Feb 12, 2020 at 12:07:28PM -0500, Vivek Goyal wrote: > Create a new helper dax_pgoff() which will replace bdev_dax_pgoff(). Difference > between two is that dax_pgoff() takes in "sector_t dax_offset" as an argument > instead of "struct block_device". > > dax_offset specifies any offset into dax device which should be added to > sector while calculating pgoff. > > Signed-off-by: Vivek Goyal <vgoyal@redhat.com> > --- > drivers/dax/super.c | 12 ++++++++++++ > include/linux/dax.h | 1 + > 2 files changed, 13 insertions(+) > > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index 0aa4b6bc5101..e9daa30e4250 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -56,6 +56,18 @@ int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, > } > EXPORT_SYMBOL(bdev_dax_pgoff); > > +int dax_pgoff(sector_t dax_offset, sector_t sector, size_t size, pgoff_t *pgoff) Please add a kerneldoc document. I can't really make sense of what dax_offset and sector mean here and why they are passed separately. > +{ > + phys_addr_t phys_off = (dax_offset + sector) * 512; << SECTOR_SHIFT; > + > + if (pgoff) > + *pgoff = PHYS_PFN(phys_off); What is the use case of not passing a pgoff argument? > + if (phys_off % PAGE_SIZE || size % PAGE_SIZE) > + return -EINVAL; > + return 0; > +} > +EXPORT_SYMBOL(dax_pgoff); EXPORT_SYMBOL_GPL, please.
On Wed, Feb 12, 2020 at 12:07:28PM -0500, Vivek Goyal wrote: > +int dax_pgoff(sector_t dax_offset, sector_t sector, size_t size, pgoff_t *pgoff) > +{ > + phys_addr_t phys_off = (dax_offset + sector) * 512; > + > + if (pgoff) > + *pgoff = PHYS_PFN(phys_off); > + if (phys_off % PAGE_SIZE || size % PAGE_SIZE) > + return -EINVAL; > + return 0; This is why we have IS_ERR_VALUE(). Just make this function return a pgoff_t.
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 0aa4b6bc5101..e9daa30e4250 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -56,6 +56,18 @@ int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size, } EXPORT_SYMBOL(bdev_dax_pgoff); +int dax_pgoff(sector_t dax_offset, sector_t sector, size_t size, pgoff_t *pgoff) +{ + phys_addr_t phys_off = (dax_offset + sector) * 512; + + if (pgoff) + *pgoff = PHYS_PFN(phys_off); + if (phys_off % PAGE_SIZE || size % PAGE_SIZE) + return -EINVAL; + return 0; +} +EXPORT_SYMBOL(dax_pgoff); + #if IS_ENABLED(CONFIG_FS_DAX) struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev) { diff --git a/include/linux/dax.h b/include/linux/dax.h index 328c2dbb4409..5101a4b5c1f9 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -111,6 +111,7 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, struct writeback_control; int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff); +int dax_pgoff(sector_t dax_offset, sector_t, size_t, pgoff_t *pgoff); #if IS_ENABLED(CONFIG_FS_DAX) bool __bdev_dax_supported(struct block_device *bdev, int blocksize); static inline bool bdev_dax_supported(struct block_device *bdev, int blocksize)
Create a new helper dax_pgoff() which will replace bdev_dax_pgoff(). Difference between two is that dax_pgoff() takes in "sector_t dax_offset" as an argument instead of "struct block_device". dax_offset specifies any offset into dax device which should be added to sector while calculating pgoff. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- drivers/dax/super.c | 12 ++++++++++++ include/linux/dax.h | 1 + 2 files changed, 13 insertions(+)