From nobody Fri Dec 19 04:23:31 2025 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (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 8016B176FBD for ; Thu, 11 Apr 2024 15:35:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849749; cv=none; b=IX7RfIymi53Y5UkGfLiz/GbB1DxDOJ3mSQPsjg2VWQdEx/fe8rRBGaP1lHDmrMkpcjqCasNPWiwG/GQeqLRB5+gkw/8UoEoG1jnVfB78c2ReLjPJ/bm9bHmQwtVRn3qmhEbfvujR42PvKjnYX1fa5bPEzMYvci5mEwUiQWxo+Hc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849749; c=relaxed/simple; bh=MAdYJg7vC80sayVUc6VUMFMQPxg4PDOoBSuAV4FtkDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S24CXo9vQPCvLRDZ5CLMT8FL3mSNRDSm+nKI2TDI63xhgHtVvUEVF+wel3aHSfC8y8JAfZG4TxsEhgZYU6LgbcLCRDVypPivDeC5Y3puLbjV1BsnAECmjkY5xMy0zBHZA9r2ZCWzHACsbU9nb8Jv37DGVEtSz010EfBmdXntAy4= 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=PWSx51rH; arc=none smtp.client-ip=209.85.166.44 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="PWSx51rH" Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-7cc0e831e11so170508039f.1 for ; Thu, 11 Apr 2024 08:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849747; x=1713454547; 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=EpJzi3ktCie7A8Der17tbeDtmCXTCdjPxKaVEBIvR+w=; b=PWSx51rHnUYDRkVm5ToTvhqz1p18QzRfpGuA9doQjR05QDtOJumt3a18AKEkTUDXdU Ams51ylY6TpjHBz7OdqIDMnbzBYd0vmNW/mnc4c2TlYOqUf8VEnbuz0wh4F5qNl1opR2 1kQbdqe1NcMs1xq82QwYM2Yil+9UDATl6FJ2EBd4aCCzsVY7ulPC5aiZ05TvRqCizo9D 9fTbyn3+LLGnEo3qT+gnowfgdngY/JiOvXdbqteosjt4Mi5OuMSa0Pq5leuJmQxbRhAq wpLs2b3HpfaMkLwoh1pavYvAcuHjNTA6AheyCT8ZEb0nK/lOGk47qU0qZgzTEaDlA9b9 xv2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849747; x=1713454547; 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=EpJzi3ktCie7A8Der17tbeDtmCXTCdjPxKaVEBIvR+w=; b=iYh6LjbaFTFw161MeBG4EEpEbfNAyaxgKs2iWxXpNxCw8G3+1c56SEnEEW6DXt3bS/ G7wwsge/fdI2bG+9musMpk7Hd801rBcL49qI+PfUbqnGbvLn+5QmDipIaxtlBNEMWPRa q3anM5O1AVJ7zTtzDb2wcpxjCJ73ve4hLsSrEIKdoiI9w1FJsYmM89iN8D1fU1cDs0Uc L5jAbzl47XSXUL6BBdoBy9b8ZfO7hwkJ3RiJtT6PH0gHajlMrTNO8amG0GJCa7a+f0E9 SFU/1mfbG5RvYMxL5RftVLnaJjTl6qZjbeVd6OoLMfoVLqqFN+8VvoK0YesHFI0v6Y6W NncQ== X-Gm-Message-State: AOJu0YxK89L7BGfXYrzuQksnszdvro8zYUJVJLYkRAHyXVTlAXI3WNAO /hg3iUZu0mupPZOXmnYGp/HL/nCfko55E5rNMxZBs92Z5GX0x7lQS3i9XxMd/UlE5lUCkTYmS3O q X-Google-Smtp-Source: AGHT+IFLdertjjG+IB6jv3VjjUJfSpBzxjcraSi0D3fqPJYZGO0vzNYxiHAUUkn+dOCGdMFX1bVIhg== X-Received: by 2002:a5e:9907:0:b0:7d6:751f:192 with SMTP id t7-20020a5e9907000000b007d6751f0192mr180282ioj.2.1712849747403; Thu, 11 Apr 2024 08:35:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:35:46 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 147/437] drm/radeon/radeon_ttm: convert to read/write iterators Date: Thu, 11 Apr 2024 09:14:47 -0600 Message-ID: <20240411153126.16201-148-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/gpu/drm/radeon/radeon_ttm.c | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/r= adeon_ttm.c index 2078b0000e22..2570babc690c 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -786,37 +786,36 @@ static int radeon_ttm_vram_open(struct inode *inode, = struct file *filep) return 0; } =20 -static ssize_t radeon_ttm_vram_read(struct file *f, char __user *buf, - size_t size, loff_t *pos) +static ssize_t radeon_ttm_vram_read(struct kiocb *iocb, struct iov_iter *t= o) { - struct radeon_device *rdev =3D f->private_data; + struct radeon_device *rdev =3D iocb->ki_filp->private_data; + size_t size =3D iov_iter_count(to); ssize_t result =3D 0; int r; =20 - if (size & 0x3 || *pos & 0x3) + if (size & 0x3 || iocb->ki_pos & 0x3) return -EINVAL; =20 while (size) { unsigned long flags; uint32_t value; =20 - if (*pos >=3D rdev->mc.mc_vram_size) + if (iocb->ki_pos >=3D rdev->mc.mc_vram_size) return result; =20 spin_lock_irqsave(&rdev->mmio_idx_lock, flags); - WREG32(RADEON_MM_INDEX, ((uint32_t)*pos) | 0x80000000); + WREG32(RADEON_MM_INDEX, ((uint32_t)iocb->ki_pos) | 0x80000000); if (rdev->family >=3D CHIP_CEDAR) - WREG32(EVERGREEN_MM_INDEX_HI, *pos >> 31); + WREG32(EVERGREEN_MM_INDEX_HI, iocb->ki_pos >> 31); value =3D RREG32(RADEON_MM_DATA); spin_unlock_irqrestore(&rdev->mmio_idx_lock, flags); =20 - r =3D put_user(value, (uint32_t __user *)buf); + r =3D put_iter(value, to); if (r) return r; =20 result +=3D 4; - buf +=3D 4; - *pos +=3D 4; + iocb->ki_pos +=3D 4; size -=3D 4; } =20 @@ -826,7 +825,7 @@ static ssize_t radeon_ttm_vram_read(struct file *f, cha= r __user *buf, static const struct file_operations radeon_ttm_vram_fops =3D { .owner =3D THIS_MODULE, .open =3D radeon_ttm_vram_open, - .read =3D radeon_ttm_vram_read, + .read_iter =3D radeon_ttm_vram_read, .llseek =3D default_llseek }; =20 @@ -838,16 +837,16 @@ static int radeon_ttm_gtt_open(struct inode *inode, s= truct file *filep) return 0; } =20 -static ssize_t radeon_ttm_gtt_read(struct file *f, char __user *buf, - size_t size, loff_t *pos) +static ssize_t radeon_ttm_gtt_read(struct kiocb *iocb, struct iov_iter *to) { - struct radeon_device *rdev =3D f->private_data; + struct radeon_device *rdev =3D iocb->ki_filp->private_data; + size_t size =3D iov_iter_count(to); ssize_t result =3D 0; int r; =20 while (size) { - loff_t p =3D *pos / PAGE_SIZE; - unsigned off =3D *pos & ~PAGE_MASK; + loff_t p =3D iocb->ki_pos / PAGE_SIZE; + unsigned off =3D iocb->ki_pos & ~PAGE_MASK; size_t cur_size =3D min_t(size_t, size, PAGE_SIZE - off); struct page *page; void *ptr; @@ -860,17 +859,16 @@ static ssize_t radeon_ttm_gtt_read(struct file *f, ch= ar __user *buf, ptr =3D kmap_local_page(page); ptr +=3D off; =20 - r =3D copy_to_user(buf, ptr, cur_size); + r =3D !copy_to_iter_full(ptr, cur_size, to); kunmap_local(ptr); } else - r =3D clear_user(buf, cur_size); + r =3D iov_iter_zero(cur_size, to) !=3D cur_size; =20 if (r) return -EFAULT; =20 result +=3D cur_size; - buf +=3D cur_size; - *pos +=3D cur_size; + iocb->ki_pos +=3D cur_size; size -=3D cur_size; } =20 @@ -880,7 +878,7 @@ static ssize_t radeon_ttm_gtt_read(struct file *f, char= __user *buf, static const struct file_operations radeon_ttm_gtt_fops =3D { .owner =3D THIS_MODULE, .open =3D radeon_ttm_gtt_open, - .read =3D radeon_ttm_gtt_read, + .read_iter =3D radeon_ttm_gtt_read, .llseek =3D default_llseek }; =20 --=20 2.43.0