Commit 8e18a7f4 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

device/dax: update devdax to use mmap_prepare 

The devdax driver does nothing special in its f_op->mmap hook, so
straightforwardly update it to use the mmap_prepare hook instead.

Link: https://lkml.kernel.org/r/1e8665d052ac8cf2f7ff92b6c7862614f7fd306c.1760959442.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarPedro Falcato <pfalcato@suse.de>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Chatre, Reinette <reinette.chatre@intel.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Dave Martin <dave.martin@arm.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: James Morse <james.morse@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Robin Murohy <robin.murphy@arm.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ab3c8e7b

drivers/dax/device.c

+21 −11
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
#include "dax-private.h"

#include "bus.h"



static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,

static int __check_vma(struct dev_dax *dev_dax, vm_flags_t vm_flags,

		       unsigned long start, unsigned long end, struct file *file,

		       const char *func)

{

	struct device *dev = &dev_dax->dev;
@@ -23,7 +24,7 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, 
		return -ENXIO;



	/* prevent private mappings from being established */

	if ((vma->vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {

	if ((vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {

		dev_info_ratelimited(dev,

				"%s: %s: fail, attempted private mapping\n",

				current->comm, func);
@@ -31,15 +32,15 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, 
	}



	mask = dev_dax->align - 1;

	if (vma->vm_start & mask || vma->vm_end & mask) {

	if (start & mask || end & mask) {

		dev_info_ratelimited(dev,

				"%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n",

				current->comm, func, vma->vm_start, vma->vm_end,

				current->comm, func, start, end,

				mask);

		return -EINVAL;

	}



	if (!vma_is_dax(vma)) {

	if (!file_is_dax(file)) {

		dev_info_ratelimited(dev,

				"%s: %s: fail, vma is not DAX capable\n",

				current->comm, func);
@@ -49,6 +50,13 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, 
	return 0;

}



static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,

		     const char *func)

{

	return __check_vma(dev_dax, vma->vm_flags, vma->vm_start, vma->vm_end,

			   vma->vm_file, func);

}



/* see "strong" declaration in tools/testing/nvdimm/dax-dev.c */

__weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff,

		unsigned long size)
@@ -285,8 +293,9 @@ static const struct vm_operations_struct dax_vm_ops = { 
	.pagesize = dev_dax_pagesize,

};



static int dax_mmap(struct file *filp, struct vm_area_struct *vma)

static int dax_mmap_prepare(struct vm_area_desc *desc)

{

	struct file *filp = desc->file;

	struct dev_dax *dev_dax = filp->private_data;

	int rc, id;
@@ -297,13 +306,14 @@ static int dax_mmap(struct file *filp, struct vm_area_struct *vma) 
	 * fault time.

	 */

	id = dax_read_lock();

	rc = check_vma(dev_dax, vma, __func__);

	rc = __check_vma(dev_dax, desc->vm_flags, desc->start, desc->end, filp,

			 __func__);

	dax_read_unlock(id);

	if (rc)

		return rc;



	vma->vm_ops = &dax_vm_ops;

	vm_flags_set(vma, VM_HUGEPAGE);

	desc->vm_ops = &dax_vm_ops;

	desc->vm_flags |= VM_HUGEPAGE;

	return 0;

}
@@ -376,7 +386,7 @@ static const struct file_operations dax_fops = { 
	.open = dax_open,

	.release = dax_release,

	.get_unmapped_area = dax_get_unmapped_area,

	.mmap = dax_mmap,

	.mmap_prepare = dax_mmap_prepare,

	.fop_flags = FOP_MMAP_SYNC,

};