misc: open-dice: replace deprecated mmap hook with mmap_prepare

The f_op->mmap interface is deprecated, so update driver to use its
successor, mmap_prepare.

The driver previously used vm_iomap_memory(), so this change replaces it
with its mmap_prepare equivalent, mmap_action_simple_ioremap().

Link: https://lkml.kernel.org/r/5a83ab00195dc8d0609fa6cc525493010ac4ead1.1774045440.git.ljs@kernel.org
Signed-off-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Acked-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bodo Stroesser <bostroesser@gmail.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: David Hildenbrand <david@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Long Li <longli@microsoft.com>
Cc: Marc Dionne <marc.dionne@auristor.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/misc/open-dice.c b/drivers/misc/open-dice.c
index 24c29e0f00ef16a35f01e7069089402bcb13c9eb..45060fb4ea279268abfbb0b749f99637e47b29a8 100644 (file)
--- a/drivers/misc/open-dice.c
+++ b/drivers/misc/open-dice.c
@@ -86,29 +86,32 @@ static ssize_t open_dice_write(struct file *filp, const char __user *ptr,
 /*
  * Creates a mapping of the reserved memory region in user address space.
  */
-static int open_dice_mmap(struct file *filp, struct vm_area_struct *vma)
+static int open_dice_mmap_prepare(struct vm_area_desc *desc)
 {
+       struct file *filp = desc->file;
        struct open_dice_drvdata *drvdata = to_open_dice_drvdata(filp);
 
-       if (vma->vm_flags & VM_MAYSHARE) {
+       if (vma_desc_test(desc, VMA_MAYSHARE_BIT)) {
                /* Do not allow userspace to modify the underlying data. */
-               if (vma->vm_flags & VM_WRITE)
+               if (vma_desc_test(desc, VMA_WRITE_BIT))
                        return -EPERM;
                /* Ensure userspace cannot acquire VM_WRITE later. */
-               vm_flags_clear(vma, VM_MAYWRITE);
+               vma_desc_clear_flags(desc, VMA_MAYWRITE_BIT);
        }
 
        /* Create write-combine mapping so all clients observe a wipe. */
-       vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-       vm_flags_set(vma, VM_DONTCOPY | VM_DONTDUMP);
-       return vm_iomap_memory(vma, drvdata->rmem->base, drvdata->rmem->size);
+       desc->page_prot = pgprot_writecombine(desc->page_prot);
+       vma_desc_set_flags(desc, VMA_DONTCOPY_BIT, VMA_DONTDUMP_BIT);
+       mmap_action_simple_ioremap(desc, drvdata->rmem->base,
+                                  drvdata->rmem->size);
+       return 0;
 }
 
 static const struct file_operations open_dice_fops = {
        .owner = THIS_MODULE,
        .read = open_dice_read,
        .write = open_dice_write,
-       .mmap = open_dice_mmap,
+       .mmap_prepare = open_dice_mmap_prepare,
 };
 
 static int __init open_dice_probe(struct platform_device *pdev)