* Re: set relay file can not be read by pread(2)
2008-03-27 3:14 ` set relay file can not be read by pread(2) Andrew Morton
@ 2008-03-27 4:19 ` Lai Jiangshan
0 siblings, 0 replies; 2+ messages in thread
From: Lai Jiangshan @ 2008-03-27 4:19 UTC (permalink / raw)
To: Andrew Morton; +Cc: Jens Axboe, Linux Kernel Mailing List
Andrew Morton wrote:
> On Wed, 26 Mar 2008 18:59:06 GMT Linux Kernel Mailing List <linux-kernel@vger.kernel.org> wrote:
>
>> 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 <laijs@cn.fujitsu.com>
>> AuthorDate: Wed Mar 26 12:01:28 2008 +0100
>> Committer: Jens Axboe <jens.axboe@oracle.com>
>> 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.
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
>> ---
>> kernel/relay.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/kernel/relay.c b/kernel/relay.c
>> index 4c035a8..ed3f6cf 100644
>> --- a/kernel/relay.c
>> +++ b/kernel/relay.c
>> @@ -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.
>
>
>
>
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).
^ permalink raw reply [flat|nested] 2+ messages in thread