From: Matheus Castanho <msc@linux.ibm.com>
To: Noah Goldstein <goldstein.w.n@gmail.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH v2] String: Ensure 'MIN_PAGE_SIZE' is multiple of 'getpagesize'
Date: Tue, 08 Feb 2022 10:14:32 -0300 [thread overview]
Message-ID: <87bkzhcvcz.fsf@linux.ibm.com> (raw)
In-Reply-To: <20220207214136.3443442-1-goldstein.w.n@gmail.com>
string/test-strcmp and wcsmbs/test-wcscmp are passing with this new
patch, but string/test-strncmp and wcsmbs/test-wcsncmp are failing to
compile. With the fix below all tests pass.
Tested on powerpc, powerpc64 and powerpc64le.
Noah Goldstein via Libc-alpha <libc-alpha@sourceware.org> writes:
> When 'TEST_LEN' was defined as (4096 * 3) the allocation size Would
> not be a multiple of system page size if system page size > 4096.
> ---
> string/test-strcmp.c | 14 +++++++-------
> string/test-strncmp.c | 18 +++++++++---------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/string/test-strcmp.c b/string/test-strcmp.c
> index eacbdc8857..0abce769d0 100644
> --- a/string/test-strcmp.c
> +++ b/string/test-strcmp.c
> @@ -16,7 +16,7 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#define TEST_LEN (4096 * 3)
> +#define TEST_LEN (getpagesize () * 3)
> #define MIN_PAGE_SIZE (TEST_LEN + 2 * getpagesize ())
>
> #define TEST_MAIN
> @@ -393,7 +393,7 @@ int
> test_main (void)
> {
> size_t i, j;
> -
> + const size_t test_len = MIN(TEST_LEN, 3 * 4096);
> test_init ();
> check();
> check2 ();
> @@ -435,7 +435,7 @@ test_main (void)
>
> for (j = 0; j < 160; ++j)
> {
> - for (i = 0; i < TEST_LEN;)
> + for (i = 0; i < test_len;)
> {
> do_test (getpagesize () - j - 1, 0, i, 127, 0);
> do_test (getpagesize () - j - 1, 0, i, 127, 1);
> @@ -461,17 +461,17 @@ test_main (void)
> {
> i += 7;
> }
> - else if (i + 161 < TEST_LEN)
> + else if (i + 161 < test_len)
> {
> i += 31;
> i *= 17;
> i /= 16;
> - if (i + 161 > TEST_LEN)
> + if (i + 161 > test_len)
> {
> - i = TEST_LEN - 160;
> + i = test_len - 160;
> }
> }
> - else if (i + 32 < TEST_LEN)
> + else if (i + 32 < test_len)
> {
> i += 7;
> }
> diff --git a/string/test-strncmp.c b/string/test-strncmp.c
> index 1a3cee1792..1966bde3fe 100644
> --- a/string/test-strncmp.c
> +++ b/string/test-strncmp.c
> @@ -16,7 +16,7 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#define TEST_LEN (4096 * 3)
> +#define TEST_LEN (getpagesize () * 3)
> #define MIN_PAGE_SIZE (TEST_LEN + 2 * getpagesize ())
>
> #define TEST_MAIN
> @@ -430,7 +430,7 @@ check_overflow (void)
> const size_t of_masks[]
> = { ULONG_MAX, LONG_MIN, ULONG_MAX - (ULONG_MAX >> 2),
> ((size_t)LONG_MAX) >> 1 };
> -
> + const size_t test_len = MIN(test_len, 3 * 4096);
Should be MIN(TEST_LEN, 3 * 4096)
> for (of_idx = 0; of_idx < sizeof (of_masks) / sizeof (of_masks[0]); ++of_idx)
> {
> of_mask = of_masks[of_idx];
> @@ -484,7 +484,7 @@ check_overflow (void)
> of_mask - j * 2, 0, 127, -1);
> }
>
> - for (i = 1; i < TEST_LEN; i += i)
> + for (i = 1; i < test_len; i += i)
> {
> do_test_n (j, 0, i - 1, of_mask, 0, 127, 0);
> do_test_n (j, 0, i - 1, of_mask, 0, 127, 1);
> @@ -540,7 +540,7 @@ int
> test_main (void)
> {
> size_t i, j;
> -
> + const size_t test_len = MIN(test_len, 3 * 4096);
Should be MIN(TEST_LEN, 3 * 4096)
> test_init ();
>
> check1 ();
> @@ -608,7 +608,7 @@ test_main (void)
>
> for (j = 0; j < 160; ++j)
> {
> - for (i = 0; i < TEST_LEN;)
> + for (i = 0; i < test_len;)
> {
> do_test_n (getpagesize () - j - 1, 0, i, i + 1, 0, 127, 0);
> do_test_n (getpagesize () - j - 1, 0, i, i + 1, 0, 127, 1);
> @@ -677,17 +677,17 @@ test_main (void)
> {
> i += 7;
> }
> - else if (i + 161 < TEST_LEN)
> + else if (i + 161 < test_len)
> {
> i += 31;
> i *= 17;
> i /= 16;
> - if (i + 161 > TEST_LEN)
> + if (i + 161 > test_len)
> {
> - i = TEST_LEN - 160;
> + i = test_len - 160;
> }
> }
> - else if (i + 32 < TEST_LEN)
> + else if (i + 32 < test_len)
> {
> i += 7;
> }
--
Matheus Castanho
next prev parent reply other threads:[~2022-02-08 13:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 20:16 [PATCH v1] String: Ensure 'MIN_PAGE_SIZE' is factor " Noah Goldstein
2022-02-07 21:10 ` Andreas Schwab
2022-02-07 21:42 ` Noah Goldstein
2022-02-07 21:41 ` [PATCH v2] String: Ensure 'MIN_PAGE_SIZE' is multiple " Noah Goldstein
2022-02-08 13:14 ` Matheus Castanho [this message]
2022-02-08 21:25 ` Noah Goldstein
2022-02-08 21:24 ` [PATCH v3] " Noah Goldstein
2022-02-09 13:57 ` Tulio Magno Quites Machado Filho
2022-02-09 20:48 ` Noah Goldstein
2022-02-10 14:05 ` Tulio Magno Quites Machado Filho
2022-02-10 14:01 ` Matheus Castanho
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkzhcvcz.fsf@linux.ibm.com \
--to=msc@linux.ibm.com \
--cc=goldstein.w.n@gmail.com \
--cc=libc-alpha@sourceware.org \
/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).