From nobody Fri Dec 19 06:08:31 2025 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) (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 1B57917AD6E for ; Thu, 11 Apr 2024 15:37:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849840; cv=none; b=Z1+kLYbRt7fm31ZZ28wSGskT9PANU5i9h9U/Psw6eiT3RZd8fn4ZaUH8fXHkR5t6SWYZgIFBjGibhZugtSY+cjfsp1hw1reQrFeHa4FOgos2+dzEUNhGh8lNAENqlcizcuqqYhmZi/ryfO0cYG3ayaOe2BdZAhUp60molEeD2cM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849840; c=relaxed/simple; bh=YgKKAw0gpDESSsI2B6G/XXVsv75kYSvOz6HNWqNIjR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=StKLz+s7u4O7aMPbvw2J4tEK43mPk1NrhWtptA44fgdWA4vJYgTSno9Ps/Q4TwzgNLLSylUznpT82aen3fhObYVEpaG1qfUjEIT5dnFXBoAMR1vnZFiTPdeXJYCDp9vvhQSNK6qXbB8DFQbiY+/qtZFqQ0YDxvifMTHYlIINN3c= 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=leBWsYW4; arc=none smtp.client-ip=209.85.166.43 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="leBWsYW4" Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7d6812b37a6so8971239f.0 for ; Thu, 11 Apr 2024 08:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849838; x=1713454638; 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=k8L8sEl0WgDwyMr/iJ731l7Aq9M52WzbzAWJBy9EPdM=; b=leBWsYW4QeFWAsA3Zrh8b6jnUeUUDwwajofe4gzeGJkfQ5XdgFYy6etmzvqBZ2HqQL vPbBVycpxtIGwFh2EChzuJaibc+BRhdsnZlTBY1IrsgXJnIWf+mEQOHNSe+YSzirgL13 jA+NLgHmFQC1Yv1UHVcZ/TmYhqjbX4DHqMKoiHenjhcXUJBIluHYKhzBm+Kb7+395gGK BgPnmQespTllP3iRAHbSbEIrgUKQakZ1FEcHkvQ1CWMT/B/QH6g8WDz7xoUhwNjU43LM Hl0HmJ8/2KU+gQWraw6V3BJiDak4l9mvQlHicuOJ14w06IFG2Obj8DWwQw1qkrDReI2M NmlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849838; x=1713454638; 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=k8L8sEl0WgDwyMr/iJ731l7Aq9M52WzbzAWJBy9EPdM=; b=qEH/Srg1xHKOXbQbsqeuwmBWnZl2+s3wHN845qGQrY21CDvXrLEQS3EIuSpGQhzfPH xfQbBsKWBVoDoHzWvkmuIXL7Ey8n8sCKJPmlqySmlBCiwcb5RIwO+8RWhwisAVTxrTQV 1LIeT/bo9fQzuaGVALd1wC+FFv4wJrLKwrFksoPMAxLhttPJ6Xm/+NzF4b2g3HhuhDqM hgJHDZmSbh725sx3m+SqyLxBn8Fh5lWXrExoxY1GbA/wzHJ3HBbipA7n8LTmCB1SRusX UF6vlIpdOsrVu2c6T/SuXHqs28e1/7JQhqNg68mX1CADtZ+xFON+0f955JbaopGGh5aP JHPg== X-Gm-Message-State: AOJu0YySA07/th2t3Ql4KQ9Q+rbUUyF0nv5BBhB5B4SqELSTwzPtwdc2 bzONNR62nOxKgBzv9ehGXnig/1EfJpdkajah+CxHCnHna6kVGxLHXck9j57PeZdxuTISWkd102w 3 X-Google-Smtp-Source: AGHT+IFDeQ2HNukEXPQ2crxfo6oqaj6M/HAQG2sYDLHTDP9x0NiXerdTQ+bmFDY84FO5Vbk1KjH9Rw== X-Received: by 2002:a92:d352:0:b0:36a:1275:4aeb with SMTP id a18-20020a92d352000000b0036a12754aebmr5885173ilh.1.1712849837855; Thu, 11 Apr 2024 08:37:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:37:16 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 202/437] staging: greybus: convert to read/write iterators Date: Thu, 11 Apr 2024 09:15:42 -0600 Message-ID: <20240411153126.16201-203-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/greybus/es2.c | 29 ++++++++++++++--------------- drivers/greybus/svc.c | 27 ++++++++++++--------------- drivers/staging/greybus/camera.c | 22 ++++++++++------------ drivers/staging/greybus/raw.c | 6 ++++-- 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/drivers/greybus/es2.c b/drivers/greybus/es2.c index 1ee78d0d90b4..ef9c68ef8632 100644 --- a/drivers/greybus/es2.c +++ b/drivers/greybus/es2.c @@ -1109,10 +1109,10 @@ static int apb_log_poll(void *data) return 0; } =20 -static ssize_t apb_log_read(struct file *f, char __user *buf, - size_t count, loff_t *ppos) +static ssize_t apb_log_read(struct kiocb *iocb, struct iov_iter *to) { - struct es2_ap_dev *es2 =3D file_inode(f)->i_private; + struct es2_ap_dev *es2 =3D file_inode(iocb->ki_filp)->i_private; + size_t count =3D iov_iter_count(to); ssize_t ret; size_t copied; char *tmp_buf; @@ -1125,7 +1125,7 @@ static ssize_t apb_log_read(struct file *f, char __us= er *buf, return -ENOMEM; =20 copied =3D kfifo_out(&es2->apb_log_fifo, tmp_buf, count); - ret =3D simple_read_from_buffer(buf, count, ppos, tmp_buf, copied); + ret =3D simple_copy_to_iter(tmp_buf, &iocb->ki_pos, copied, to); =20 kfree(tmp_buf); =20 @@ -1133,7 +1133,7 @@ static ssize_t apb_log_read(struct file *f, char __us= er *buf, } =20 static const struct file_operations apb_log_fops =3D { - .read =3D apb_log_read, + .read_iter =3D apb_log_read, }; =20 static void usb_log_enable(struct es2_ap_dev *es2) @@ -1163,25 +1163,24 @@ static void usb_log_disable(struct es2_ap_dev *es2) es2->apb_log_task =3D NULL; } =20 -static ssize_t apb_log_enable_read(struct file *f, char __user *buf, - size_t count, loff_t *ppos) +static ssize_t apb_log_enable_read(struct kiocb *iocb, struct iov_iter *to) { - struct es2_ap_dev *es2 =3D file_inode(f)->i_private; + struct es2_ap_dev *es2 =3D file_inode(iocb->ki_filp)->i_private; int enable =3D !IS_ERR_OR_NULL(es2->apb_log_task); char tmp_buf[3]; =20 sprintf(tmp_buf, "%d\n", enable); - return simple_read_from_buffer(buf, count, ppos, tmp_buf, 2); + return simple_copy_to_iter(tmp_buf, &iocb->ki_pos, 2, to); } =20 -static ssize_t apb_log_enable_write(struct file *f, const char __user *buf, - size_t count, loff_t *ppos) +static ssize_t apb_log_enable_write(struct kiocb *iocb, struct iov_iter *f= rom) { int enable; ssize_t retval; - struct es2_ap_dev *es2 =3D file_inode(f)->i_private; + struct es2_ap_dev *es2 =3D file_inode(iocb->ki_filp)->i_private; + size_t count =3D iov_iter_count(from); =20 - retval =3D kstrtoint_from_user(buf, count, 10, &enable); + retval =3D kstrtoint_from_iter(from, count, 10, &enable); if (retval) return retval; =20 @@ -1194,8 +1193,8 @@ static ssize_t apb_log_enable_write(struct file *f, c= onst char __user *buf, } =20 static const struct file_operations apb_log_enable_fops =3D { - .read =3D apb_log_enable_read, - .write =3D apb_log_enable_write, + .read_iter =3D apb_log_enable_read, + .write_iter =3D apb_log_enable_write, }; =20 static int apb_get_cport_count(struct usb_device *udev) diff --git a/drivers/greybus/svc.c b/drivers/greybus/svc.c index 4256467fcd35..989ee7a3ac17 100644 --- a/drivers/greybus/svc.c +++ b/drivers/greybus/svc.c @@ -673,11 +673,10 @@ static int gb_svc_version_request(struct gb_operation= *op) return 0; } =20 -static ssize_t pwr_debugfs_voltage_read(struct file *file, char __user *bu= f, - size_t len, loff_t *offset) +static ssize_t pwr_debugfs_voltage_read(struct kiocb *iocb, struct iov_ite= r *to) { struct svc_debugfs_pwrmon_rail *pwrmon_rails =3D - file_inode(file)->i_private; + file_inode(iocb->ki_filp)->i_private; struct gb_svc *svc =3D pwrmon_rails->svc; int ret, desc; u32 value; @@ -694,14 +693,13 @@ static ssize_t pwr_debugfs_voltage_read(struct file *= file, char __user *buf, =20 desc =3D scnprintf(buff, sizeof(buff), "%u\n", value); =20 - return simple_read_from_buffer(buf, len, offset, buff, desc); + return simple_copy_to_iter(buff, &iocb->ki_pos, desc, to); } =20 -static ssize_t pwr_debugfs_current_read(struct file *file, char __user *bu= f, - size_t len, loff_t *offset) +static ssize_t pwr_debugfs_current_read(struct kiocb *iocb, struct iov_ite= r *to) { struct svc_debugfs_pwrmon_rail *pwrmon_rails =3D - file_inode(file)->i_private; + file_inode(iocb->ki_filp)->i_private; struct gb_svc *svc =3D pwrmon_rails->svc; int ret, desc; u32 value; @@ -718,14 +716,13 @@ static ssize_t pwr_debugfs_current_read(struct file *= file, char __user *buf, =20 desc =3D scnprintf(buff, sizeof(buff), "%u\n", value); =20 - return simple_read_from_buffer(buf, len, offset, buff, desc); + return simple_copy_to_iter(buff, &iocb->ki_pos, desc, to); } =20 -static ssize_t pwr_debugfs_power_read(struct file *file, char __user *buf, - size_t len, loff_t *offset) +static ssize_t pwr_debugfs_power_read(struct kiocb *iocb, struct iov_iter = *to) { struct svc_debugfs_pwrmon_rail *pwrmon_rails =3D - file_inode(file)->i_private; + file_inode(iocb->ki_filp)->i_private; struct gb_svc *svc =3D pwrmon_rails->svc; int ret, desc; u32 value; @@ -741,19 +738,19 @@ static ssize_t pwr_debugfs_power_read(struct file *fi= le, char __user *buf, =20 desc =3D scnprintf(buff, sizeof(buff), "%u\n", value); =20 - return simple_read_from_buffer(buf, len, offset, buff, desc); + return simple_copy_to_iter(buff, &iocb->ki_pos, desc, to); } =20 static const struct file_operations pwrmon_debugfs_voltage_fops =3D { - .read =3D pwr_debugfs_voltage_read, + .read_iter =3D pwr_debugfs_voltage_read, }; =20 static const struct file_operations pwrmon_debugfs_current_fops =3D { - .read =3D pwr_debugfs_current_read, + .read_iter =3D pwr_debugfs_current_read, }; =20 static const struct file_operations pwrmon_debugfs_power_fops =3D { - .read =3D pwr_debugfs_power_read, + .read_iter =3D pwr_debugfs_power_read, }; =20 static void gb_svc_pwrmon_debugfs_init(struct gb_svc *svc) diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/cam= era.c index a8173aa3a995..f18f690a31ee 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -1086,10 +1086,9 @@ static const struct gb_camera_debugfs_entry gb_camer= a_debugfs_entries[] =3D { }, }; =20 -static ssize_t gb_camera_debugfs_read(struct file *file, char __user *buf, - size_t len, loff_t *offset) +static ssize_t gb_camera_debugfs_read(struct kiocb *iocb, struct iov_iter = *to) { - const struct gb_camera_debugfs_entry *op =3D file->private_data; + const struct gb_camera_debugfs_entry *op =3D iocb->ki_filp->private_data; struct gb_camera *gcam =3D file_inode(file)->i_private; struct gb_camera_debugfs_buffer *buffer; ssize_t ret; @@ -1103,23 +1102,22 @@ static ssize_t gb_camera_debugfs_read(struct file *= file, char __user *buf, =20 buffer =3D &gcam->debugfs.buffers[op->buffer]; =20 - return simple_read_from_buffer(buf, len, offset, buffer->data, - buffer->length); + return simple_copy_to_iter(buffer->data, &iocb->ki_pos, buffer->length, + to); } =20 -static ssize_t gb_camera_debugfs_write(struct file *file, - const char __user *buf, size_t len, - loff_t *offset) +static ssize_t gb_camera_debugfs_write(struct kiocb *iocb, struct iov_iter= *from) { - const struct gb_camera_debugfs_entry *op =3D file->private_data; + const struct gb_camera_debugfs_entry *op =3D iocb->ki_filp->private_data; struct gb_camera *gcam =3D file_inode(file)->i_private; + size_t len =3D iov_iter_count(from); ssize_t ret; char *kbuf; =20 if (len > 1024) return -EINVAL; =20 - kbuf =3D memdup_user_nul(buf, len); + kbuf =3D iterdup_nul(buf, len); if (IS_ERR(kbuf)) return PTR_ERR(kbuf); =20 @@ -1149,8 +1147,8 @@ static int gb_camera_debugfs_open(struct inode *inode= , struct file *file) =20 static const struct file_operations gb_camera_debugfs_ops =3D { .open =3D gb_camera_debugfs_open, - .read =3D gb_camera_debugfs_read, - .write =3D gb_camera_debugfs_write, + .read_iter =3D gb_camera_debugfs_read, + .write_iter =3D gb_camera_debugfs_write, }; =20 static int gb_camera_debugfs_init(struct gb_camera *gcam) diff --git a/drivers/staging/greybus/raw.c b/drivers/staging/greybus/raw.c index 836d35e5fa85..44b85032b755 100644 --- a/drivers/staging/greybus/raw.c +++ b/drivers/staging/greybus/raw.c @@ -284,6 +284,7 @@ static ssize_t raw_write(struct file *file, const char = __user *buf, =20 return count; } +FOPS_WRITE_ITER_HELPER(raw_write); =20 static ssize_t raw_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) @@ -316,11 +317,12 @@ static ssize_t raw_read(struct file *file, char __use= r *buf, size_t count, mutex_unlock(&raw->list_lock); return retval; } +FOPS_READ_ITER_HELPER(raw_read); =20 static const struct file_operations raw_fops =3D { .owner =3D THIS_MODULE, - .write =3D raw_write, - .read =3D raw_read, + .write_iter =3D raw_write_iter, + .read_iter =3D raw_read_iter, .open =3D raw_open, .llseek =3D noop_llseek, }; --=20 2.43.0