Skip to contentSkip to conversation

set relay file can not be read by pread(2)

DISCUSSION Andrew Morton 2 participants 2 messages Mar 27, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 24 lines · On Wed, 26 Mar 2008 18:59:06 GMT Linux Kernel Mailing List…
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37529fe9f62835e1c11895a1895064748b032dc1
Commit:     37529fe9f62835e1c11895a1895064748b032dc1
Parent:     05dda977f2574c3341abef9b74c27d2b362e1e3a
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Wed Mar 26 12:01:28 2008 +0100
Committer:  Jens Axboe <[email protected]>
CommitDate: Wed Mar 26 12:01:28 2008 +0100

set relay file can not be read by pread(2)

I found that relay files can be read by pread(2). I fix it, for relay files are not capable of seeking.

---
 kernel/relay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/relay.c +0 -0
index 4c035a8..ed3f6cf 100644

kernel/relay.c static int relay_file_open(struct inode *inode, struct file *filp) · line 740

Quoted 6 lines
kernel/relay.c +1 -1
@@ -736,7 +736,7 @@ static int relay_file_open(struct inode *inode, struct file *filp)
 	kref_get(&buf->kref);
 	filp->private_data = buf;
 
-	return 0;
+	return nonseekable_open(inode, filp);
 }

Does pread(..., ..., ..., offset=0) work correctly now?

Because if it does, then applications might be using that, and we just broke them.

#2 lore raw
Quoted 29 lines · Andrew Morton
Quoted 27 lines · On Wed, 26 Mar 2008 18:59:06 GMT Linux Kernel Mailing List…
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37529fe9f62835e1c11895a1895064748b032dc1
Commit:     37529fe9f62835e1c11895a1895064748b032dc1
Parent:     05dda977f2574c3341abef9b74c27d2b362e1e3a
Author:     Lai Jiangshan <[email protected]>
AuthorDate: Wed Mar 26 12:01:28 2008 +0100
Committer:  Jens Axboe <[email protected]>
CommitDate: Wed Mar 26 12:01:28 2008 +0100

set relay file can not be read by pread(2)

I found that relay files can be read by pread(2). I fix it, for relay files are not capable of seeking.

---
 kernel/relay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/relay.c +0 -0
index 4c035a8..ed3f6cf 100644
@@ -736,7 +736,7 @@ static int relay_file_open(struct inode *inode, struct file *filp)
 	kref_get(&buf->kref);
 	filp->private_data = buf;
 
Quoted 12 lines

kernel/relay.c static int relay_file_open(struct inode *inode, struct file *filp) · line 740

Quoted 3 lines
kernel/relay.c +1 -1
-	return 0;
+	return nonseekable_open(inode, filp);
 }

Does pread(..., ..., ..., offset=0) work correctly now?

Because if it does, then applications might be using that, and we just broke them.

pread(..., ..., ..., offset=0) works as read (argument offset is ignored). and pread(..., ..., ..., offset=1)(twice or more times) works incorrectly.

Because pread gets old consumed data, and unread data is consumed too. See following:(Other bug is shown here, I'm making a patch for it.)

bug here:
relay file context: 0123456789

two_reader.c            gets                     correct
read(fd1, buf, 2)       01                       01
read(fd2, buf, 2)       23                       23
read(fd1, buf, 2)       23                       45
read(fd2, buf, 2)       45                       67
read(fd1, buf, 2)       45                       89
read(fd2, buf, 2)       EOF                      EOF
read(fd1, buf, 2)       EOF                      EOF

all unread data is consumed all data is read

pread.c gets

pread(fd, buf, 2, 0)       01
pread(fd, buf, 2, 0)       23
pread(fd, buf, 2, 0)       45
pread(fd, buf, 2, 0)       67
pread(fd, buf, 2, 0)       89
pread(fd, buf, 2, 0)       EOF -- all unread data is consumed

pread.c gets

pread(fd, buf, 2, 1)       12
pread(fd, buf, 2, 1)       12
pread(fd, buf, 2, 1)       12
pread(fd, buf, 2, 1)       12
pread(fd, buf, 2, 1)       12
pread(fd, buf, 2, 1)       EOF -- all unread data is consumed

the simplest patch: delete one line in function relay_file_read_start_pos()

	if (!read_pos)
		read_pos = consumed * subbuf_size + buf->bytes_consumed;

----> read_pos = consumed * subbuf_size + buf->bytes_consumed;

but var read_pos should be deleted in several functions.
So I'm making a more complex patch(but the code of reading relay file is simpler).