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 50A133DAC03 for ; Thu, 11 Apr 2024 15:36:51 +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=1712849814; cv=none; b=ecDiHMiMdlEtwvsjvqjkL984WFYh66M261vMQvzZPeP1ue7N4OOESOg0eWb0GMSiM+iH1HYUkJehGugRyUOzb5CP3r/glPxG2KmURN7zHgywQq1xpwkXXseARAbgdZoTUfchjieKGTFOekEnOg3e64J5Rt8NWVlwq84j0IToImE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849814; c=relaxed/simple; bh=CBMg4hLBtzUqDlU4Be8FlKvPn5MyY9zwPHlF0/XAwN8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oFTVzLaS9gStoqE2ahj+pPXRNceMnriLKu/iud8zfVG8cOgSqQuTME+VQQhBngKcDy3TKleuUyUaKn4sivnjRoAfJOQ1MQk5UiOnhbOit3pL7yL9BE4qWoVzWCO6rhci1PnQ3YbEo7mJ7me2nhSEDnxnVuw6V/U7b1RztQIJpSg= 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=xy9GfMuR; 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="xy9GfMuR" Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7d5ed700c2dso16173039f.0 for ; Thu, 11 Apr 2024 08:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849810; x=1713454610; 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=H43tdm6qXVY7UF8KlBQbACCpMF5pPhva70Q2Qo/15+U=; b=xy9GfMuRQUlmuqwi6cX7RCAuHhoomC5Oyg5iZB7MVTBj+C1Uk8ipYYxBoGivXbbN/J hwN2iCd0oRKWTEuEzvl4fA2atyKxL87TQMzI+IDj8NSWZfiCa6+dZUC33KblT9cwP6dA ZYZTo7Wt/s2fCankU+h9DnTedDK40Rr/rg2rRknVo5xZQdRSi9NkVZeLCGPSLoCUvvpv TMue9AEN2GScbJFnzbBLrdyDaOBIz7Qu63OBqeEs9NsP+kzSPtUL8jT3YF8Aj8XpUwGV vMAmkkcpv8OxFHgK7iPwkSU9IVqnuGitQZuOCJIH+Tl8ktoXmgRxdsfK7Cxneqiyqwv5 l/pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849810; x=1713454610; 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=H43tdm6qXVY7UF8KlBQbACCpMF5pPhva70Q2Qo/15+U=; b=BnirhbN9tNaxiGtDz2EPdZKnLkFWgw27hCBecCu8BQo9QQgytPO5BP0BHs2h9JAeBc wG5Bmp7NEljFB/AGPWQkbtWM2Z9WMq0qbqdKkKB9QCWgWdDOnGduOaW3ycwSFcu8qh0R vHy5AjYzbbjkS21IlXnsmR5Iw5xEvU9uvsB/n+pWVq8013E2JGNktHEUfpEI4Y2CDaNZ Dfc4oLVc/EEqdCQGBNZoRbGG3VnyQ+AP2MqLQGE7rEdofxrflcuJs3FIT6WWuGbxQiMJ B1gZbKXIVvW0tnVgxOcgrxaRsYUQI70QKZ55Y/r0YVvSGP0VU/HGl0vWNSqpC6V50Vg1 eKfQ== X-Gm-Message-State: AOJu0YxjWAbvvlRFYXqMmIpuBJzYpHbzTWjHn2oiNQkixNrJ6S8RRuj+ j64IzjOUjuSgEPFypKxlv7IFOaF0mDvdjQx5gcz0wbVXS1c6Ix00HgScRkXs9LI5cAX1AvetbT4 O X-Google-Smtp-Source: AGHT+IHevWHDLKSNkMYGkAdh49/6+nBkaiIRtq0YdbJwllt1Yy/dEBC5kR3B8KifSuRC7CjjXFBctg== X-Received: by 2002:a6b:f312:0:b0:7d5:de23:13a9 with SMTP id m18-20020a6bf312000000b007d5de2313a9mr162857ioh.1.1712849810029; Thu, 11 Apr 2024 08:36:50 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:36:49 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 185/437] scsi: bfa: convert to read/write iterators Date: Thu, 11 Apr 2024 09:15:25 -0600 Message-ID: <20240411153126.16201-186-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/scsi/bfa/bfad_debugfs.c | 51 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugf= s.c index 52db147d9979..f9e1842e3a59 100644 --- a/drivers/scsi/bfa/bfad_debugfs.c +++ b/drivers/scsi/bfa/bfad_debugfs.c @@ -167,17 +167,15 @@ bfad_debugfs_lseek(struct file *file, loff_t offset, = int orig) debug->buffer_len); } =20 -static ssize_t -bfad_debugfs_read(struct file *file, char __user *buf, - size_t nbytes, loff_t *pos) +static ssize_t bfad_debugfs_read(struct kiocb *iocb, struct iov_iter *to) { - struct bfad_debug_info *debug =3D file->private_data; + struct bfad_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) @@ -210,22 +208,21 @@ bfad_reg_offset_check(struct bfa_s *bfa, u32 offset, = u32 len) return BFA_STATUS_OK; } =20 -static ssize_t -bfad_debugfs_read_regrd(struct file *file, char __user *buf, - size_t nbytes, loff_t *pos) +static ssize_t bfad_debugfs_read_regrd(struct kiocb *iocb, struct iov_iter= *to) { - struct bfad_debug_info *regrd_debug =3D file->private_data; + struct bfad_debug_info *regrd_debug =3D iocb->ki_filp->private_data; struct bfad_port_s *port =3D (struct bfad_port_s *)regrd_debug->i_private; + size_t nbytes =3D iov_iter_count(to); struct bfad_s *bfad =3D port->bfad; ssize_t rc; =20 if (!bfad->regdata) return 0; =20 - rc =3D simple_read_from_buffer(buf, nbytes, pos, - bfad->regdata, bfad->reglen); + rc =3D simple_copy_to_iter(bfad->regdata, &iocb->ki_pos, bfad->reglen, + to); =20 - if ((*pos + nbytes) >=3D bfad->reglen) { + if ((iocb->ki_pos + nbytes) >=3D bfad->reglen) { kfree(bfad->regdata); bfad->regdata =3D NULL; bfad->reglen =3D 0; @@ -235,11 +232,11 @@ bfad_debugfs_read_regrd(struct file *file, char __use= r *buf, } =20 static ssize_t -bfad_debugfs_write_regrd(struct file *file, const char __user *buf, - size_t nbytes, loff_t *ppos) +bfad_debugfs_write_regrd(struct kiocb *iocb, struct iov_iter *from) { - struct bfad_debug_info *regrd_debug =3D file->private_data; + struct bfad_debug_info *regrd_debug =3D iocb->ki_filp->private_data; struct bfad_port_s *port =3D (struct bfad_port_s *)regrd_debug->i_private; + size_t nbytes =3D iov_iter_count(from); struct bfad_s *bfad =3D port->bfad; struct bfa_s *bfa =3D &bfad->bfa; struct bfa_ioc_s *ioc =3D &bfa->ioc; @@ -250,7 +247,7 @@ bfad_debugfs_write_regrd(struct file *file, const char = __user *buf, unsigned long flags; void *kern_buf; =20 - kern_buf =3D memdup_user(buf, nbytes); + kern_buf =3D iterdup(from, nbytes); if (IS_ERR(kern_buf)) return PTR_ERR(kern_buf); =20 @@ -304,11 +301,11 @@ bfad_debugfs_write_regrd(struct file *file, const cha= r __user *buf, } =20 static ssize_t -bfad_debugfs_write_regwr(struct file *file, const char __user *buf, - size_t nbytes, loff_t *ppos) +bfad_debugfs_write_regwr(struct kiocb *iocb, struct iov_iter *from) { - struct bfad_debug_info *debug =3D file->private_data; + struct bfad_debug_info *debug =3D iocb->ki_filp->private_data; struct bfad_port_s *port =3D (struct bfad_port_s *)debug->i_private; + size_t nbytes =3D iov_iter_count(from); struct bfad_s *bfad =3D port->bfad; struct bfa_s *bfa =3D &bfad->bfa; struct bfa_ioc_s *ioc =3D &bfa->ioc; @@ -317,7 +314,7 @@ bfad_debugfs_write_regwr(struct file *file, const char = __user *buf, unsigned long flags; void *kern_buf; =20 - kern_buf =3D memdup_user(buf, nbytes); + kern_buf =3D iterdup(from, nbytes); if (IS_ERR(kern_buf)) return PTR_ERR(kern_buf); =20 @@ -382,7 +379,7 @@ static const struct file_operations bfad_debugfs_op_drv= trc =3D { .owner =3D THIS_MODULE, .open =3D bfad_debugfs_open_drvtrc, .llseek =3D bfad_debugfs_lseek, - .read =3D bfad_debugfs_read, + .read_iter =3D bfad_debugfs_read, .release =3D bfad_debugfs_release, }; =20 @@ -390,7 +387,7 @@ static const struct file_operations bfad_debugfs_op_fwt= rc =3D { .owner =3D THIS_MODULE, .open =3D bfad_debugfs_open_fwtrc, .llseek =3D bfad_debugfs_lseek, - .read =3D bfad_debugfs_read, + .read_iter =3D bfad_debugfs_read, .release =3D bfad_debugfs_release_fwtrc, }; =20 @@ -398,7 +395,7 @@ static const struct file_operations bfad_debugfs_op_fws= ave =3D { .owner =3D THIS_MODULE, .open =3D bfad_debugfs_open_fwsave, .llseek =3D bfad_debugfs_lseek, - .read =3D bfad_debugfs_read, + .read_iter =3D bfad_debugfs_read, .release =3D bfad_debugfs_release_fwtrc, }; =20 @@ -406,8 +403,8 @@ static const struct file_operations bfad_debugfs_op_reg= rd =3D { .owner =3D THIS_MODULE, .open =3D bfad_debugfs_open_reg, .llseek =3D bfad_debugfs_lseek, - .read =3D bfad_debugfs_read_regrd, - .write =3D bfad_debugfs_write_regrd, + .read_iter =3D bfad_debugfs_read_regrd, + .write_iter =3D bfad_debugfs_write_regrd, .release =3D bfad_debugfs_release, }; =20 @@ -415,7 +412,7 @@ static const struct file_operations bfad_debugfs_op_reg= wr =3D { .owner =3D THIS_MODULE, .open =3D bfad_debugfs_open_reg, .llseek =3D bfad_debugfs_lseek, - .write =3D bfad_debugfs_write_regwr, + .write_iter =3D bfad_debugfs_write_regwr, .release =3D bfad_debugfs_release, }; =20 --=20 2.43.0