On Wed, Oct 4, 2023 at 3:46 PM Cyril Hrubis <chrubis@xxxxxxx> wrote:
>
Hi Cyril,
Thanks for following up on this!
> TODO: readahead() on /proc/self/maps seems to succeed is that to be
> expected?
Not sure.
How does llseek() work on the same fd?
Matthew suggested that we align the behavior of both readahead(2)
and posix_fadvise(2) to that of llseek(2)
>
> Signed-off-by: Cyril Hrubis <chrubis@xxxxxxx>
> ---
> .../kernel/syscalls/readahead/readahead01.c | 46 ++++++++-----------
> 1 file changed, 20 insertions(+), 26 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/readahead/readahead01.c b/testcases/kernel/syscalls/readahead/readahead01.c
> index bdef7945d..28134d416 100644
> --- a/testcases/kernel/syscalls/readahead/readahead01.c
> +++ b/testcases/kernel/syscalls/readahead/readahead01.c
> @@ -29,44 +29,38 @@
> #if defined(__NR_readahead)
>
> static void test_bad_fd(void)
> -{
> - char tempname[PATH_MAX] = "readahead01_XXXXXX";
> - int fd;
> -
> - tst_res(TINFO, "%s -1", __func__);
> - TST_EXP_FAIL(readahead(-1, 0, getpagesize()), EBADF);
> -
> - tst_res(TINFO, "%s O_WRONLY", __func__);
> - fd = mkstemp(tempname);
> - if (fd == -1)
> - tst_res(TFAIL | TERRNO, "mkstemp failed");
> - SAFE_CLOSE(fd);
> - fd = SAFE_OPEN(tempname, O_WRONLY);
> - TST_EXP_FAIL(readahead(fd, 0, getpagesize()), EBADF);
> - SAFE_CLOSE(fd);
> - unlink(tempname);
> -}
> -
> -static void test_invalid_fd(void)
> {
> int fd[2];
>
> - tst_res(TINFO, "%s pipe", __func__);
> + TST_EXP_FAIL(readahead(-1, 0, getpagesize()), EBADF,
> + "readahead() with fd = -1");
> +
Any reason not to include a bad and a closed fd in the iterator?
> SAFE_PIPE(fd);
> - TST_EXP_FAIL(readahead(fd[0], 0, getpagesize()), EINVAL);
> SAFE_CLOSE(fd[0]);
> SAFE_CLOSE(fd[1]);
>
> - tst_res(TINFO, "%s socket", __func__);
> - fd[0] = SAFE_SOCKET(AF_INET, SOCK_STREAM, 0);
> - TST_EXP_FAIL(readahead(fd[0], 0, getpagesize()), EINVAL);
> - SAFE_CLOSE(fd[0]);
> + TST_EXP_FAIL(readahead(fd[0], 0, getpagesize()), EBADF,
> + "readahead() with invalid fd");
> +}
> +
> +static void test_invalid_fd(struct tst_fd *fd)
> +{
> + switch (fd->type) {
> + case TST_FD_FILE:
> + case TST_FD_PIPE_OUT:
> + return;
> + default:
> + break;
> + }
> +
> + TST_EXP_FAIL(readahead(fd->fd, 0, getpagesize()), EINVAL,
> + "readahead() on %s", tst_fd_desc(fd));
Thinking forward and we would like to change this error code to ESPIPE
is there already a helper to expect one of a few error codes?
Thanks,
Amir.
> }
>
> static void test_readahead(void)
> {
> test_bad_fd();
> - test_invalid_fd();
> + tst_fd_iterate(test_invalid_fd);
> }
>
> static void setup(void)
> --
> 2.41.0
>
