From nobody Fri Dec 19 17:16:14 2025 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64D2C84E0C for ; Thu, 11 Apr 2024 15:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849878; cv=none; b=lBbxn3ZcNpOrDmBSHa/XdTbF9e7DB4bGytTMifwSBM/MBVyLAnUBuLIJMZSY+5ol3NRNEVvz9L16VO9xRGEmHHE1mj132gvu0D5f0oqWzPbVVcEwQ7bpfRAAk42xaEzCnHIbjLM7UKJ8G3uPub5bjCInAm/rzQmP4cEuqzaa7CU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849878; c=relaxed/simple; bh=dKegfD9inuQjrfp8V5zNelclZEXv78SMco6P6shv3uI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BpI87EAqwFcdBvbxzWwSRZKRIt8XyGLYF8zBgzerHb1mie8Q/llO/fxeVrivW7lkVRkB4DqH8bds9rmgD9C/3NBrrMI3WNcyHzBynzBgfs9X1C2TJ1heRcAKGsq5iPfSfUlXPnSYIEAhcal7FH3sTc0ivuL0q0NQNsffWrz9foc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=2iiqG55b; arc=none smtp.client-ip=209.85.166.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="2iiqG55b" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-36a34b68277so113435ab.0 for ; Thu, 11 Apr 2024 08:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849876; x=1713454676; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xw+QYykvlRHgH9Je+PZEWfmF+Zqn65SJAhuGyu3q7/0=; b=2iiqG55bBKXRyYrMZIiYjpvt+Hj7vNBfesFwbQxHCYzMKExIUPm2XY/F/WYhtY8vcD SgEh888IZnZoCEV4i1q9CCe5A7cIPOxOUYfFpSuRH+pS7ainGGfejnbn1ITHonkSqNcp 2nG0DIqaVXb5QwGchGqdoFBzO7Lh1zwncJLvEhZscCb3hJ1RjlDw9mCXWisdt5tG7T8o ULGeMYXgcRBFJp5q2zUDbdzL1vl5CCYcpJTLSiQ+byqhsq6xhfmbv/guMZ7RQn235bp3 WX0HGejstNMITuP7FdwPv4zoULudiqQv0O8HqQ62+M4Fa/xfr4gJNBSQpaXbg93N8DS3 0MEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849876; x=1713454676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xw+QYykvlRHgH9Je+PZEWfmF+Zqn65SJAhuGyu3q7/0=; b=QgcPHIZqRTt3AT+vp1TsTDttyq8QAq4tLblBeSGKBCaRsHQCNF1kuLPm0hg0J4oiZi cQYipurwPE+gjno16T3r03YKznUMARK7WqHd7wS1f1oKkTloKi6TyBZsHpISOf5hE5rU b9F/Y2+XcSRHIMjfTdS+NVw9fcxj29Pk7nsI37AUie1NTRMNpIyv5rQkZwnSER1H8dIC UOmZjJG6JakXfh2qe4xvfTIh3a5zGDE0uf6qntDOkjpApmbGlrtcC3NQL5IMyIC4eKhE ppRtYk8Dt2aQGBrUknIQG+Mxvu6+48bno1hILwY6BILwOwyMFgaFVqIinxsBoZ8Z3olw OrGA== X-Gm-Message-State: AOJu0YwrOlB2C5spGYUdFDeHITj9oF6cZyE4P24fdl1M19u8ZyeSIxE2 e3mtrhZ2sfyTmYgmH411gdKR2bJJkbkPkjAKcKOfsBJV0yZf661/oThe7P/c67Nu44F0r2plWxc T X-Google-Smtp-Source: AGHT+IEHOoJy72rxpyg1edLQH4yXh7NVot/7LS01gHyKrcefNPzq4rE7DULR2F+phC4pmh28+DGK+w== X-Received: by 2002:a6b:4e14:0:b0:7d6:631d:7b0 with SMTP id c20-20020a6b4e14000000b007d6631d07b0mr192416iob.1.1712849875805; Thu, 11 Apr 2024 08:37:55 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:37:54 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 224/437] drivers/mailbox: convert to read/write iterators Date: Thu, 11 Apr 2024 09:16:04 -0600 Message-ID: <20240411153126.16201-225-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk> References: <20240411153126.16201-1-axboe@kernel.dk> 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" Signed-off-by: Jens Axboe --- drivers/mailbox/bcm-pdc-mailbox.c | 9 ++++---- drivers/mailbox/mailbox-test.c | 37 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/mailbox/bcm-pdc-mailbox.c b/drivers/mailbox/bcm-pdc-ma= ilbox.c index 1768d3d5aaa0..4fd840cd7193 100644 --- a/drivers/mailbox/bcm-pdc-mailbox.c +++ b/drivers/mailbox/bcm-pdc-mailbox.c @@ -420,8 +420,7 @@ static struct pdc_globals pdcg; /* top level debug FS directory for PDC driver */ static struct dentry *debugfs_dir; =20 -static ssize_t pdc_debugfs_read(struct file *filp, char __user *ubuf, - size_t count, loff_t *offp) +static ssize_t pdc_debugfs_read(struct kiocb *iocb, struct iov_iter *to) { struct pdc_state *pdcs; char *buf; @@ -433,7 +432,7 @@ static ssize_t pdc_debugfs_read(struct file *filp, char= __user *ubuf, if (!buf) return -ENOMEM; =20 - pdcs =3D filp->private_data; + pdcs =3D iocb->ki_filp->private_data; out_offset =3D 0; out_offset +=3D scnprintf(buf + out_offset, out_count - out_offset, "SPU %u stats:\n", pdcs->pdc_idx); @@ -469,7 +468,7 @@ static ssize_t pdc_debugfs_read(struct file *filp, char= __user *ubuf, if (out_offset > out_count) out_offset =3D out_count; =20 - ret =3D simple_read_from_buffer(ubuf, count, offp, buf, out_offset); + ret =3D simple_copy_to_iter(buf, &iocb->ki_pos, out_offset, to); kfree(buf); return ret; } @@ -477,7 +476,7 @@ static ssize_t pdc_debugfs_read(struct file *filp, char= __user *ubuf, static const struct file_operations pdc_debugfs_stats =3D { .owner =3D THIS_MODULE, .open =3D simple_open, - .read =3D pdc_debugfs_read, + .read_iter =3D pdc_debugfs_read, }; =20 /** diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index 3386b4e72551..27176797770b 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c @@ -46,11 +46,10 @@ struct mbox_test_device { struct dentry *root_debugfs_dir; }; =20 -static ssize_t mbox_test_signal_write(struct file *filp, - const char __user *userbuf, - size_t count, loff_t *ppos) +static ssize_t mbox_test_signal_write(struct kiocb *iocb, struct iov_iter = *from) { - struct mbox_test_device *tdev =3D filp->private_data; + struct mbox_test_device *tdev =3D iocb->ki_filp->private_data; + size_t count =3D iov_iter_count(from); =20 if (!tdev->tx_channel) { dev_err(tdev->dev, "Channel cannot do Tx\n"); @@ -71,7 +70,7 @@ static ssize_t mbox_test_signal_write(struct file *filp, return -ENOMEM; } =20 - if (copy_from_user(tdev->signal, userbuf, count)) { + if (!copy_from_iter_full(tdev->signal, count, from)) { kfree(tdev->signal); tdev->signal =3D NULL; return -EFAULT; @@ -81,7 +80,7 @@ static ssize_t mbox_test_signal_write(struct file *filp, } =20 static const struct file_operations mbox_test_signal_ops =3D { - .write =3D mbox_test_signal_write, + .write_iter =3D mbox_test_signal_write, .open =3D simple_open, .llseek =3D generic_file_llseek, }; @@ -93,11 +92,11 @@ static int mbox_test_message_fasync(int fd, struct file= *filp, int on) return fasync_helper(fd, filp, on, &tdev->async_queue); } =20 -static ssize_t mbox_test_message_write(struct file *filp, - const char __user *userbuf, - size_t count, loff_t *ppos) +static ssize_t mbox_test_message_write(struct kiocb *iocb, + struct iov_iter *from) { - struct mbox_test_device *tdev =3D filp->private_data; + struct mbox_test_device *tdev =3D iocb->ki_filp->private_data; + size_t count =3D iov_iter_count(from); char *message; void *data; int ret; @@ -121,7 +120,7 @@ static ssize_t mbox_test_message_write(struct file *fil= p, mutex_lock(&tdev->mutex); =20 tdev->message =3D message; - ret =3D copy_from_user(tdev->message, userbuf, count); + ret =3D !copy_from_iter_full(tdev->message, count, from); if (ret) { ret =3D -EFAULT; goto out; @@ -168,10 +167,9 @@ static bool mbox_test_message_data_ready(struct mbox_t= est_device *tdev) return data_ready; } =20 -static ssize_t mbox_test_message_read(struct file *filp, char __user *user= buf, - size_t count, loff_t *ppos) +static ssize_t mbox_test_message_read(struct kiocb *iocb, struct iov_iter = *to) { - struct mbox_test_device *tdev =3D filp->private_data; + struct mbox_test_device *tdev =3D iocb->ki_filp->private_data; unsigned long flags; char *touser, *ptr; int l =3D 0; @@ -185,8 +183,7 @@ static ssize_t mbox_test_message_read(struct file *filp= , char __user *userbuf, =20 if (!tdev->rx_channel) { ret =3D snprintf(touser, 20, "\n"); - ret =3D simple_read_from_buffer(userbuf, count, ppos, - touser, ret); + ret =3D simple_copy_to_iter(touser, &iocb->ki_pos, ret, to); goto kfree_err; } =20 @@ -198,7 +195,7 @@ static ssize_t mbox_test_message_read(struct file *filp= , char __user *userbuf, if (mbox_test_message_data_ready(tdev)) break; =20 - if (filp->f_flags & O_NONBLOCK) { + if (iocb->ki_filp->f_flags & O_NONBLOCK) { ret =3D -EAGAIN; goto waitq_err; } @@ -231,7 +228,7 @@ static ssize_t mbox_test_message_read(struct file *filp= , char __user *userbuf, =20 spin_unlock_irqrestore(&tdev->lock, flags); =20 - ret =3D simple_read_from_buffer(userbuf, count, ppos, touser, MBOX_HEXDUM= P_MAX_LEN); + ret =3D simple_copy_to_iter(touser, &iocb->ki_pos, MBOX_HEXDUMP_MAX_LEN, = to); waitq_err: __set_current_state(TASK_RUNNING); remove_wait_queue(&tdev->waitq, &wait); @@ -253,8 +250,8 @@ mbox_test_message_poll(struct file *filp, struct poll_t= able_struct *wait) } =20 static const struct file_operations mbox_test_message_ops =3D { - .write =3D mbox_test_message_write, - .read =3D mbox_test_message_read, + .write_iter =3D mbox_test_message_write, + .read_iter =3D mbox_test_message_read, .fasync =3D mbox_test_message_fasync, .poll =3D mbox_test_message_poll, .open =3D simple_open, --=20 2.43.0