Received-SPF: pass (google.com: domain of linux-kernel+bounces-141136-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 357/437] samples/vfio-mdev: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:18:17 -0600
Message-ID: <20240411153126.16201-358-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>
---
 samples/vfio-mdev/mtty.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c
index 2284b3751240..b7b9c39a0497 100644
--- a/samples/vfio-mdev/mtty.c
+++ b/samples/vfio-mdev/mtty.c
@@ -881,16 +881,17 @@ static long mtty_precopy_ioctl(struct file *filp, unsigned int cmd,
 	return ret;
 }
 
-static ssize_t mtty_save_read(struct file *filp, char __user *buf,
-			      size_t len, loff_t *pos)
+static ssize_t mtty_save_read(struct kiocb *iocb, struct iov_iter *to)
 {
-	struct mtty_migration_file *migf = filp->private_data;
+	struct mtty_migration_file *migf = iocb->ki_filp->private_data;
+	size_t len = iov_iter_count(to);
 	ssize_t ret = 0;
+	loff_t *pos;
 
-	if (pos)
+	if (iocb->ki_pos)
 		return -ESPIPE;
 
-	pos = &filp->f_pos;
+	pos = &iocb->ki_filp->f_pos;
 
 	mutex_lock(&migf->lock);
 
@@ -908,7 +909,7 @@ static ssize_t mtty_save_read(struct file *filp, char __user *buf,
 
 	len = min_t(size_t, migf->filled_size - *pos, len);
 	if (len) {
-		if (copy_to_user(buf, (void *)&migf->data + *pos, len)) {
+		if (!copy_to_iter_full((void *)&migf->data + *pos, len, to)) {
 			ret = -EFAULT;
 			goto out_unlock;
 		}
@@ -923,7 +924,7 @@ static ssize_t mtty_save_read(struct file *filp, char __user *buf,
 
 static const struct file_operations mtty_save_fops = {
 	.owner = THIS_MODULE,
-	.read = mtty_save_read,
+	.read_iter = mtty_save_read,
 	.unlocked_ioctl = mtty_precopy_ioctl,
 	.compat_ioctl = compat_ptr_ioctl,
 	.release = mtty_release_migf,
@@ -1018,18 +1019,19 @@ mtty_save_device_data(struct mdev_state *mdev_state,
 	return ret;
 }
 
-static ssize_t mtty_resume_write(struct file *filp, const char __user *buf,
-				 size_t len, loff_t *pos)
+static ssize_t mtty_resume_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	struct mtty_migration_file *migf = filp->private_data;
+	struct mtty_migration_file *migf = iocb->ki_filp->private_data;
 	struct mdev_state *mdev_state = migf->mdev_state;
+	size_t len = iov_iter_count(from);
 	loff_t requested_length;
 	ssize_t ret = 0;
+	loff_t *pos;
 
-	if (pos)
+	if (iocb->ki_pos)
 		return -ESPIPE;
 
-	pos = &filp->f_pos;
+	pos = &iocb->ki_filp->f_pos;
 
 	if (*pos < 0 ||
 	    check_add_overflow((loff_t)len, *pos, &requested_length))
@@ -1045,7 +1047,7 @@ static ssize_t mtty_resume_write(struct file *filp, const char __user *buf,
 		goto out_unlock;
 	}
 
-	if (copy_from_user((void *)&migf->data + *pos, buf, len)) {
+	if (!copy_from_iter_full((void *)&migf->data + *pos, len, from)) {
 		ret = -EFAULT;
 		goto out_unlock;
 	}
@@ -1080,7 +1082,7 @@ static ssize_t mtty_resume_write(struct file *filp, const char __user *buf,
 
 static const struct file_operations mtty_resume_fops = {
 	.owner = THIS_MODULE,
-	.write = mtty_resume_write,
+	.write_iter = mtty_resume_write,
 	.release = mtty_release_migf,
 	.llseek = no_llseek,
 };
-- 
2.43.0