| Message ID | 20211209063828.18944-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/5] uio: remove copy_from_iter_flushcache() and copy_mc_to_iter() | expand |
On Wed, Dec 8, 2021 at 10:38 PM Christoph Hellwig <hch@lst.de> wrote: > > Remove the DAXDEV_F_SYNC flag and thus the flags argument to alloc_dax and > just let the drivers call set_dax_synchronous directly. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Sure, looks good to me. Reviewed-by: Dan Williams <dan.j.williams@intel.com> > --- > drivers/dax/bus.c | 3 ++- > drivers/dax/super.c | 6 +----- > drivers/md/dm.c | 2 +- > drivers/nvdimm/pmem.c | 7 +++---- > drivers/s390/block/dcssblk.c | 4 ++-- > fs/fuse/virtio_fs.c | 2 +- > include/linux/dax.h | 8 ++------ > 7 files changed, 12 insertions(+), 20 deletions(-) > > diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c > index 6683d42c32c56..da2a14d096d29 100644 > --- a/drivers/dax/bus.c > +++ b/drivers/dax/bus.c > @@ -1324,11 +1324,12 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) > * No dax_operations since there is no access to this device outside of > * mmap of the resulting character device. > */ > - dax_dev = alloc_dax(dev_dax, NULL, DAXDEV_F_SYNC); > + dax_dev = alloc_dax(dev_dax, NULL); > if (IS_ERR(dax_dev)) { > rc = PTR_ERR(dax_dev); > goto err_alloc_dax; > } > + set_dax_synchronous(dax_dev); > > /* a device_dax instance is dead while the driver is not attached */ > kill_dax(dax_dev); > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index e18155f43a635..e81d5ee57390f 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -345,8 +345,7 @@ static struct dax_device *dax_dev_get(dev_t devt) > return dax_dev; > } > > -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > - unsigned long flags) > +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops) > { > struct dax_device *dax_dev; > dev_t devt; > @@ -366,9 +365,6 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > > dax_dev->ops = ops; > dax_dev->private = private; > - if (flags & DAXDEV_F_SYNC) > - set_dax_synchronous(dax_dev); > - > return dax_dev; > > err_dev: > diff --git a/drivers/md/dm.c b/drivers/md/dm.c > index 4e997c02bb0a0..f4b972af10928 100644 > --- a/drivers/md/dm.c > +++ b/drivers/md/dm.c > @@ -1765,7 +1765,7 @@ static struct mapped_device *alloc_dev(int minor) > sprintf(md->disk->disk_name, "dm-%d", minor); > > if (IS_ENABLED(CONFIG_FS_DAX)) { > - md->dax_dev = alloc_dax(md, &dm_dax_ops, 0); > + md->dax_dev = alloc_dax(md, &dm_dax_ops); > if (IS_ERR(md->dax_dev)) { > md->dax_dev = NULL; > goto bad; > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 8294f1c701baa..85b3339286bd8 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -402,7 +402,6 @@ static int pmem_attach_disk(struct device *dev, > struct gendisk *disk; > void *addr; > int rc; > - unsigned long flags = 0UL; > > pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL); > if (!pmem) > @@ -495,13 +494,13 @@ static int pmem_attach_disk(struct device *dev, > nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range); > disk->bb = &pmem->bb; > > - if (is_nvdimm_sync(nd_region)) > - flags = DAXDEV_F_SYNC; > - dax_dev = alloc_dax(pmem, &pmem_dax_ops, flags); > + dax_dev = alloc_dax(pmem, &pmem_dax_ops); > if (IS_ERR(dax_dev)) { > rc = PTR_ERR(dax_dev); > goto out; > } > + if (is_nvdimm_sync(nd_region)) > + set_dax_synchronous(dax_dev); > rc = dax_add_host(dax_dev, disk); > if (rc) > goto out_cleanup_dax; > diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c > index e65e83764d1ce..10823debc09bd 100644 > --- a/drivers/s390/block/dcssblk.c > +++ b/drivers/s390/block/dcssblk.c > @@ -686,13 +686,13 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char > if (rc) > goto put_dev; > > - dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops, > - DAXDEV_F_SYNC); > + dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops); > if (IS_ERR(dev_info->dax_dev)) { > rc = PTR_ERR(dev_info->dax_dev); > dev_info->dax_dev = NULL; > goto put_dev; > } > + set_dax_synchronous(dev_info->dax_dev); > rc = dax_add_host(dev_info->dax_dev, dev_info->gd); > if (rc) > goto out_dax; > diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c > index 242cc1c0d7ed7..5c03a0364a9bb 100644 > --- a/fs/fuse/virtio_fs.c > +++ b/fs/fuse/virtio_fs.c > @@ -850,7 +850,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) > dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n", > __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len); > > - fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops, 0); > + fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops); > if (IS_ERR(fs->dax_dev)) > return PTR_ERR(fs->dax_dev); > > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 3bd1fdb5d5f4b..c04f46478e3b5 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -6,9 +6,6 @@ > #include <linux/mm.h> > #include <linux/radix-tree.h> > > -/* Flag for synchronous flush */ > -#define DAXDEV_F_SYNC (1UL << 0) > - > typedef unsigned long dax_entry_t; > > struct dax_device; > @@ -42,8 +39,7 @@ struct dax_operations { > }; > > #if IS_ENABLED(CONFIG_DAX) > -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > - unsigned long flags); > +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops); > void put_dax(struct dax_device *dax_dev); > void kill_dax(struct dax_device *dax_dev); > void dax_write_cache(struct dax_device *dax_dev, bool wc); > @@ -64,7 +60,7 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, > } > #else > static inline struct dax_device *alloc_dax(void *private, > - const struct dax_operations *ops, unsigned long flags) > + const struct dax_operations *ops) > { > /* > * Callers should check IS_ENABLED(CONFIG_DAX) to know if this > -- > 2.30.2 >
> Remove the DAXDEV_F_SYNC flag and thus the flags argument to alloc_dax and > just let the drivers call set_dax_synchronous directly. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/dax/bus.c | 3 ++- > drivers/dax/super.c | 6 +----- > drivers/md/dm.c | 2 +- > drivers/nvdimm/pmem.c | 7 +++---- > drivers/s390/block/dcssblk.c | 4 ++-- > fs/fuse/virtio_fs.c | 2 +- > include/linux/dax.h | 8 ++------ > 7 files changed, 12 insertions(+), 20 deletions(-) > > diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c > index 6683d42c32c56..da2a14d096d29 100644 > --- a/drivers/dax/bus.c > +++ b/drivers/dax/bus.c > @@ -1324,11 +1324,12 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) > * No dax_operations since there is no access to this device outside of > * mmap of the resulting character device. > */ > - dax_dev = alloc_dax(dev_dax, NULL, DAXDEV_F_SYNC); > + dax_dev = alloc_dax(dev_dax, NULL); > if (IS_ERR(dax_dev)) { > rc = PTR_ERR(dax_dev); > goto err_alloc_dax; > } > + set_dax_synchronous(dax_dev); > > /* a device_dax instance is dead while the driver is not attached */ > kill_dax(dax_dev); > diff --git a/drivers/dax/super.c b/drivers/dax/super.c > index e18155f43a635..e81d5ee57390f 100644 > --- a/drivers/dax/super.c > +++ b/drivers/dax/super.c > @@ -345,8 +345,7 @@ static struct dax_device *dax_dev_get(dev_t devt) > return dax_dev; > } > > -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > - unsigned long flags) > +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops) > { > struct dax_device *dax_dev; > dev_t devt; > @@ -366,9 +365,6 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > > dax_dev->ops = ops; > dax_dev->private = private; > - if (flags & DAXDEV_F_SYNC) > - set_dax_synchronous(dax_dev); > - > return dax_dev; > > err_dev: > diff --git a/drivers/md/dm.c b/drivers/md/dm.c > index 4e997c02bb0a0..f4b972af10928 100644 > --- a/drivers/md/dm.c > +++ b/drivers/md/dm.c > @@ -1765,7 +1765,7 @@ static struct mapped_device *alloc_dev(int minor) > sprintf(md->disk->disk_name, "dm-%d", minor); > > if (IS_ENABLED(CONFIG_FS_DAX)) { > - md->dax_dev = alloc_dax(md, &dm_dax_ops, 0); > + md->dax_dev = alloc_dax(md, &dm_dax_ops); > if (IS_ERR(md->dax_dev)) { > md->dax_dev = NULL; > goto bad; > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 8294f1c701baa..85b3339286bd8 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -402,7 +402,6 @@ static int pmem_attach_disk(struct device *dev, > struct gendisk *disk; > void *addr; > int rc; > - unsigned long flags = 0UL; > > pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL); > if (!pmem) > @@ -495,13 +494,13 @@ static int pmem_attach_disk(struct device *dev, > nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range); > disk->bb = &pmem->bb; > > - if (is_nvdimm_sync(nd_region)) > - flags = DAXDEV_F_SYNC; > - dax_dev = alloc_dax(pmem, &pmem_dax_ops, flags); > + dax_dev = alloc_dax(pmem, &pmem_dax_ops); > if (IS_ERR(dax_dev)) { > rc = PTR_ERR(dax_dev); > goto out; > } > + if (is_nvdimm_sync(nd_region)) > + set_dax_synchronous(dax_dev); > rc = dax_add_host(dax_dev, disk); > if (rc) > goto out_cleanup_dax; > diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c > index e65e83764d1ce..10823debc09bd 100644 > --- a/drivers/s390/block/dcssblk.c > +++ b/drivers/s390/block/dcssblk.c > @@ -686,13 +686,13 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char > if (rc) > goto put_dev; > > - dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops, > - DAXDEV_F_SYNC); > + dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops); > if (IS_ERR(dev_info->dax_dev)) { > rc = PTR_ERR(dev_info->dax_dev); > dev_info->dax_dev = NULL; > goto put_dev; > } > + set_dax_synchronous(dev_info->dax_dev); > rc = dax_add_host(dev_info->dax_dev, dev_info->gd); > if (rc) > goto out_dax; > diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c > index 242cc1c0d7ed7..5c03a0364a9bb 100644 > --- a/fs/fuse/virtio_fs.c > +++ b/fs/fuse/virtio_fs.c > @@ -850,7 +850,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) > dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n", > __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len); > > - fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops, 0); > + fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops); > if (IS_ERR(fs->dax_dev)) > return PTR_ERR(fs->dax_dev); > > diff --git a/include/linux/dax.h b/include/linux/dax.h > index 3bd1fdb5d5f4b..c04f46478e3b5 100644 > --- a/include/linux/dax.h > +++ b/include/linux/dax.h > @@ -6,9 +6,6 @@ > #include <linux/mm.h> > #include <linux/radix-tree.h> > > -/* Flag for synchronous flush */ > -#define DAXDEV_F_SYNC (1UL << 0) > - > typedef unsigned long dax_entry_t; > > struct dax_device; > @@ -42,8 +39,7 @@ struct dax_operations { > }; > > #if IS_ENABLED(CONFIG_DAX) > -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, > - unsigned long flags); > +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops); > void put_dax(struct dax_device *dax_dev); > void kill_dax(struct dax_device *dax_dev); > void dax_write_cache(struct dax_device *dax_dev, bool wc); > @@ -64,7 +60,7 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, > } > #else > static inline struct dax_device *alloc_dax(void *private, > - const struct dax_operations *ops, unsigned long flags) > + const struct dax_operations *ops) > { > /* > * Callers should check IS_ENABLED(CONFIG_DAX) to know if this Looks good. Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 6683d42c32c56..da2a14d096d29 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -1324,11 +1324,12 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) * No dax_operations since there is no access to this device outside of * mmap of the resulting character device. */ - dax_dev = alloc_dax(dev_dax, NULL, DAXDEV_F_SYNC); + dax_dev = alloc_dax(dev_dax, NULL); if (IS_ERR(dax_dev)) { rc = PTR_ERR(dax_dev); goto err_alloc_dax; } + set_dax_synchronous(dax_dev); /* a device_dax instance is dead while the driver is not attached */ kill_dax(dax_dev); diff --git a/drivers/dax/super.c b/drivers/dax/super.c index e18155f43a635..e81d5ee57390f 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -345,8 +345,7 @@ static struct dax_device *dax_dev_get(dev_t devt) return dax_dev; } -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, - unsigned long flags) +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops) { struct dax_device *dax_dev; dev_t devt; @@ -366,9 +365,6 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, dax_dev->ops = ops; dax_dev->private = private; - if (flags & DAXDEV_F_SYNC) - set_dax_synchronous(dax_dev); - return dax_dev; err_dev: diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 4e997c02bb0a0..f4b972af10928 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1765,7 +1765,7 @@ static struct mapped_device *alloc_dev(int minor) sprintf(md->disk->disk_name, "dm-%d", minor); if (IS_ENABLED(CONFIG_FS_DAX)) { - md->dax_dev = alloc_dax(md, &dm_dax_ops, 0); + md->dax_dev = alloc_dax(md, &dm_dax_ops); if (IS_ERR(md->dax_dev)) { md->dax_dev = NULL; goto bad; diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 8294f1c701baa..85b3339286bd8 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -402,7 +402,6 @@ static int pmem_attach_disk(struct device *dev, struct gendisk *disk; void *addr; int rc; - unsigned long flags = 0UL; pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL); if (!pmem) @@ -495,13 +494,13 @@ static int pmem_attach_disk(struct device *dev, nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range); disk->bb = &pmem->bb; - if (is_nvdimm_sync(nd_region)) - flags = DAXDEV_F_SYNC; - dax_dev = alloc_dax(pmem, &pmem_dax_ops, flags); + dax_dev = alloc_dax(pmem, &pmem_dax_ops); if (IS_ERR(dax_dev)) { rc = PTR_ERR(dax_dev); goto out; } + if (is_nvdimm_sync(nd_region)) + set_dax_synchronous(dax_dev); rc = dax_add_host(dax_dev, disk); if (rc) goto out_cleanup_dax; diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index e65e83764d1ce..10823debc09bd 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -686,13 +686,13 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char if (rc) goto put_dev; - dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops, - DAXDEV_F_SYNC); + dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops); if (IS_ERR(dev_info->dax_dev)) { rc = PTR_ERR(dev_info->dax_dev); dev_info->dax_dev = NULL; goto put_dev; } + set_dax_synchronous(dev_info->dax_dev); rc = dax_add_host(dev_info->dax_dev, dev_info->gd); if (rc) goto out_dax; diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 242cc1c0d7ed7..5c03a0364a9bb 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -850,7 +850,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs) dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n", __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len); - fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops, 0); + fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops); if (IS_ERR(fs->dax_dev)) return PTR_ERR(fs->dax_dev); diff --git a/include/linux/dax.h b/include/linux/dax.h index 3bd1fdb5d5f4b..c04f46478e3b5 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -6,9 +6,6 @@ #include <linux/mm.h> #include <linux/radix-tree.h> -/* Flag for synchronous flush */ -#define DAXDEV_F_SYNC (1UL << 0) - typedef unsigned long dax_entry_t; struct dax_device; @@ -42,8 +39,7 @@ struct dax_operations { }; #if IS_ENABLED(CONFIG_DAX) -struct dax_device *alloc_dax(void *private, const struct dax_operations *ops, - unsigned long flags); +struct dax_device *alloc_dax(void *private, const struct dax_operations *ops); void put_dax(struct dax_device *dax_dev); void kill_dax(struct dax_device *dax_dev); void dax_write_cache(struct dax_device *dax_dev, bool wc); @@ -64,7 +60,7 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma, } #else static inline struct dax_device *alloc_dax(void *private, - const struct dax_operations *ops, unsigned long flags) + const struct dax_operations *ops) { /* * Callers should check IS_ENABLED(CONFIG_DAX) to know if this
Remove the DAXDEV_F_SYNC flag and thus the flags argument to alloc_dax and just let the drivers call set_dax_synchronous directly. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/dax/bus.c | 3 ++- drivers/dax/super.c | 6 +----- drivers/md/dm.c | 2 +- drivers/nvdimm/pmem.c | 7 +++---- drivers/s390/block/dcssblk.c | 4 ++-- fs/fuse/virtio_fs.c | 2 +- include/linux/dax.h | 8 ++------ 7 files changed, 12 insertions(+), 20 deletions(-)