From nobody Fri Dec 19 06:07:54 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 BC2D915E21B for ; Thu, 11 Apr 2024 15:35:32 +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=1712849735; cv=none; b=ET34/99iG954WUPqE/oBA7oU/Ym4cpeU+C5Ucm6GsLiaBl46A2jTn6Yb5voHZfUBu6ORFtbbUKmcZwz5HKVSt0Ou1nAmORgOeUX1EAf9dmRzveO+kHWuGLyXKw72DzrfO+XByoHyps5Kox4okKu9X1SgyqPR9heCZVzLoLaUhE4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849735; c=relaxed/simple; bh=gIlHkHIf61Gez+c2sdXbASHWqOSZOEG/tbFoAfwxOpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kAKkBRoTuzMEeXzV18fmjVJVQryERuufOjinBWAWw7xzyrQ/crbQ3dJWSz5hVD/mqW6BQj/P4O0nwQRqh/0oyYRwB8uALRlhDuXMDB6VdmkNpO3erOd68o0mGycMZabcgAl3z+uZsHZPEXtY3Ytfm4V1QQJXKyVwBeP+jTfJVGk= 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=KSvwOP9W; 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="KSvwOP9W" Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7d67d1073easo9778239f.0 for ; Thu, 11 Apr 2024 08:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849731; x=1713454531; 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=ZRmIr7Avw9RuGzUP4Y4BTwANpRPwBbbiIM0lKveuv/U=; b=KSvwOP9WnimDsss4Vqdd6qm2KSD/F7OW2KCMz6lxNUQDqJ2qi/jxSZhzaArzpwu5WP HyVJSxa6SeRahjMpl06enf7vUu43kEvAkIyfYXMU7j6UB4+o+hKXzJ1/A0rKW/6qe2YU H8kCX0EyCJzUbzi0xwcwRlh0k8g2F4J4ZdXiEpDgSMtiRLVRjsWOxxGTwh1MW7cDg7Yt zslO8wP4T1PgkFtDvFehckeMFSEf65xm3bK1Sb43DjX3Ws3alRVnBodZUPQHgU3/6NRl 06AgA2472yduci4EDn5cDdyJoPkcfQ4hCWMCfFYMKyrLfA3DmHE6RbCk8PCOQc0EaUeH Y3qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849731; x=1713454531; 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=ZRmIr7Avw9RuGzUP4Y4BTwANpRPwBbbiIM0lKveuv/U=; b=qhHA2pjjawkecdeLSYItnCX8UcBSxNF1NmZtZankSYejXOhJv8XxAbmOaU8E2h0j44 gAExMgXt/mCcNJPbZX7U8UvBwvt8bjPUmF4Ko7wKBZPbkJeUQUHLpSV/4e6P9O17Yanl 63lu4My0Qh5LLPdt3XQklOoZGgJ2WAu7Sht13UnC7Vq+3Duao16G8V58yESihr7E/8r6 fnu6Uef+7ROWkpjOLb+qUlVRwJmLz2YSsMWx1lGtb2adFKMUPYTZAK1pL2r2J8/EAqlb DexlKJeTB00qDB0lMpL36t/9k3y1DSooh9gXbf30U75TAnL12Yn+wm8JrkRsdzNldaDo D44Q== X-Gm-Message-State: AOJu0YyDjyCs+dZHyrJoOrHBxrcZGkKY2nDkzkZjTIDMI2/YF5ehwAYt KoEWOg8kARJoKcvaI2V+KIybOSxhw5+FdvWxAoutM/odoXeTRfZNH5oQo6G6Y6Fqymsb8Ir8Wj5 X X-Google-Smtp-Source: AGHT+IEd8+9TyzkO0VQDRsEXi2i7drOC29DRylhM7Oed4nEzkPukvXGRdIDGE/p1lc7R6G32JP54cA== X-Received: by 2002:a6b:7b05:0:b0:7d6:60dc:bc8e with SMTP id l5-20020a6b7b05000000b007d660dcbc8emr192372iop.1.1712849731018; Thu, 11 Apr 2024 08:35:31 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:35:30 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 138/437] drm/i915: convert to read/write iterators Date: Thu, 11 Apr 2024 09:14:38 -0600 Message-ID: <20240411153126.16201-139-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 --- .../drm/i915/display/intel_display_debugfs.c | 114 +++++++++--------- .../display/intel_display_debugfs_params.c | 36 +++--- drivers/gpu/drm/i915/display/intel_hotplug.c | 28 ++--- drivers/gpu/drm/i915/display/intel_wm.c | 42 +++---- drivers/gpu/drm/i915/display/skl_watermark.c | 14 +-- drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_debugfs.h | 2 +- .../drm/i915/gt/uc/intel_guc_log_debugfs.c | 13 +- drivers/gpu/drm/i915/i915_debugfs_params.c | 43 ++++--- drivers/gpu/drm/i915/i915_gpu_error.c | 28 ++--- drivers/gpu/drm/i915/i915_perf.c | 3 +- 11 files changed, 156 insertions(+), 169 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers= /gpu/drm/i915/display/intel_display_debugfs.c index b99c024b0934..b8d03be584dd 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -513,26 +513,24 @@ static int crtc_updates_open(struct inode *inode, str= uct file *file) return single_open(file, crtc_updates_show, inode->i_private); } =20 -static ssize_t crtc_updates_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t crtc_updates_write(struct kiocb *iocb, struct iov_iter *fro= m) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_crtc *crtc =3D m->private; =20 /* May race with an update. Meh. */ memset(&crtc->debug.vbl, 0, sizeof(crtc->debug.vbl)); =20 - return len; + return iov_iter_count(from); } =20 static const struct file_operations crtc_updates_fops =3D { .owner =3D THIS_MODULE, .open =3D crtc_updates_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D crtc_updates_write + .write_iter =3D crtc_updates_write }; =20 static void crtc_updates_add(struct intel_crtc *crtc) @@ -801,24 +799,24 @@ static int i915_dp_mst_info(struct seq_file *m, void = *unused) return 0; } =20 -static ssize_t i915_displayport_test_active_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_displayport_test_active_write(struct kiocb *iocb, + struct iov_iter *from) { char *input_buffer; int status =3D 0; struct drm_device *dev; struct drm_connector *connector; struct drm_connector_list_iter conn_iter; + size_t len =3D iov_iter_count(from); struct intel_dp *intel_dp; int val =3D 0; =20 - dev =3D ((struct seq_file *)file->private_data)->private; + dev =3D ((struct seq_file *)iocb->ki_filp->private_data)->private; =20 if (len =3D=3D 0) return 0; =20 - input_buffer =3D memdup_user_nul(ubuf, len); + input_buffer =3D iterdup_nul(from, len); if (IS_ERR(input_buffer)) return PTR_ERR(input_buffer); =20 @@ -856,7 +854,7 @@ static ssize_t i915_displayport_test_active_write(struc= t file *file, if (status < 0) return status; =20 - *offp +=3D len; + iocb->ki_pos +=3D len; return len; } =20 @@ -903,10 +901,10 @@ static int i915_displayport_test_active_open(struct i= node *inode, static const struct file_operations i915_displayport_test_active_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_displayport_test_active_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_displayport_test_active_write + .write_iter =3D i915_displayport_test_active_write, }; =20 static int i915_displayport_test_data_show(struct seq_file *m, void *data) @@ -994,16 +992,15 @@ static int i915_displayport_test_type_show(struct seq= _file *m, void *data) DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_type); =20 static ssize_t -i915_fifo_underrun_reset_write(struct file *filp, - const char __user *ubuf, - size_t cnt, loff_t *ppos) +i915_fifo_underrun_reset_write(struct kiocb *iocb, struct iov_iter *from) { - struct drm_i915_private *dev_priv =3D filp->private_data; + struct drm_i915_private *dev_priv =3D iocb->ki_filp->private_data; + size_t cnt =3D iov_iter_count(from); struct intel_crtc *crtc; int ret; bool reset; =20 - ret =3D kstrtobool_from_user(ubuf, cnt, &reset); + ret =3D kstrtobool_from_iter(from, cnt, &reset); if (ret) return ret; =20 @@ -1048,7 +1045,7 @@ i915_fifo_underrun_reset_write(struct file *filp, static const struct file_operations i915_fifo_underrun_reset_ops =3D { .owner =3D THIS_MODULE, .open =3D simple_open, - .write =3D i915_fifo_underrun_reset_write, + .write_iter =3D i915_fifo_underrun_reset_write, .llseek =3D default_llseek, }; =20 @@ -1259,15 +1256,15 @@ static int i915_dsc_fec_support_show(struct seq_fil= e *m, void *data) return ret; } =20 -static ssize_t i915_dsc_fec_support_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_dsc_fec_support_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_connector *connector =3D m->private; struct drm_i915_private *i915 =3D to_i915(connector->base.dev); struct intel_encoder *encoder =3D intel_attached_encoder(connector); struct intel_dp *intel_dp =3D enc_to_intel_dp(encoder); + size_t len =3D iov_iter_count(from); bool dsc_enable =3D false; int ret; =20 @@ -1277,7 +1274,7 @@ static ssize_t i915_dsc_fec_support_write(struct file= *file, drm_dbg(&i915->drm, "Copied %zu bytes from user to force DSC\n", len); =20 - ret =3D kstrtobool_from_user(ubuf, len, &dsc_enable); + ret =3D kstrtobool_from_iter(from, len, &dsc_enable); if (ret < 0) return ret; =20 @@ -1285,7 +1282,7 @@ static ssize_t i915_dsc_fec_support_write(struct file= *file, (dsc_enable) ? "true" : "false"); intel_dp->force_dsc_en =3D dsc_enable; =20 - *offp +=3D len; + iocb->ki_pos +=3D len; return len; } =20 @@ -1299,10 +1296,10 @@ static int i915_dsc_fec_support_open(struct inode *= inode, static const struct file_operations i915_dsc_fec_support_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_dsc_fec_support_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_dsc_fec_support_write + .write_iter =3D i915_dsc_fec_support_write }; =20 static int i915_dsc_bpc_show(struct seq_file *m, void *data) @@ -1335,23 +1332,22 @@ out: drm_modeset_unlock(&i915->drm.mode_config.conn= ection_mutex); return ret; } =20 -static ssize_t i915_dsc_bpc_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_dsc_bpc_write(struct kiocb *iocb, struct iov_iter *fro= m) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_connector *connector =3D m->private; struct intel_encoder *encoder =3D intel_attached_encoder(connector); struct intel_dp *intel_dp =3D enc_to_intel_dp(encoder); + size_t len =3D iov_iter_count(from); int dsc_bpc =3D 0; int ret; =20 - ret =3D kstrtoint_from_user(ubuf, len, 0, &dsc_bpc); + ret =3D kstrtoint_from_iter(from, len, 0, &dsc_bpc); if (ret < 0) return ret; =20 intel_dp->force_dsc_bpc =3D dsc_bpc; - *offp +=3D len; + iocb->ki_pos +=3D len; =20 return len; } @@ -1365,10 +1361,10 @@ static int i915_dsc_bpc_open(struct inode *inode, static const struct file_operations i915_dsc_bpc_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_dsc_bpc_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_dsc_bpc_write + .write_iter =3D i915_dsc_bpc_write }; =20 static int i915_dsc_output_format_show(struct seq_file *m, void *data) @@ -1416,33 +1412,33 @@ static int i915_bigjoiner_enable_show(struct seq_fi= le *m, void *data) return 0; } =20 -static ssize_t i915_dsc_output_format_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_dsc_output_format_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_connector *connector =3D m->private; struct intel_encoder *encoder =3D intel_attached_encoder(connector); struct intel_dp *intel_dp =3D enc_to_intel_dp(encoder); + size_t len =3D iov_iter_count(from); int dsc_output_format =3D 0; int ret; =20 - ret =3D kstrtoint_from_user(ubuf, len, 0, &dsc_output_format); + ret =3D kstrtoint_from_iter(from, len, 0, &dsc_output_format); if (ret < 0) return ret; =20 intel_dp->force_dsc_output_format =3D dsc_output_format; - *offp +=3D len; + iocb->ki_pos +=3D len; =20 return len; } =20 -static ssize_t i915_bigjoiner_enable_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_bigjoiner_enable_write_iter(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_connector *connector =3D m->private; + size_t len =3D iov_iter_count(from); struct drm_crtc *crtc; bool bigjoiner_en =3D 0; int ret; @@ -1451,12 +1447,12 @@ static ssize_t i915_bigjoiner_enable_write(struct f= ile *file, if (connector->base.status !=3D connector_status_connected || !crtc) return -ENODEV; =20 - ret =3D kstrtobool_from_user(ubuf, len, &bigjoiner_en); + ret =3D kstrtobool_from_iter(from, len, &bigjoiner_en); if (ret < 0) return ret; =20 connector->force_bigjoiner_enable =3D bigjoiner_en; - *offp +=3D len; + iocb->ki_pos +=3D len; =20 return len; } @@ -1470,10 +1466,10 @@ static int i915_dsc_output_format_open(struct inode= *inode, static const struct file_operations i915_dsc_output_format_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_dsc_output_format_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_dsc_output_format_write + .write_iter =3D i915_dsc_output_format_write }; =20 static int i915_dsc_fractional_bpp_show(struct seq_file *m, void *data) @@ -1508,16 +1504,16 @@ static int i915_dsc_fractional_bpp_show(struct seq_= file *m, void *data) return ret; } =20 -static ssize_t i915_dsc_fractional_bpp_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_dsc_fractional_bpp_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct intel_connector *connector =3D m->private; struct intel_encoder *encoder =3D intel_attached_encoder(connector); struct drm_i915_private *i915 =3D to_i915(connector->base.dev); struct intel_dp *intel_dp =3D enc_to_intel_dp(encoder); bool dsc_fractional_bpp_enable =3D false; + size_t len =3D iov_iter_count(from); int ret; =20 if (len =3D=3D 0) @@ -1526,7 +1522,7 @@ static ssize_t i915_dsc_fractional_bpp_write(struct f= ile *file, drm_dbg(&i915->drm, "Copied %zu bytes from user to force fractional bpp for DSC\n", len); =20 - ret =3D kstrtobool_from_user(ubuf, len, &dsc_fractional_bpp_enable); + ret =3D kstrtobool_from_iter(from, len, &dsc_fractional_bpp_enable); if (ret < 0) return ret; =20 @@ -1534,7 +1530,7 @@ static ssize_t i915_dsc_fractional_bpp_write(struct f= ile *file, (dsc_fractional_bpp_enable) ? "true" : "false"); intel_dp->force_dsc_fractional_bpp_en =3D dsc_fractional_bpp_enable; =20 - *offp +=3D len; + iocb->ki_pos +=3D len; =20 return len; } @@ -1548,10 +1544,10 @@ static int i915_dsc_fractional_bpp_open(struct inod= e *inode, static const struct file_operations i915_dsc_fractional_bpp_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_dsc_fractional_bpp_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_dsc_fractional_bpp_write + .write_iter =3D i915_dsc_fractional_bpp_write }; =20 DEFINE_SHOW_STORE_ATTRIBUTE(i915_bigjoiner_enable); diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/= drivers/gpu/drm/i915/display/intel_display_debugfs_params.c index f35718748555..deb2a157a4f9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c @@ -27,20 +27,20 @@ static int intel_display_param_int_open(struct inode *i= node, struct file *file) return single_open(file, intel_display_param_int_show, inode->i_private); } =20 -static ssize_t intel_display_param_int_write(struct file *file, - const char __user *ubuf, size_t len, - loff_t *offp) +static ssize_t intel_display_param_int_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; + size_t len =3D iov_iter_count(from); int *value =3D m->private; int ret; =20 - ret =3D kstrtoint_from_user(ubuf, len, 0, value); + ret =3D kstrtoint_from_iter(from, len, 0, value); if (ret) { /* support boolean values too */ bool b; =20 - ret =3D kstrtobool_from_user(ubuf, len, &b); + ret =3D kstrtobool_from_iter(from, len, &b); if (!ret) *value =3D b; } @@ -51,8 +51,8 @@ static ssize_t intel_display_param_int_write(struct file = *file, static const struct file_operations intel_display_param_int_fops =3D { .owner =3D THIS_MODULE, .open =3D intel_display_param_int_open, - .read =3D seq_read, - .write =3D intel_display_param_int_write, + .read_iter =3D seq_read_iter, + .write_iter =3D intel_display_param_int_write, .llseek =3D default_llseek, .release =3D single_release, }; @@ -60,7 +60,7 @@ static const struct file_operations intel_display_param_i= nt_fops =3D { static const struct file_operations intel_display_param_int_fops_ro =3D { .owner =3D THIS_MODULE, .open =3D intel_display_param_int_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D default_llseek, .release =3D single_release, }; @@ -80,20 +80,20 @@ static int intel_display_param_uint_open(struct inode *= inode, struct file *file) return single_open(file, intel_display_param_uint_show, inode->i_private); } =20 -static ssize_t intel_display_param_uint_write(struct file *file, - const char __user *ubuf, size_t len, - loff_t *offp) +static ssize_t intel_display_param_uint_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; + size_t len =3D iov_iter_count(from); unsigned int *value =3D m->private; int ret; =20 - ret =3D kstrtouint_from_user(ubuf, len, 0, value); + ret =3D kstrtouint_from_iter(from, len, 0, value); if (ret) { /* support boolean values too */ bool b; =20 - ret =3D kstrtobool_from_user(ubuf, len, &b); + ret =3D kstrtobool_from_iter(from, len, &b); if (!ret) *value =3D b; } @@ -104,8 +104,8 @@ static ssize_t intel_display_param_uint_write(struct fi= le *file, static const struct file_operations intel_display_param_uint_fops =3D { .owner =3D THIS_MODULE, .open =3D intel_display_param_uint_open, - .read =3D seq_read, - .write =3D intel_display_param_uint_write, + .read_iter =3D seq_read_iter, + .write_iter =3D intel_display_param_uint_write, .llseek =3D default_llseek, .release =3D single_release, }; @@ -113,7 +113,7 @@ static const struct file_operations intel_display_param= _uint_fops =3D { static const struct file_operations intel_display_param_uint_fops_ro =3D { .owner =3D THIS_MODULE, .open =3D intel_display_param_uint_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D default_llseek, .release =3D single_release, }; diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm= /i915/display/intel_hotplug.c index d9ec349f3c8c..0a4a54fea1aa 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -1019,13 +1019,13 @@ static int i915_hpd_storm_ctl_show(struct seq_file = *m, void *data) return 0; } =20 -static ssize_t i915_hpd_storm_ctl_write(struct file *file, - const char __user *ubuf, size_t len, - loff_t *offp) +static ssize_t i915_hpd_storm_ctl_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; struct intel_hotplug *hotplug =3D &dev_priv->display.hotplug; + size_t len =3D iov_iter_count(from); unsigned int new_threshold; int i; char *newline; @@ -1034,7 +1034,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *= file, if (len >=3D sizeof(tmp)) return -EINVAL; =20 - if (copy_from_user(tmp, ubuf, len)) + if (!copy_from_iter_full(tmp, len, from)) return -EFAULT; =20 tmp[len] =3D '\0'; @@ -1077,10 +1077,10 @@ static int i915_hpd_storm_ctl_open(struct inode *in= ode, struct file *file) static const struct file_operations i915_hpd_storm_ctl_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_hpd_storm_ctl_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_hpd_storm_ctl_write + .write_iter =3D i915_hpd_storm_ctl_write }; =20 static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data) @@ -1100,13 +1100,13 @@ i915_hpd_short_storm_ctl_open(struct inode *inode, = struct file *file) inode->i_private); } =20 -static ssize_t i915_hpd_short_storm_ctl_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t i915_hpd_short_storm_ctl_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; struct intel_hotplug *hotplug =3D &dev_priv->display.hotplug; + size_t len =3D iov_iter_count(from); char *newline; char tmp[16]; int i; @@ -1115,7 +1115,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct = file *file, if (len >=3D sizeof(tmp)) return -EINVAL; =20 - if (copy_from_user(tmp, ubuf, len)) + if (!copy_from_iter_full(tmp, len, from)) return -EFAULT; =20 tmp[len] =3D '\0'; @@ -1150,10 +1150,10 @@ static ssize_t i915_hpd_short_storm_ctl_write(struc= t file *file, static const struct file_operations i915_hpd_short_storm_ctl_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_hpd_short_storm_ctl_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D i915_hpd_short_storm_ctl_write, + .write_iter =3D i915_hpd_short_storm_ctl_write, }; =20 void intel_hpd_debugfs_register(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/display/intel_wm.c b/drivers/gpu/drm/i915= /display/intel_wm.c index 82c4933ad507..86be01bb69f3 100644 --- a/drivers/gpu/drm/i915/display/intel_wm.c +++ b/drivers/gpu/drm/i915/display/intel_wm.c @@ -285,11 +285,12 @@ static int cur_wm_latency_open(struct inode *inode, s= truct file *file) return single_open(file, cur_wm_latency_show, dev_priv); } =20 -static ssize_t wm_latency_write(struct file *file, const char __user *ubuf, - size_t len, loff_t *offp, u16 wm[8]) +static ssize_t wm_latency_write(struct kiocb *iocb, struct iov_iter *from, + u16 wm[8]) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; + size_t len =3D iov_iter_count(from); u16 new[8] =3D {}; int level; int ret; @@ -298,7 +299,7 @@ static ssize_t wm_latency_write(struct file *file, cons= t char __user *ubuf, if (len >=3D sizeof(tmp)) return -EINVAL; =20 - if (copy_from_user(tmp, ubuf, len)) + if (!copy_from_iter_full(tmp, len, from)) return -EFAULT; =20 tmp[len] =3D '\0'; @@ -319,10 +320,9 @@ static ssize_t wm_latency_write(struct file *file, con= st char __user *ubuf, return len; } =20 -static ssize_t pri_wm_latency_write(struct file *file, const char __user *= ubuf, - size_t len, loff_t *offp) +static ssize_t pri_wm_latency_write(struct kiocb *iocb, struct iov_iter *f= rom) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; u16 *latencies; =20 @@ -331,13 +331,12 @@ static ssize_t pri_wm_latency_write(struct file *file= , const char __user *ubuf, else latencies =3D dev_priv->display.wm.pri_latency; =20 - return wm_latency_write(file, ubuf, len, offp, latencies); + return wm_latency_write(iocb, from, latencies); } =20 -static ssize_t spr_wm_latency_write(struct file *file, const char __user *= ubuf, - size_t len, loff_t *offp) +static ssize_t spr_wm_latency_write(struct kiocb *iocb, struct iov_iter *f= rom) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; u16 *latencies; =20 @@ -346,13 +345,12 @@ static ssize_t spr_wm_latency_write(struct file *file= , const char __user *ubuf, else latencies =3D dev_priv->display.wm.spr_latency; =20 - return wm_latency_write(file, ubuf, len, offp, latencies); + return wm_latency_write(iocb, from, latencies); } =20 -static ssize_t cur_wm_latency_write(struct file *file, const char __user *= ubuf, - size_t len, loff_t *offp) +static ssize_t cur_wm_latency_write(struct kiocb *iocb, struct iov_iter *f= rom) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *dev_priv =3D m->private; u16 *latencies; =20 @@ -361,34 +359,34 @@ static ssize_t cur_wm_latency_write(struct file *file= , const char __user *ubuf, else latencies =3D dev_priv->display.wm.cur_latency; =20 - return wm_latency_write(file, ubuf, len, offp, latencies); + return wm_latency_write(iocb, from, latencies); } =20 static const struct file_operations i915_pri_wm_latency_fops =3D { .owner =3D THIS_MODULE, .open =3D pri_wm_latency_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D pri_wm_latency_write + .write_iter =3D pri_wm_latency_write }; =20 static const struct file_operations i915_spr_wm_latency_fops =3D { .owner =3D THIS_MODULE, .open =3D spr_wm_latency_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D spr_wm_latency_write + .write_iter =3D spr_wm_latency_write }; =20 static const struct file_operations i915_cur_wm_latency_fops =3D { .owner =3D THIS_MODULE, .open =3D cur_wm_latency_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D cur_wm_latency_write + .write_iter =3D cur_wm_latency_write }; =20 void intel_wm_debugfs_register(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm= /i915/display/skl_watermark.c index c6b9be80d83c..9c87f0c1a0da 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3713,17 +3713,17 @@ static int skl_watermark_ipc_status_open(struct ino= de *inode, struct file *file) return single_open(file, skl_watermark_ipc_status_show, i915); } =20 -static ssize_t skl_watermark_ipc_status_write(struct file *file, - const char __user *ubuf, - size_t len, loff_t *offp) +static ssize_t skl_watermark_ipc_status_write(struct kiocb *iocb, + struct iov_iter *from) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; struct drm_i915_private *i915 =3D m->private; + size_t len =3D iov_iter_count(from); intel_wakeref_t wakeref; bool enable; int ret; =20 - ret =3D kstrtobool_from_user(ubuf, len, &enable); + ret =3D kstrtobool_from_iter(from, len, &enable); if (ret < 0) return ret; =20 @@ -3741,10 +3741,10 @@ static ssize_t skl_watermark_ipc_status_write(struc= t file *file, static const struct file_operations skl_watermark_ipc_status_fops =3D { .owner =3D THIS_MODULE, .open =3D skl_watermark_ipc_status_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D seq_lseek, .release =3D single_release, - .write =3D skl_watermark_ipc_status_write + .write_iter =3D skl_watermark_ipc_status_write }; =20 static int intel_sagv_status_show(struct seq_file *m, void *unused) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c b/drivers/gpu/drm/i= 915/gt/intel_gt_debugfs.c index 4dc23b8d3aa2..ed8c47f3cc39 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c @@ -107,7 +107,7 @@ void intel_gt_debugfs_register_files(struct dentry *roo= t, unsigned long count, void *data) { while (count--) { - umode_t mode =3D files->fops->write ? 0644 : 0444; + umode_t mode =3D files->fops->write_iter ? 0644 : 0444; =20 if (!files->eval || files->eval(data)) debugfs_create_file(files->name, diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h b/drivers/gpu/drm/i= 915/gt/intel_gt_debugfs.h index e4110eebf093..1753bebb6f70 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.h @@ -14,7 +14,7 @@ struct intel_gt; static const struct file_operations __name ## _fops =3D { \ .owner =3D THIS_MODULE, \ .open =3D __name ## _open, \ - .read =3D seq_read, \ + .read_iter =3D seq_read_iter, \ .llseek =3D seq_lseek, \ .release =3D single_release, \ } diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c b/drivers/g= pu/drm/i915/gt/uc/intel_guc_log_debugfs.c index ddfbe334689f..3284631a8c07 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c @@ -117,17 +117,14 @@ static int guc_log_relay_open(struct inode *inode, st= ruct file *file) return intel_guc_log_relay_open(log); } =20 -static ssize_t -guc_log_relay_write(struct file *filp, - const char __user *ubuf, - size_t cnt, - loff_t *ppos) +static ssize_t guc_log_relay_write(struct kiocb *iocb, struct iov_iter *fr= om) { - struct intel_guc_log *log =3D filp->private_data; + struct intel_guc_log *log =3D iocb->ki_filp->private_data; + size_t cnt =3D iov_iter_count(from); int val; int ret; =20 - ret =3D kstrtoint_from_user(ubuf, cnt, 0, &val); + ret =3D kstrtoint_from_iter(from, cnt, 0, &val); if (ret < 0) return ret; =20 @@ -154,7 +151,7 @@ static int guc_log_relay_release(struct inode *inode, s= truct file *file) static const struct file_operations guc_log_relay_fops =3D { .owner =3D THIS_MODULE, .open =3D guc_log_relay_open, - .write =3D guc_log_relay_write, + .write_iter =3D guc_log_relay_write, .release =3D guc_log_relay_release, }; =20 diff --git a/drivers/gpu/drm/i915/i915_debugfs_params.c b/drivers/gpu/drm/i= 915/i915_debugfs_params.c index 8bca02025e09..5369d1e7f1b7 100644 --- a/drivers/gpu/drm/i915/i915_debugfs_params.c +++ b/drivers/gpu/drm/i915/i915_debugfs_params.c @@ -49,20 +49,19 @@ static int notify_guc(struct drm_i915_private *i915) return ret; } =20 -static ssize_t i915_param_int_write(struct file *file, - const char __user *ubuf, size_t len, - loff_t *offp) +static ssize_t i915_param_int_write(struct kiocb *iocb, struct iov_iter *f= rom) { - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; + size_t len =3D iov_iter_count(from); int *value =3D m->private; int ret; =20 - ret =3D kstrtoint_from_user(ubuf, len, 0, value); + ret =3D kstrtoint_from_iter(from, len, 0, value); if (ret) { /* support boolean values too */ bool b; =20 - ret =3D kstrtobool_from_user(ubuf, len, &b); + ret =3D kstrtobool_from_iter(from, len, &b); if (!ret) *value =3D b; } @@ -73,8 +72,8 @@ static ssize_t i915_param_int_write(struct file *file, static const struct file_operations i915_param_int_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_param_int_open, - .read =3D seq_read, - .write =3D i915_param_int_write, + .read_iter =3D seq_read_iter, + .write_iter =3D i915_param_int_write, .llseek =3D default_llseek, .release =3D single_release, }; @@ -82,7 +81,7 @@ static const struct file_operations i915_param_int_fops = =3D { static const struct file_operations i915_param_int_fops_ro =3D { .owner =3D THIS_MODULE, .open =3D i915_param_int_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D default_llseek, .release =3D single_release, }; @@ -102,27 +101,26 @@ static int i915_param_uint_open(struct inode *inode, = struct file *file) return single_open(file, i915_param_uint_show, inode->i_private); } =20 -static ssize_t i915_param_uint_write(struct file *file, - const char __user *ubuf, size_t len, - loff_t *offp) +static ssize_t i915_param_uint_write(struct kiocb *iocb, struct iov_iter *= from) { struct drm_i915_private *i915; - struct seq_file *m =3D file->private_data; + struct seq_file *m =3D iocb->ki_filp->private_data; + size_t len =3D iov_iter_count(from); unsigned int *value =3D m->private; unsigned int old =3D *value; int ret; =20 - ret =3D kstrtouint_from_user(ubuf, len, 0, value); + ret =3D kstrtouint_from_iter(from, len, 0, value); if (ret) { /* support boolean values too */ bool b; =20 - ret =3D kstrtobool_from_user(ubuf, len, &b); + ret =3D kstrtobool_from_iter(from, len, &b); if (!ret) *value =3D b; } =20 - if (!ret && MATCH_DEBUGFS_NODE_NAME(file, "reset")) { + if (!ret && MATCH_DEBUGFS_NODE_NAME(iocb->ki_filp, "reset")) { GET_I915(i915, reset, value); =20 ret =3D notify_guc(i915); @@ -136,8 +134,8 @@ static ssize_t i915_param_uint_write(struct file *file, static const struct file_operations i915_param_uint_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_param_uint_open, - .read =3D seq_read, - .write =3D i915_param_uint_write, + .read_iter =3D seq_read_iter, + .write_iter =3D i915_param_uint_write, .llseek =3D default_llseek, .release =3D single_release, }; @@ -145,7 +143,7 @@ static const struct file_operations i915_param_uint_fop= s =3D { static const struct file_operations i915_param_uint_fops_ro =3D { .owner =3D THIS_MODULE, .open =3D i915_param_uint_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D default_llseek, .release =3D single_release, }; @@ -186,12 +184,13 @@ static ssize_t i915_param_charp_write(struct file *fi= le, out: return len; } +FOPS_WRITE_ITER_HELPER(i915_param_charp_write); =20 static const struct file_operations i915_param_charp_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_param_charp_open, - .read =3D seq_read, - .write =3D i915_param_charp_write, + .read_iter =3D seq_read_iter, + .write_iter =3D i915_param_charp_write_iter, .llseek =3D default_llseek, .release =3D single_release, }; @@ -199,7 +198,7 @@ static const struct file_operations i915_param_charp_fo= ps =3D { static const struct file_operations i915_param_charp_fops_ro =3D { .owner =3D THIS_MODULE, .open =3D i915_param_charp_open, - .read =3D seq_read, + .read_iter =3D seq_read_iter, .llseek =3D default_llseek, .release =3D single_release, }; diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i= 915_gpu_error.c index a0b784ebaddd..ca0851c07082 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -2380,14 +2380,14 @@ void intel_klog_error_capture(struct intel_gt *gt, } #endif =20 -static ssize_t gpu_state_read(struct file *file, char __user *ubuf, - size_t count, loff_t *pos) +static ssize_t gpu_state_read(struct kiocb *iocb, struct iov_iter *to) { struct i915_gpu_coredump *error; + size_t count =3D iov_iter_count(to); ssize_t ret; void *buf; =20 - error =3D file->private_data; + error =3D iocb->ki_filp->private_data; if (!error) return 0; =20 @@ -2396,12 +2396,12 @@ static ssize_t gpu_state_read(struct file *file, ch= ar __user *ubuf, if (!buf) return -ENOMEM; =20 - ret =3D i915_gpu_coredump_copy_to_buffer(error, buf, *pos, count); + ret =3D i915_gpu_coredump_copy_to_buffer(error, buf, iocb->ki_pos, count); if (ret <=3D 0) goto out; =20 - if (!copy_to_user(ubuf, buf, ret)) - *pos +=3D ret; + if (copy_to_iter_full(buf, ret, to)) + iocb->ki_pos +=3D ret; else ret =3D -EFAULT; =20 @@ -2436,18 +2436,14 @@ static int i915_gpu_info_open(struct inode *inode, = struct file *file) static const struct file_operations i915_gpu_info_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_gpu_info_open, - .read =3D gpu_state_read, + .read_iter =3D gpu_state_read, .llseek =3D default_llseek, .release =3D gpu_state_release, }; =20 -static ssize_t -i915_error_state_write(struct file *filp, - const char __user *ubuf, - size_t cnt, - loff_t *ppos) +static ssize_t i915_error_state_write(struct kiocb *iocb, struct iov_iter = *from) { - struct i915_gpu_coredump *error =3D filp->private_data; + struct i915_gpu_coredump *error =3D iocb->ki_filp->private_data; =20 if (!error) return 0; @@ -2455,7 +2451,7 @@ i915_error_state_write(struct file *filp, drm_dbg(&error->i915->drm, "Resetting error state\n"); i915_reset_error_state(error->i915); =20 - return cnt; + return iov_iter_count(from); } =20 static int i915_error_state_open(struct inode *inode, struct file *file) @@ -2473,8 +2469,8 @@ static int i915_error_state_open(struct inode *inode,= struct file *file) static const struct file_operations i915_error_state_fops =3D { .owner =3D THIS_MODULE, .open =3D i915_error_state_open, - .read =3D gpu_state_read, - .write =3D i915_error_state_write, + .read_iter =3D gpu_state_read, + .write_iter =3D i915_error_state_write, .llseek =3D default_llseek, .release =3D gpu_state_release, }; diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_p= erf.c index bd9d812b1afa..8ff6d5b0b40a 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -3512,6 +3512,7 @@ static ssize_t i915_perf_read(struct file *file, /* Possible values for ret are 0, -EFAULT, -ENOSPC, -EIO, ... */ return offset ?: (ret ?: -EAGAIN); } +FOPS_READ_ITER_HELPER(i915_perf_read); =20 static enum hrtimer_restart oa_poll_check_timer_cb(struct hrtimer *hrtimer) { @@ -3788,7 +3789,7 @@ static const struct file_operations fops =3D { .llseek =3D no_llseek, .release =3D i915_perf_release, .poll =3D i915_perf_poll, - .read =3D i915_perf_read, + .read_iter =3D i915_perf_read_iter, .unlocked_ioctl =3D i915_perf_ioctl, /* Our ioctl have no arguments, so it's safe to use the same function * to handle 32bits compatibility. --=20 2.43.0