From nobody Fri Dec 19 04:23:28 2025 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 D4EB312FB27 for ; Thu, 11 Apr 2024 15:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849632; cv=none; b=HpsXY5C9+FfZcJjoxfvhMzbDh02Im9yWMvDd7jxvZf3s39FNGDeT//7XJcnL78S45sYVPxZmnLCH1J/hm3ZZyxI7rEHojy8Jqde/BXvtlsnxLABcyXYvFT/RUzyN7TjLqvbEcLKPqjvkriC3MUXOixrlVHWuwQaxnGDKrVdnwxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849632; c=relaxed/simple; bh=LsKfHEdm3+sfLpTCdcPfNA/yJBUTGKlz7wgkVgloVGo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C2xPM0/nWPPWE0HDAwyrk0CP2xs3shJhAwZlEhHjQqC38k7xtlkZCStwg0XYPdpeHFt73jUYEb+A1tuideE/g6dr87uJri0O4Or9rpjz6/2e19tAA6U6IhD+rXC8te939ylRpd4XY9D4l95waw1Jfw2zO5FErZfgyE0N+TXiGc0= 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=X7laa+Db; arc=none smtp.client-ip=209.85.166.49 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="X7laa+Db" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7d6812b37a6so8893339f.0 for ; Thu, 11 Apr 2024 08:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849630; x=1713454430; 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=2N9ahDuoY+zuQ2pr2PQD3XrVwZo+VQLYGz05dfATnSU=; b=X7laa+DbJkZ1QgBv1wZamEyZ3xMO2Kx449hhNYbHOIe4JSjxm+weH8CWTNDpvh1Xt9 /9ZXeWI1au/SPEujq2t+wcpwBAGoCXc+ieeJG9I7I2abgNujRNLtMwNurwV3V/Ib7+ls 0U8VG1+gTUXnGiFHzSWUqxfdQe/mobA6NaWw46Gul8M3DQ74M7cwzlHtkBzgChuESEI7 GY9dYbrFYjQo76NMzq2K8/ANzkoJJ7ECZ7VyuKlp7DEuGxNNPSolR1t6Xk5h5kHgkAKK PF3GuQOOWQ7aVA7QKFqWDq+78LBRL0m8qdHcrEwwcHFpzjkx2JkNYkyvXdo3LoQjtXdX zxVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849630; x=1713454430; 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=2N9ahDuoY+zuQ2pr2PQD3XrVwZo+VQLYGz05dfATnSU=; b=jeADzV9J/pWSnrYJOQlePYVrYosI6gTs2esfzR05tjfdTZycO9+Lhr2cUXQgVV7TiM lS/0EVtetXtfnsvDBiKhkacM0x447tec8HmE50Mjgkuj0mnY2mIf2jDdyUzeVzLjfOHz KLTEvOqt19nNPqzkOWM2e4EozhkWWW3JqE/RhsKYND6LrrUhbHMBYt/NFr2cBviiyGMl p6G5KcCUwSWrdCz5K6lK8DGzdXbNNAXJYTWu6aaBqNqWOYVsNV/OP2NsevpUsdo9/T/w +Rnpemijfh4qQ944lXKNMRzYKYBWilHg+slNexqMnyluvhQSWGqJbVEmA7Z6Ty+O0v+6 Ag2g== X-Gm-Message-State: AOJu0YwQPpUVQ7ecYxU03zjEA+iNOSHpggd0UozROBiBcxDtYQaDXFvu MUH/wNJ69ztfkYe0oA66SXxhMGRlObHHuFl04r3xCUfPg2GjI5tSpQ9K+pNdWXdG9ha93H5yxxz l X-Google-Smtp-Source: AGHT+IFQbCHYS0+c2WDHitRJDmcwowpJbdZqr759gqvFJ74QCi5r692XOEO+HzeiGFKiFnWStqAW6g== X-Received: by 2002:a6b:5b10:0:b0:7d0:bd2b:43ba with SMTP id v16-20020a6b5b10000000b007d0bd2b43bamr216099ioh.0.1712849629726; Thu, 11 Apr 2024 08:33:49 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:33:48 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 075/437] kernel/power: convert to read/write iterators Date: Thu, 11 Apr 2024 09:13:35 -0600 Message-ID: <20240411153126.16201-76-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 --- kernel/power/qos.c | 21 ++++++++++----------- kernel/power/user.c | 28 ++++++++++++---------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 4244b069442e..eeea74bc639a 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -363,10 +363,9 @@ static int cpu_latency_qos_release(struct inode *inode= , struct file *filp) return 0; } =20 -static ssize_t cpu_latency_qos_read(struct file *filp, char __user *buf, - size_t count, loff_t *f_pos) +static ssize_t cpu_latency_qos_read(struct kiocb *iocb, struct iov_iter *t= o) { - struct pm_qos_request *req =3D filp->private_data; + struct pm_qos_request *req =3D iocb->ki_filp->private_data; unsigned long flags; s32 value; =20 @@ -377,33 +376,33 @@ static ssize_t cpu_latency_qos_read(struct file *filp= , char __user *buf, value =3D pm_qos_get_value(&cpu_latency_constraints); spin_unlock_irqrestore(&pm_qos_lock, flags); =20 - return simple_read_from_buffer(buf, count, f_pos, &value, sizeof(s32)); + return simple_copy_to_iter(&value, &iocb->ki_pos, sizeof(s32), to); } =20 -static ssize_t cpu_latency_qos_write(struct file *filp, const char __user = *buf, - size_t count, loff_t *f_pos) +static ssize_t cpu_latency_qos_write(struct kiocb *iocb, struct iov_iter *= from) { + size_t count =3D iov_iter_count(from); s32 value; =20 if (count =3D=3D sizeof(s32)) { - if (copy_from_user(&value, buf, sizeof(s32))) + if (!copy_from_iter_full(&value, sizeof(s32), from)) return -EFAULT; } else { int ret; =20 - ret =3D kstrtos32_from_user(buf, count, 16, &value); + ret =3D kstrtos32_from_iter(from, count, 16, &value); if (ret) return ret; } =20 - cpu_latency_qos_update_request(filp->private_data, value); + cpu_latency_qos_update_request(iocb->ki_filp->private_data, value); =20 return count; } =20 static const struct file_operations cpu_latency_qos_fops =3D { - .write =3D cpu_latency_qos_write, - .read =3D cpu_latency_qos_read, + .write_iter =3D cpu_latency_qos_write, + .read_iter =3D cpu_latency_qos_read, .open =3D cpu_latency_qos_open, .release =3D cpu_latency_qos_release, .llseek =3D noop_llseek, diff --git a/kernel/power/user.c b/kernel/power/user.c index 3aa41ba22129..1dcdfbf240a9 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -131,17 +131,16 @@ static int snapshot_release(struct inode *inode, stru= ct file *filp) return 0; } =20 -static ssize_t snapshot_read(struct file *filp, char __user *buf, - size_t count, loff_t *offp) +static ssize_t snapshot_read(struct kiocb *iocb, struct iov_iter *to) { - loff_t pg_offp =3D *offp & ~PAGE_MASK; + loff_t pg_offp =3D iocb->ki_pos & ~PAGE_MASK; struct snapshot_data *data; unsigned int sleep_flags; ssize_t res; =20 sleep_flags =3D lock_system_sleep(); =20 - data =3D filp->private_data; + data =3D iocb->ki_filp->private_data; if (!data->ready) { res =3D -ENODATA; goto Unlock; @@ -154,10 +153,9 @@ static ssize_t snapshot_read(struct file *filp, char _= _user *buf, res =3D PAGE_SIZE - pg_offp; } =20 - res =3D simple_read_from_buffer(buf, count, &pg_offp, - data_of(data->handle), res); + res =3D simple_copy_to_iter(data_of(data->handle), &iocb->ki_pos, res, to= ); if (res > 0) - *offp +=3D res; + iocb->ki_pos +=3D res; =20 Unlock: unlock_system_sleep(sleep_flags); @@ -165,10 +163,9 @@ static ssize_t snapshot_read(struct file *filp, char _= _user *buf, return res; } =20 -static ssize_t snapshot_write(struct file *filp, const char __user *buf, - size_t count, loff_t *offp) +static ssize_t snapshot_write(struct kiocb *iocb, struct iov_iter *from) { - loff_t pg_offp =3D *offp & ~PAGE_MASK; + loff_t pg_offp =3D iocb->ki_pos & ~PAGE_MASK; struct snapshot_data *data; unsigned long sleep_flags; ssize_t res; @@ -180,7 +177,7 @@ static ssize_t snapshot_write(struct file *filp, const = char __user *buf, =20 sleep_flags =3D lock_system_sleep(); =20 - data =3D filp->private_data; + data =3D iocb->ki_filp->private_data; =20 if (!pg_offp) { res =3D snapshot_write_next(&data->handle); @@ -195,10 +192,9 @@ static ssize_t snapshot_write(struct file *filp, const= char __user *buf, goto unlock; } =20 - res =3D simple_write_to_buffer(data_of(data->handle), res, &pg_offp, - buf, count); + res =3D simple_copy_from_iter(data_of(data->handle), &iocb->ki_pos, res, = from); if (res > 0) - *offp +=3D res; + iocb->ki_pos +=3D res; unlock: unlock_system_sleep(sleep_flags); =20 @@ -445,8 +441,8 @@ snapshot_compat_ioctl(struct file *file, unsigned int c= md, unsigned long arg) static const struct file_operations snapshot_fops =3D { .open =3D snapshot_open, .release =3D snapshot_release, - .read =3D snapshot_read, - .write =3D snapshot_write, + .read_iter =3D snapshot_read, + .write_iter =3D snapshot_write, .llseek =3D no_llseek, .unlocked_ioctl =3D snapshot_ioctl, #ifdef CONFIG_COMPAT --=20 2.43.0