Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e05d3b3d-223f-ecf9-0e41-25bbae33eb54@kernel.dk>
Date:   Wed, 7 Dec 2022 18:36:07 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.1
Subject: Re: next: LTP: syscalls: epoll_clt() if fd is an invalid fd expected
 EBADF: EINVAL (22)
Content-Language: en-US
To:     Anders Roxell <anders.roxell@linaro.org>
Cc:     Naresh Kamboju <naresh.kamboju@linaro.org>,
        open list <linux-kernel@vger.kernel.org>,
        linux-fsdevel@vger.kernel.org, regressions@lists.linux.dev,
        lkft-triage@lists.linaro.org,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        LTP List <ltp@lists.linux.it>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Arnd Bergmann <arnd@arndb.de>, chrubis <chrubis@suse.cz>
References: <CA+G9fYv_UU+oVUbd8Mzt8FkXscenX2kikRSCZ7DPXif9i5erNg@mail.gmail.com>
 <b7d8193c-7e15-f5cd-08d4-8ef788d9bb36@kernel.dk>
 <CADYN=9LaiBU-Q5=FSvFKTi_qzE1C45DkdUAfbaZH7FZhn2tbYw@mail.gmail.com>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <CADYN=9LaiBU-Q5=FSvFKTi_qzE1C45DkdUAfbaZH7FZhn2tbYw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 12/7/22 3:27 PM, Anders Roxell wrote:
> On Wed, 7 Dec 2022 at 17:22, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 12/7/22 8:58?AM, Naresh Kamboju wrote:
>>> LTP syscalls epoll_ctl02 is failing on Linux next master.
>>> The reported problem is always reproducible and starts from next-20221205.
>>>
>>> GOOD tag: next-20221202
>>> BAD tag: next-20221205
>>>
>>> tst_test.c:1524: TINFO: Timeout per run is 0h 05m 00s
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if epfd is an invalid fd : EBADF (9)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if fd does not support epoll : EPERM (1)
>>> epoll_ctl02.c:87: TFAIL: epoll_clt(...) if fd is an invalid fd
>>> expected EBADF: EINVAL (22)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if op is not supported : EINVAL (22)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if fd is the same as epfd : EINVAL (22)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if events is NULL : EFAULT (14)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if fd is not registered with
>>> EPOLL_CTL_DEL : ENOENT (2)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if fd is not registered with
>>> EPOLL_CTL_MOD : ENOENT (2)
>>> epoll_ctl02.c:87: TPASS: epoll_clt(...) if fd is already registered
>>> with EPOLL_CTL_ADD : EEXIST (17)
>>
>> This should fix it:
>>
>>
>> diff --git a/fs/eventpoll.c b/fs/eventpoll.c
>> index ec7ffce8265a..de9c551e1993 100644
>> --- a/fs/eventpoll.c
>> +++ b/fs/eventpoll.c
>> @@ -2195,6 +2195,7 @@ int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
>>         }
>>
>>         /* Get the "struct file *" for the target file */
>> +       error = -EBADF;
>>         tf = fdget(fd);
>>         if (!tf.file)
>>                 goto error_fput;
> 
> Yes this patch fixed the issue [1].
> 
> Cheers,
> Anders
> [1] https://lkft.validation.linaro.org/scheduler/job/5931365#L1371

Great, thanks for confirming. I did queue up the fix.

-- 
Jens Axboe