tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Lorenzo Stoakes (Oracle) and committed by
Andrew Morton d8bc7934 a1b7fb40

+11 -8
+11 -8
drivers/misc/open-dice.c
··· 86 86 /* 87 87 * Creates a mapping of the reserved memory region in user address space. 88 88 */ 89 - static int open_dice_mmap(struct file *filp, struct vm_area_struct *vma) 89 + static int open_dice_mmap_prepare(struct vm_area_desc *desc) 90 90 { 91 + struct file *filp = desc->file; 91 92 struct open_dice_drvdata *drvdata = to_open_dice_drvdata(filp); 92 93 93 - if (vma->vm_flags & VM_MAYSHARE) { 94 + if (vma_desc_test(desc, VMA_MAYSHARE_BIT)) { 94 95 /* Do not allow userspace to modify the underlying data. */ 95 - if (vma->vm_flags & VM_WRITE) 96 + if (vma_desc_test(desc, VMA_WRITE_BIT)) 96 97 return -EPERM; 97 98 /* Ensure userspace cannot acquire VM_WRITE later. */ 98 - vm_flags_clear(vma, VM_MAYWRITE); 99 + vma_desc_clear_flags(desc, VMA_MAYWRITE_BIT); 99 100 } 100 101 101 102 /* Create write-combine mapping so all clients observe a wipe. */ 102 - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); 103 - vm_flags_set(vma, VM_DONTCOPY | VM_DONTDUMP); 104 - return vm_iomap_memory(vma, drvdata->rmem->base, drvdata->rmem->size); 103 + desc->page_prot = pgprot_writecombine(desc->page_prot); 104 + vma_desc_set_flags(desc, VMA_DONTCOPY_BIT, VMA_DONTDUMP_BIT); 105 + mmap_action_simple_ioremap(desc, drvdata->rmem->base, 106 + drvdata->rmem->size); 107 + return 0; 105 108 } 106 109 107 110 static const struct file_operations open_dice_fops = { 108 111 .owner = THIS_MODULE, 109 112 .read = open_dice_read, 110 113 .write = open_dice_write, 111 - .mmap = open_dice_mmap, 114 + .mmap_prepare = open_dice_mmap_prepare, 112 115 }; 113 116 114 117 static int __init open_dice_probe(struct platform_device *pdev)