From nobody Tue Apr 7 16:14:44 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADC4E37416E; Thu, 12 Mar 2026 20:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773347285; cv=none; b=G7xjz+hWKtV9DsWWlZS5j57/oGT1KvSsoJCsEWsdRpDuEIhV7lLo8m3rpzEx8XCkK+QduGgNagDTEDASEFRaXOH5fdls23bpZfiS7YJ4R4MWgPkpwpnR3G7UpEVQet44PuhZbu8Hs52dPgKh5I9DDf24r7BLcs2b1hV8GMZ7E+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773347285; c=relaxed/simple; bh=Ety6uMqPsqMphsUZjHWQlJPo7xJz901fcYuIgrq0DKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YUvWB2jXiVo1XQrReGzWZ4PjRnumz6jC7mLU4WRqDOUEYCLJMzgR06Ps73CudaMQIKu+iJhUwOFJH26+x+1d8x93feGMxV7pn81/rr9ut4vO3RokTTSDEBWkW8OIh579a3JJWVF67syFCrTcl87O+9E3eLLPlCaijFmWw5FYoZk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c8Lr4cy6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c8Lr4cy6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 049CDC2BCAF; Thu, 12 Mar 2026 20:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773347285; bh=Ety6uMqPsqMphsUZjHWQlJPo7xJz901fcYuIgrq0DKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c8Lr4cy6WpIq5NFpjNJkHw+vaaT5zBpjWw7ea2sJ1hu4elzSc3C40x74CEkq5xY1Y Q+XCS4Xmz+p8a2LUr/gK2AxG79b/5ANj+Dm8VpZpE/ycrhElZJ7fYp+Ydb1iI7sjks 2AHRsN1B7zv0ajZoq+/vhPDx2WPyqc/aOt9grFeK5nlxyoHB7qPFPwWaE2kg6Oftss HK64YjkYpdwPendsINx3umhhLQA8GGowKg0BH8krGexcUy9WWvAIJQKjfcmTEz8f/P /cZ2qo8YyD5AeyTGzgbcDMoCDn8v4qphivqaAA7q1C0R0Xh0b1Ii+jexXmgaw0JDAp cqXv2YE7AqCKw== From: "Lorenzo Stoakes (Oracle)" To: Andrew Morton Cc: Jonathan Corbet , Clemens Ladisch , Arnd Bergmann , Greg Kroah-Hartman , "K . Y . Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Shishkin , Maxime Coquelin , Alexandre Torgue , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Bodo Stroesser , "Martin K . Petersen" , David Howells , Marc Dionne , Alexander Viro , Christian Brauner , Jan Kara , David Hildenbrand , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, linux-staging@lists.linux.dev, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Ryan Roberts Subject: [PATCH 07/15] misc: open-dice: replace deprecated mmap hook with mmap_prepare Date: Thu, 12 Mar 2026 20:27:22 +0000 Message-ID: <0d5534f0baa8761795d2d92b1a8bbad08aae5f8d.1773346620.git.ljs@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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(). Signed-off-by: Lorenzo Stoakes (Oracle) --- drivers/misc/open-dice.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/misc/open-dice.c b/drivers/misc/open-dice.c index 24c29e0f00ef..45060fb4ea27 100644 --- 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 =3D desc->file; struct open_dice_drvdata *drvdata =3D to_open_dice_drvdata(filp); =20 - 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); } =20 /* Create write-combine mapping so all clients observe a wipe. */ - vma->vm_page_prot =3D 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 =3D 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; } =20 static const struct file_operations open_dice_fops =3D { .owner =3D THIS_MODULE, .read =3D open_dice_read, .write =3D open_dice_write, - .mmap =3D open_dice_mmap, + .mmap_prepare =3D open_dice_mmap_prepare, }; =20 static int __init open_dice_probe(struct platform_device *pdev) --=20 2.53.0