From nobody Sun Feb 8 06:36:32 2026 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 490FF1E2469 for ; Thu, 11 Apr 2024 15:40:33 +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=1712850034; cv=none; b=RvvYSHCKyYeHuQuhT/CLWF9iN+7FtKmwPZZJYHuhzjzOvAFjt6F12SMol6qkKG34JQOL74TzSMnbTyX4YN1O1mUukJdc2nFbJ+VjsgH5aNeK9roTdUpeI0TdM15HBdbDenwI2Fm9zgUOLDIaAH5cDxxfb3IofYx+MEf/8r5usjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712850034; c=relaxed/simple; bh=I8dXB4IwiX0IwvNcDtJ4Kp6Q4HUSfbarUFatjYcceNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LCV4asYAtToncOb2y+m4zk2VP10fdcQ+KQAScCqV68pCsgU/pxO0+kC5ezlcMIdmJ9AkW7Rf5IwwoqlAW+p+/cMRAXUQSGQ7e9ao4TlHgG0HrW1G05VaEuhSLtfTta1VRbm+oRv7mbwds1tXQjewvdB+IiXLLrZoZOXRPzyHqcA= 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=MIpgOX+3; 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="MIpgOX+3" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-36a34b68277so118835ab.0 for ; Thu, 11 Apr 2024 08:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712850032; x=1713454832; 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=JNYlDh++hWQKeJgeJ1TbZWHR3S/TzYrOtOOXTxHryuI=; b=MIpgOX+3+tnRLptRgnPm4wwpKYhBBGEZQC0Fw7JTHSUsCyRmH2TOobGeXNz+q+pYPC XdL8eXgFT6eo28qL6M1rZ7jMuCcA4b6a0AIDWm2KB3dZktG0Shb80hke5E7jZWD6CYTa HgMz5BAHvas3tyfVJEPhXu0qvoW7Y4wsoTLTVhBBALfctCWIIDHEzUzZQCLv0OUrMB+X jyZkizS6K2qq3TMQswGzYBRTF6LHwcAAUXm80EQslf5bbkHUULKtNrSCh3SI3WkmB7Oq GhbPCX03tFasZja6t6qMVeF0Gb1zUFhjxPh9HSAthd5ZMujkokt70M3ft6sKQSiqNi00 Gq2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712850032; x=1713454832; 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=JNYlDh++hWQKeJgeJ1TbZWHR3S/TzYrOtOOXTxHryuI=; b=f3YHEVy8qn5cLknShJk7ujszp5FZaj+KuEuBo6sfHMDfrRNJajzmRZDRLRwzk4EJ82 bnX3QiYoWnmJpzQ+s5f4A+6rB/cX4UYfp0ZNIPYFhwddzRBgKzD19pxZrJkOY8GROWdl OEb/Vc8xceduyfY+zIcdJUjXwzI+Xh3o/fFQGHDNp2OEZK+brE+jez6KlVRdT5Jj3shA BcnBv59KaIQd1CR7nb57sOwXoV+2PleKJr6UU04oEPnEhgbZQPZBy9Fo6RKOWxLTrSum Vw7y3MzsPzLfZm/hSGuPZh/U3lAZHK2GDRdx0OO3QD6/fHiGbdZXsj75cF/qnzRDcsPF J80A== X-Gm-Message-State: AOJu0YyFZOZuWg6rdR2/5NM/Au0ScbidRmd2oDj4bOZA4l9V6ZgpBorr KFlY/Cy5NrnDvuR/JMtO7A3FXVl6Ons/2d+z6N4q50ND2rjzrFNqiOR+M35MrUBWco7xcV6rSVS D X-Google-Smtp-Source: AGHT+IHUAKRjI2tZze6ZIASuYQzzXyv3oo0j6+1bpYH1XDW1sQnBFM7c9lZDEJ9xnbLbcWXOwkvqFA== X-Received: by 2002:a05:6602:4ed7:b0:7d5:ddc8:504d with SMTP id gk23-20020a0566024ed700b007d5ddc8504dmr198535iob.0.1712850032141; Thu, 11 Apr 2024 08:40:32 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:40:30 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Bui Quang Minh , Jens Axboe Subject: [PATCH 321/437] drivers/net/brocade-bnad: convert to read/write iterators Date: Thu, 11 Apr 2024 09:17:41 -0600 Message-ID: <20240411153126.16201-322-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" From: Bui Quang Minh Signed-off-by: Bui Quang Minh Signed-off-by: Jens Axboe --- .../net/ethernet/brocade/bna/bnad_debugfs.c | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/= ethernet/brocade/bna/bnad_debugfs.c index 97291bfbeea5..88451f739f1f 100644 --- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c +++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c @@ -229,16 +229,15 @@ bnad_debugfs_lseek(struct file *file, loff_t offset, = int orig) } =20 static ssize_t -bnad_debugfs_read(struct file *file, char __user *buf, - size_t nbytes, loff_t *pos) +bnad_debugfs_read_iter(struct kiocb *iocb, struct iov_iter *to) { - struct bnad_debug_info *debug =3D file->private_data; + struct bnad_debug_info *debug =3D iocb->ki_filp->private_data; =20 if (!debug || !debug->debug_buffer) return 0; =20 - return simple_read_from_buffer(buf, nbytes, pos, - debug->debug_buffer, debug->buffer_len); + return simple_copy_to_iter(debug->debug_buffer, &iocb->ki_pos, + debug->buffer_len, to); } =20 #define BFA_REG_CT_ADDRSZ (0x40000) @@ -275,18 +274,18 @@ bna_reg_offset_check(struct bfa_ioc *ioc, u32 offset,= u32 len) } =20 static ssize_t -bnad_debugfs_read_regrd(struct file *file, char __user *buf, - size_t nbytes, loff_t *pos) +bnad_debugfs_read_regrd_iter(struct kiocb *iocb, struct iov_iter *to) { - struct bnad_debug_info *regrd_debug =3D file->private_data; + struct bnad_debug_info *regrd_debug =3D iocb->ki_filp->private_data; struct bnad *bnad =3D (struct bnad *)regrd_debug->i_private; ssize_t rc; + loff_t *pos =3D &iocb->ki_pos; + size_t nbytes =3D iov_iter_count(to); =20 if (!bnad->regdata) return 0; =20 - rc =3D simple_read_from_buffer(buf, nbytes, pos, - bnad->regdata, bnad->reglen); + rc =3D simple_copy_to_iter(bnad->regdata, pos, bnad->reglen, to); =20 if ((*pos + nbytes) >=3D bnad->reglen) { kfree(bnad->regdata); @@ -298,10 +297,9 @@ bnad_debugfs_read_regrd(struct file *file, char __user= *buf, } =20 static ssize_t -bnad_debugfs_write_regrd(struct file *file, const char __user *buf, - size_t nbytes, loff_t *ppos) +bnad_debugfs_write_regrd_iter(struct kiocb *iocb, struct iov_iter *from) { - struct bnad_debug_info *regrd_debug =3D file->private_data; + struct bnad_debug_info *regrd_debug =3D iocb->ki_filp->private_data; struct bnad *bnad =3D (struct bnad *)regrd_debug->i_private; struct bfa_ioc *ioc =3D &bnad->bna.ioceth.ioc; int rc, i; @@ -310,9 +308,10 @@ bnad_debugfs_write_regrd(struct file *file, const char= __user *buf, void __iomem *rb, *reg_addr; unsigned long flags; void *kern_buf; + size_t nbytes =3D iov_iter_count(from); =20 /* Copy the user space buf */ - kern_buf =3D memdup_user_nul(buf, nbytes); + kern_buf =3D iterdup_nul(from, nbytes); if (IS_ERR(kern_buf)) return PTR_ERR(kern_buf); =20 @@ -359,10 +358,9 @@ bnad_debugfs_write_regrd(struct file *file, const char= __user *buf, } =20 static ssize_t -bnad_debugfs_write_regwr(struct file *file, const char __user *buf, - size_t nbytes, loff_t *ppos) +bnad_debugfs_write_regwr_iter(struct kiocb *iocb, struct iov_iter *from) { - struct bnad_debug_info *debug =3D file->private_data; + struct bnad_debug_info *debug =3D iocb->ki_filp->private_data; struct bnad *bnad =3D (struct bnad *)debug->i_private; struct bfa_ioc *ioc =3D &bnad->bna.ioceth.ioc; int rc; @@ -370,9 +368,10 @@ bnad_debugfs_write_regwr(struct file *file, const char= __user *buf, void __iomem *reg_addr; unsigned long flags; void *kern_buf; + size_t nbytes =3D iov_iter_count(from); =20 /* Copy the user space buf */ - kern_buf =3D memdup_user_nul(buf, nbytes); + kern_buf =3D iterdup_nul(from, nbytes); if (IS_ERR(kern_buf)) return PTR_ERR(kern_buf); =20 @@ -434,7 +433,7 @@ static const struct file_operations bnad_debugfs_op_fwt= rc =3D { .owner =3D THIS_MODULE, .open =3D bnad_debugfs_open_fwtrc, .llseek =3D bnad_debugfs_lseek, - .read =3D bnad_debugfs_read, + .read_iter =3D bnad_debugfs_read_iter, .release =3D bnad_debugfs_buffer_release, }; =20 @@ -442,7 +441,7 @@ static const struct file_operations bnad_debugfs_op_fws= ave =3D { .owner =3D THIS_MODULE, .open =3D bnad_debugfs_open_fwsave, .llseek =3D bnad_debugfs_lseek, - .read =3D bnad_debugfs_read, + .read_iter =3D bnad_debugfs_read_iter, .release =3D bnad_debugfs_buffer_release, }; =20 @@ -450,8 +449,8 @@ static const struct file_operations bnad_debugfs_op_reg= rd =3D { .owner =3D THIS_MODULE, .open =3D bnad_debugfs_open_reg, .llseek =3D bnad_debugfs_lseek, - .read =3D bnad_debugfs_read_regrd, - .write =3D bnad_debugfs_write_regrd, + .read_iter =3D bnad_debugfs_read_regrd_iter, + .write_iter =3D bnad_debugfs_write_regrd_iter, .release =3D bnad_debugfs_release, }; =20 @@ -459,7 +458,7 @@ static const struct file_operations bnad_debugfs_op_reg= wr =3D { .owner =3D THIS_MODULE, .open =3D bnad_debugfs_open_reg, .llseek =3D bnad_debugfs_lseek, - .write =3D bnad_debugfs_write_regwr, + .write_iter =3D bnad_debugfs_write_regwr_iter, .release =3D bnad_debugfs_release, }; =20 @@ -467,7 +466,7 @@ static const struct file_operations bnad_debugfs_op_drv= info =3D { .owner =3D THIS_MODULE, .open =3D bnad_debugfs_open_drvinfo, .llseek =3D bnad_debugfs_lseek, - .read =3D bnad_debugfs_read, + .read_iter =3D bnad_debugfs_read_iter, .release =3D bnad_debugfs_buffer_release, }; =20 --=20 2.43.0