[LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Jan Stancek via ltp]

Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
added an extra checks for determining the maximum depth of an upwards walk,
which startign with 6.17-rc kernels now hits ELOOP before EINVAL.

Add ELOOP to list of expected errnos.

Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
index 955959b6b266..feb49623b15e 100644
--- a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
+++ b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
@@ -51,13 +51,16 @@ static void cleanup(void)
 
 static void verify_epoll_ctl(void)
 {
+	const int exp_errnos[] = {EINVAL, ELOOP};
+
 	new_epfd = epoll_create(1);
 	if (new_epfd == -1)
 		tst_brk(TBROK | TERRNO, "fail to create epoll instance");
 
 	events.data.fd = epfd;
-	TST_EXP_FAIL(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events), EINVAL,
-		     "epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
+	TST_EXP_FAIL2_ARR(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events),
+		exp_errnos, ARRAY_SIZE(exp_errnos),
+		"epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
 	SAFE_CLOSE(new_epfd);
 }
 
-- 
2.47.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Andrea Cervesato via ltp]

Thanks, it looks good.

Reviewed-by: Andrea Cervesato <andrea.cervesato@suse.com>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Petr Vorel]

Hi Jan,
> Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
> added an extra checks for determining the maximum depth of an upwards walk,
> which startign with 6.17-rc kernels now hits ELOOP before EINVAL.

> Add ELOOP to list of expected errnos.

Good catch, thanks!
Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Avinesh Kumar]

Hi,

Reviewed-by: Avinesh Kumar <akumar@suse.de>
Tested-by: Avinesh Kumar <akumar@suse.de>

tst_test.c:2007: TINFO: Tested kernel: 6.17.0-rc1-1-default+ #11 SMP PREEMPT_DYNAMIC Wed Aug 13 16:42:23 CEST 2025 x86_64
tst_kconfig.c:88: TINFO: Parsing kernel config '/proc/config.gz'
tst_kconfig.c:676: TINFO: CONFIG_FAULT_INJECTION kernel option detected which might slow the execution
tst_test.c:1825: TINFO: Overall timeout per run is 0h 02m 00s
epoll_ctl04.c:61: TPASS: epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5 : ELOOP (40)


Thank you,
Avinesh


On Tuesday, August 5, 2025 11:27:23 AM CEST Jan Stancek via ltp wrote:
> Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
> added an extra checks for determining the maximum depth of an upwards walk,
> which startign with 6.17-rc kernels now hits ELOOP before EINVAL.
> 
> Add ELOOP to list of expected errnos.
> 
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
> ---
>  testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> index 955959b6b266..feb49623b15e 100644
> --- a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> +++ b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> @@ -51,13 +51,16 @@ static void cleanup(void)
>  
>  static void verify_epoll_ctl(void)
>  {
> +	const int exp_errnos[] = {EINVAL, ELOOP};
> +
>  	new_epfd = epoll_create(1);
>  	if (new_epfd == -1)
>  		tst_brk(TBROK | TERRNO, "fail to create epoll instance");
>  
>  	events.data.fd = epfd;
> -	TST_EXP_FAIL(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events), EINVAL,
> -		     "epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
> +	TST_EXP_FAIL2_ARR(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events),
> +		exp_errnos, ARRAY_SIZE(exp_errnos),
> +		"epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
>  	SAFE_CLOSE(new_epfd);
>  }
>  
> 





-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Avinesh Kumar]

Hi,
Also below typo fix in commit message.

Thanks!


On Tuesday, August 5, 2025 11:27:23 AM CEST Jan Stancek via ltp wrote:
> Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
> added an extra checks for determining the maximum depth of an upwards walk,
> which startign with 6.17-rc kernels now hits ELOOP before EINVAL.
s/startign/starting


> 
> Add ELOOP to list of expected errnos.
> 
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
> ---
>  testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> index 955959b6b266..feb49623b15e 100644
> --- a/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> +++ b/testcases/kernel/syscalls/epoll_ctl/epoll_ctl04.c
> @@ -51,13 +51,16 @@ static void cleanup(void)
>  
>  static void verify_epoll_ctl(void)
>  {
> +	const int exp_errnos[] = {EINVAL, ELOOP};
> +
>  	new_epfd = epoll_create(1);
>  	if (new_epfd == -1)
>  		tst_brk(TBROK | TERRNO, "fail to create epoll instance");
>  
>  	events.data.fd = epfd;
> -	TST_EXP_FAIL(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events), EINVAL,
> -		     "epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
> +	TST_EXP_FAIL2_ARR(epoll_ctl(new_epfd, EPOLL_CTL_ADD, epfd, &events),
> +		exp_errnos, ARRAY_SIZE(exp_errnos),
> +		"epoll_ctl(..., EPOLL_CTL_ADD, ...) with number of nesting is 5");
>  	SAFE_CLOSE(new_epfd);
>  }
>  
> 





-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Petr Vorel]

Hi Jan, all,

> Hi,
> Also below typo fix in commit message.

> Thanks!


> On Tuesday, August 5, 2025 11:27:23 AM CEST Jan Stancek via ltp wrote:
> > Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
> > added an extra checks for determining the maximum depth of an upwards walk,
> > which startign with 6.17-rc kernels now hits ELOOP before EINVAL.
> s/startign/starting

I dared to merge your patch, with above description fixed.

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] syscalls/epoll_ctl04: add ELOOP to expected errnos

[Jan Stancek via ltp]

On Thu, Aug 14, 2025 at 6:26 AM Petr Vorel <pvorel@suse.cz> wrote:
>
> Hi Jan, all,
>
> > Hi,
> > Also below typo fix in commit message.
>
> > Thanks!
>
>
> > On Tuesday, August 5, 2025 11:27:23 AM CEST Jan Stancek via ltp wrote:
> > > Kernel commit f2e467a48287 ("eventpoll: Fix semi-unbounded recursion")
> > > added an extra checks for determining the maximum depth of an upwards walk,
> > > which startign with 6.17-rc kernels now hits ELOOP before EINVAL.
> > s/startign/starting
>
> I dared to merge your patch, with above description fixed.

Thanks (I went on holidays before I could merge this).

>
> Kind regards,
> Petr
>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp