Received-SPF: pass (google.com: domain of linux-kernel+bounces-140987-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 217/437] misc: open-dice: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:15:57 -0600
Message-ID: <20240411153126.16201-218-axboe@kernel.dk>
In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk>
References: <20240411153126.16201-1-axboe@kernel.dk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 drivers/misc/open-dice.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/misc/open-dice.c b/drivers/misc/open-dice.c
index 1e3eb2aa44d9..0fe66a17f27d 100644
--- a/drivers/misc/open-dice.c
+++ b/drivers/misc/open-dice.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
+#include <linux/uio.h>
 
 #define DRIVER_NAME "open-dice"
 
@@ -61,26 +62,24 @@ static int open_dice_wipe(struct open_dice_drvdata *drvdata)
 /*
  * Copies the size of the reserved memory region to the user-provided buffer.
  */
-static ssize_t open_dice_read(struct file *filp, char __user *ptr, size_t len,
-			      loff_t *off)
+static ssize_t open_dice_read(struct kiocb *iocb, struct iov_iter *to)
 {
-	unsigned long val = to_open_dice_drvdata(filp)->rmem->size;
+	unsigned long val = to_open_dice_drvdata(iocb->ki_filp)->rmem->size;
 
-	return simple_read_from_buffer(ptr, len, off, &val, sizeof(val));
+	return simple_copy_to_iter(&val, &iocb->ki_pos, sizeof(val), to);
 }
 
 /*
  * Triggers a wipe of the reserved memory region. The user-provided pointer
  * is never dereferenced.
  */
-static ssize_t open_dice_write(struct file *filp, const char __user *ptr,
-			       size_t len, loff_t *off)
+static ssize_t open_dice_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	if (open_dice_wipe(to_open_dice_drvdata(filp)))
+	if (open_dice_wipe(to_open_dice_drvdata(iocb->ki_filp)))
 		return -EIO;
 
 	/* Consume the input buffer. */
-	return len;
+	return iov_iter_count(from);
 }
 
 /*
@@ -106,8 +105,8 @@ static int open_dice_mmap(struct file *filp, struct vm_area_struct *vma)
 
 static const struct file_operations open_dice_fops = {
 	.owner = THIS_MODULE,
-	.read = open_dice_read,
-	.write = open_dice_write,
+	.read_iter = open_dice_read,
+	.write_iter = open_dice_write,
 	.mmap = open_dice_mmap,
 };
 
-- 
2.43.0