From: Michael Hudson-Doyle via Libc-alpha <libc-alpha@sourceware.org>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH 2/2] Use support_open_dev_null_range io/tst-closefrom, misc/tst-close_range, and posix/tst-spawn5 (BZ #28260)
Date: Wed, 25 Aug 2021 15:41:16 +1200 [thread overview]
Message-ID: <CAJ8wqtcaT+-vRcYR=vn7Jb2UQ1EJs9jiKitMbFWWSraCStkugw@mail.gmail.com> (raw)
In-Reply-To: <CAJ8wqtcDD8u+w=kr6qHSTtQ1N4T-Xm3FDdPksyp-yNu-gO4UjQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6672 bytes --]
On Wed, 25 Aug 2021 at 15:15, Michael Hudson-Doyle <
michael.hudson@canonical.com> wrote:
> Hi, thanks for looking at this.
>
> On Wed, 25 Aug 2021 at 07:29, Adhemerval Zanella via Libc-alpha <
> libc-alpha@sourceware.org> wrote:
>
>> It ensures a continuous range of file descriptor and avoid hitting
>> the RLIMIT_NOFILE.
>>
>> Checked on x86_64-linux-gnu.
>> ---
>> io/tst-closefrom.c | 15 +++-----------
>> posix/tst-spawn5.c | 13 +-----------
>> sysdeps/unix/sysv/linux/tst-close_range.c | 25 +++++++----------------
>> 3 files changed, 11 insertions(+), 42 deletions(-)
>>
>> diff --git a/io/tst-closefrom.c b/io/tst-closefrom.c
>> index d4c187073c..0800e19f3f 100644
>> --- a/io/tst-closefrom.c
>> +++ b/io/tst-closefrom.c
>> @@ -24,29 +24,20 @@
>> #include <support/check.h>
>> #include <support/descriptors.h>
>> #include <support/xunistd.h>
>> +#include <support/support.h>
>>
>> #include <array_length.h>
>>
>> #define NFDS 100
>>
>> -static int
>> -open_multiple_temp_files (void)
>> -{
>> - /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
>> - for (int i = 1; i <= NFDS; i++)
>> - TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), lowfd + i);
>> - return lowfd;
>> -}
>> -
>> static int
>> closefrom_test (void)
>> {
>> struct support_descriptors *descrs = support_descriptors_list ();
>>
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> - const int maximum_fd = lowfd + NFDS;
>> + const int maximum_fd = lowfd + NFDS - 1;
>> const int half_fd = lowfd + NFDS / 2;
>> const int gap = maximum_fd / 4;
>>
>
> There are two for loops in this function that iterate from 0:
>
> for (int i = 0; i < half_fd; i++)
> TEST_VERIFY (fcntl (i, F_GETFL) > -1);
>
> for (int i = 0; i < gap; i++)
> TEST_VERIFY (fcntl (i, F_GETFL) > -1);
>
> These should both iterate from i = lowfd I think? (And maybe should have
> done before this change?) Certainly they fail in the cases this patch is
> trying to fix.
>
> diff --git a/posix/tst-spawn5.c b/posix/tst-spawn5.c
>> index ac66738004..a95199af6b 100644
>> --- a/posix/tst-spawn5.c
>> +++ b/posix/tst-spawn5.c
>> @@ -47,17 +47,6 @@ static int initial_argv_count;
>>
>> #define NFDS 100
>>
>> -static int
>> -open_multiple_temp_files (void)
>> -{
>> - /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
>> - for (int i = 1; i <= NFDS; i++)
>> - TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600),
>> - lowfd + i);
>> - return lowfd;
>> -}
>> -
>> static int
>> parse_fd (const char *str)
>> {
>> @@ -185,7 +174,7 @@ spawn_closefrom_test (posix_spawn_file_actions_t *fa,
>> int lowfd, int highfd,
>> static void
>> do_test_closefrom (void)
>> {
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>> const int half_fd = lowfd + NFDS / 2;
>>
>> /* Close half of the descriptors and check result. */
>> diff --git a/sysdeps/unix/sysv/linux/tst-close_range.c
>> b/sysdeps/unix/sysv/linux/tst-close_range.c
>> index dccb6189c5..3548b10363 100644
>> --- a/sysdeps/unix/sysv/linux/tst-close_range.c
>> +++ b/sysdeps/unix/sysv/linux/tst-close_range.c
>>
>
> This for look in close_range_unshare_test in this file needs to change too:
>
> for (int i = 0; i < NFDS; i++)
> TEST_VERIFY (fcntl (i, F_GETFL) > -1);
>
> (presumably to iterate from low_fd to lowfd + NFDS).
>
>
>> @@ -36,23 +36,12 @@
>>
>> #define NFDS 100
>>
>> -static int
>> -open_multiple_temp_files (void)
>> -{
>> - /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
>> - for (int i = 1; i <= NFDS; i++)
>> - TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600),
>> - lowfd + i);
>> - return lowfd;
>> -}
>> -
>> static void
>> close_range_test_max_upper_limit (void)
>> {
>> struct support_descriptors *descrs = support_descriptors_list ();
>>
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> {
>> int r = close_range (lowfd, ~0U, 0);
>> @@ -68,7 +57,7 @@ close_range_test_max_upper_limit (void)
>> static void
>> close_range_test_common (int lowfd, unsigned int flags)
>> {
>> - const int maximum_fd = lowfd + NFDS;
>> + const int maximum_fd = lowfd + NFDS - 1;
>> const int half_fd = lowfd + NFDS / 2;
>> const int gap_1 = maximum_fd - 8;
>>
>> @@ -121,7 +110,7 @@ close_range_test (void)
>> struct support_descriptors *descrs = support_descriptors_list ();
>>
>> /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> close_range_test_common (lowfd, 0);
>>
>> @@ -146,7 +135,7 @@ close_range_test_subprocess (void)
>> struct support_descriptors *descrs = support_descriptors_list ();
>>
>> /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> struct support_stack stack = support_stack_alloc (4096);
>>
>> @@ -184,7 +173,7 @@ close_range_unshare_test (void)
>> struct support_descriptors *descrs1 = support_descriptors_list ();
>>
>> /* Check if the temporary file descriptor has no no gaps. */
>> - int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> struct support_descriptors *descrs2 = support_descriptors_list ();
>>
>> @@ -226,9 +215,9 @@ static void
>> close_range_cloexec_test (void)
>> {
>> /* Check if the temporary file descriptor has no no gaps. */
>> - const int lowfd = open_multiple_temp_files ();
>> + int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600);
>>
>> - const int maximum_fd = lowfd + NFDS;
>> + const int maximum_fd = lowfd + NFDS - 1;
>> const int half_fd = lowfd + NFDS / 2;
>> const int gap_1 = maximum_fd - 8;
>>
>> --
>> 2.30.2
>>
>
> Cheers,
> mwh
>
I'm attaching a patch which when applied on top of this one makes these
tests pass my hackish way of reproducing the issue:
mwhudson@anduril:~/src/pkg/build-glibc$ bash -c 'exec 40</dev/null;
LD_LIBRARY_PATH=. ./elf/ld-linux-x86-64.so.2 ./misc/tst-close_range'
mwhudson@anduril:~/src/pkg/build-glibc$ bash -c 'exec 40</dev/null;
LD_LIBRARY_PATH=. ./elf/ld-linux-x86-64.so.2 ./io/tst-closefrom'
Cheers,
mwh
[-- Attachment #2: mwhudson.patch --]
[-- Type: text/x-patch, Size: 1203 bytes --]
--- a/io/tst-closefrom.c
+++ b/io/tst-closefrom.c
@@ -39,7 +39,7 @@
const int maximum_fd = lowfd + NFDS - 1;
const int half_fd = lowfd + NFDS / 2;
- const int gap = maximum_fd / 4;
+ const int gap = lowfd + NFDS / 4;
/* Close half of the descriptors and check result. */
closefrom (half_fd);
@@ -49,7 +49,7 @@
TEST_COMPARE (fcntl (i, F_GETFL), -1);
TEST_COMPARE (errno, EBADF);
}
- for (int i = 0; i < half_fd; i++)
+ for (int i = lowfd; i < half_fd; i++)
TEST_VERIFY (fcntl (i, F_GETFL) > -1);
/* Create some gaps, close up to a threshold, and check result. */
@@ -65,7 +65,7 @@
TEST_COMPARE (fcntl (i, F_GETFL), -1);
TEST_COMPARE (errno, EBADF);
}
- for (int i = 0; i < gap; i++)
+ for (int i = lowfd; i < gap; i++)
TEST_VERIFY (fcntl (i, F_GETFL) > -1);
/* Close the remmaining but the last one. */
--- a/sysdeps/unix/sysv/linux/tst-close_range.c
+++ b/sysdeps/unix/sysv/linux/tst-close_range.c
@@ -189,7 +189,7 @@
support_stack_free (&stack);
- for (int i = 0; i < NFDS; i++)
+ for (int i = lowfd; i < lowfd + NFDS; i++)
TEST_VERIFY (fcntl (i, F_GETFL) > -1);
support_descriptors_check (descrs2);
next prev parent reply other threads:[~2021-08-25 3:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 19:28 [PATCH 0/2] Fix close_range/closefrom tests Adhemerval Zanella via Libc-alpha
2021-08-24 19:28 ` [PATCH 1/2] support: Add support_open_dev_null_range Adhemerval Zanella via Libc-alpha
2021-08-24 19:28 ` [PATCH 2/2] Use support_open_dev_null_range io/tst-closefrom, misc/tst-close_range, and posix/tst-spawn5 (BZ #28260) Adhemerval Zanella via Libc-alpha
2021-08-25 3:15 ` Michael Hudson-Doyle via Libc-alpha
2021-08-25 3:41 ` Michael Hudson-Doyle via Libc-alpha [this message]
2021-08-25 8:40 ` Michael Hudson-Doyle via Libc-alpha
2021-08-25 11:46 ` Adhemerval Zanella via Libc-alpha
2021-09-14 0:46 ` Michael Hudson-Doyle via Libc-alpha
2021-09-16 12:09 ` Florian Weimer via Libc-alpha
2021-09-16 23:44 ` Michael Hudson-Doyle via Libc-alpha
2021-09-17 10:12 ` Florian Weimer via Libc-alpha
2021-09-19 21:57 ` Michael Hudson-Doyle via Libc-alpha
2021-09-20 10:54 ` Florian Weimer via Libc-alpha
2021-09-20 23:20 ` Michael Hudson-Doyle via Libc-alpha
2021-09-21 10:30 ` Michael Hudson-Doyle via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ8wqtcaT+-vRcYR=vn7Jb2UQ1EJs9jiKitMbFWWSraCStkugw@mail.gmail.com' \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
--cc=michael.hudson@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).