MIME-Version: 1.0
References: <20211115135219.85881-1-peterx@redhat.com>
In-Reply-To: <20211115135219.85881-1-peterx@redhat.com>
From:   Axel Rasmussen <axelrasmussen@google.com>
Date:   Mon, 15 Nov 2021 09:30:01 -0800
Message-ID: <CAJHvVciEV1uU=3ZmYB7V3uEa04SUzeqh8Ljvovz0t2huEAF19g@mail.gmail.com>
Subject: Re: [PATCH] selftests/uffd: Allow EINTR/EAGAIN
To:     Peter Xu <peterx@redhat.com>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrea Arcangeli <aarcange@redhat.com>,
        Nadav Amit <nadav.amit@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Looks correct to me!

Reviewed-by: Axel Rasmussen <axelrasmussen@google.com>

On Mon, Nov 15, 2021 at 5:52 AM Peter Xu <peterx@redhat.com> wrote:
>
> This allow test to continue with interruptions like gdb.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  tools/testing/selftests/vm/userfaultfd.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
> index 8a09057d2f22..64845be3971d 100644
> --- a/tools/testing/selftests/vm/userfaultfd.c
> +++ b/tools/testing/selftests/vm/userfaultfd.c
> @@ -644,7 +644,7 @@ static int uffd_read_msg(int ufd, struct uffd_msg *msg)
>
>         if (ret != sizeof(*msg)) {
>                 if (ret < 0) {
> -                       if (errno == EAGAIN)
> +                       if (errno == EAGAIN || errno == EINTR)
>                                 return 1;
>                         err("blocking read error");
>                 } else {
> @@ -720,8 +720,11 @@ static void *uffd_poll_thread(void *arg)
>
>         for (;;) {
>                 ret = poll(pollfd, 2, -1);
> -               if (ret <= 0)
> +               if (ret <= 0) {
> +                       if (errno == EINTR || errno == EAGAIN)
> +                               continue;
>                         err("poll error: %d", ret);
> +               }
>                 if (pollfd[1].revents & POLLIN) {
>                         if (read(pollfd[1].fd, &tmp_chr, 1) != 1)
>                                 err("read pipefd error");
> --
> 2.32.0
>