Skip to contentSkip to conversation

/dev/zero: also implement ->read

PATCH In review Christoph Hellwig 2 participants 4 messages Sep 7, 2020 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 /dev/zero: also implement ->read

Christophe reported a major speedup due to avoiding the iov_iter overhead, so just add this trivial function.

---

Changes since v1:
- fix the Suggested-by: tag
- report the actually read bytes in case of a partial clear_user
- remove an impossible to hit conditional

 drivers/char/mem.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
drivers/char/mem.c +28 -0
index abd4ffdc8cdebc..94c2b556cf9728 100644
@@ -726,6 +726,33 @@ static ssize_t read_iter_zero(struct kiocb *iocb, struct iov_iter *iter)
 	return written;
 }
 
+static ssize_t read_zero(struct file *file, char __user *buf,
+			 size_t count, loff_t *ppos)
+{
+	size_t cleared = 0;
+
+	while (count) {
+		size_t chunk = min_t(size_t, count, PAGE_SIZE);
+		size_t left;
+
+		left = clear_user(buf + cleared, chunk);
+		if (unlikely(left)) {
+			cleared += (chunk - left);
+			if (!cleared)
+				return -EFAULT;
+			break;
+		}
+		cleared += chunk;
+		count -= chunk;
+
+		if (signal_pending(current))
+			break;
+		cond_resched();
+	}
+
+	return cleared;
+}
+
 static int mmap_zero(struct file *file, struct vm_area_struct *vma)
 {
 #ifndef CONFIG_MMU
@@ -921,6 +948,7 @@ static const struct file_operations zero_fops = {
 	.llseek		= zero_lseek,
 	.write		= write_zero,
 	.read_iter	= read_iter_zero,
+	.read		= read_zero,
 	.write_iter	= write_iter_zero,
 	.mmap		= mmap_zero,
 	.get_unmapped_area = get_unmapped_area_zero,
Signature · 1 line
2.28.0
maintainer
#1 lore raw
Quoted 8 lines · Christoph Hellwig

Christophe reported a major speedup due to avoiding the iov_iter overhead, so just add this trivial function.

---

Quoted 7 lines

Changes since v1:
- fix the Suggested-by: tag
- report the actually read bytes in case of a partial clear_user
- remove an impossible to hit conditional

 drivers/char/mem.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

I already merged your v1 into my tree, do you want me to revert that and then add this, or can you send me the diff to apply instead? I can't rebase my public trees.

thanks,

greg k-h

#2 lore raw
Quoted 14 lines · Greg KH
Quoted 13 lines · Christoph Hellwig

Christophe reported a major speedup due to avoiding the iov_iter overhead, so just add this trivial function.

---

Changes since v1:
- fix the Suggested-by: tag
- report the actually read bytes in case of a partial clear_user
- remove an impossible to hit conditional

Quoted 6 lines
Quoted 2 lines
 drivers/char/mem.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

I already merged your v1 into my tree, do you want me to revert that and then add this, or can you send me the diff to apply instead? I can't rebase my public trees.

Sure, I can send an incremental one. I vaguely remembered you as one of the quilt holdouts.

maintainer
#3 lore raw
Quoted 18 lines · Christoph Hellwig
Quoted 17 lines · Greg KH
Quoted 15 lines · Christoph Hellwig

Christophe reported a major speedup due to avoiding the iov_iter overhead, so just add this trivial function.

---

Changes since v1:
- fix the Suggested-by: tag
- report the actually read bytes in case of a partial clear_user
- remove an impossible to hit conditional

 drivers/char/mem.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
Quoted 6 lines
Quoted 3 lines

I already merged your v1 into my tree, do you want me to revert that and then add this, or can you send me the diff to apply instead? I can't rebase my public trees.

Sure, I can send an incremental one. I vaguely remembered you as one of the quilt holdouts.

That's only for stable tree work :)

thanks for the incremental patch, will go apply that now.

greg k-h