This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Fix i386 memmove issue [BZ #22644]
- From: Andrew Senkevich <andrew dot n dot senkevich at gmail dot com>
- To: Andreas Schwab <schwab at suse dot de>
- Cc: "H.J. Lu" <hjl dot tools at gmail dot com>, Florian Weimer <fweimer at redhat dot com>, Szabolcs Nagy <szabolcs dot nagy at arm dot com>, nd <nd at arm dot com>, libc-alpha <libc-alpha at sourceware dot org>, Max Horn <max at quendi dot de>, thomas at grindinggear dot com
- Date: Fri, 23 Mar 2018 18:14:52 +0100
- Subject: Re: [PATCH] Fix i386 memmove issue [BZ #22644]
- References: <CAMXFM3s5b2a6o_CMS0cJ35oE3SuJUHssqLAUY94LSZhEEtG71A@mail.gmail.com> <mvm606ts2w6.fsf@suse.de> <CAMXFM3vqw7eiUT1XYVZWyW=eJkgEpjNc74A8mbmdKuR_hywN3w@mail.gmail.com> <CAMe9rOo4Ys=ScEKKnuv5XvYqTHjvFxSkXjch8ya8sX7dfP+q4Q@mail.gmail.com> <CAMXFM3vA=-LSK5VtKhhbs0g9faBdG0GjoAbNb6OPEbSt8dAA7A@mail.gmail.com> <mvmlgeojjmi.fsf@suse.de> <597954a1-85da-e524-1454-27c46af57413@redhat.com> <e7d81f18-315c-4434-a734-41029c0d387f@arm.com> <8c8ab285-bddc-90e6-a50e-7be89703367a@redhat.com> <CAMXFM3s39wwjHt=5PBp=Np8Rp=mXHfPwMq6_evtfx9MV08-mtQ@mail.gmail.com> <CAMe9rOoCe+qiOFK8=dwxm+eB=_wSoHbXdid0RKSUHqOtM7Wwfg@mail.gmail.com> <CAMXFM3vWVVbe0unZaueF+u62KJ-Sxa6ttMdZRaf_UesxMU=ZKA@mail.gmail.com> <CAMe9rOqsVpCV24f7g=kpFeOAQ_rkHuj-ZN5TDqs7BZ814BDQkg@mail.gmail.com> <CAMXFM3ujXmdgVyew8mY7h=tMhEH+qdALnke6iavecPnX-rVz_Q@mail.gmail.com> <mvmo9jji0n3.fsf@suse.de>
2018-03-20 9:58 GMT+01:00 Andreas Schwab <schwab@suse.de>:
> On Mär 19 2018, Andrew Senkevich <andrew.n.senkevich@gmail.com> wrote:
>
>> diff --git a/string/test-memmove.c b/string/test-memmove.c
>> index edc7a4c..9f1437d 100644
>> --- a/string/test-memmove.c
>> +++ b/string/test-memmove.c
>> @@ -24,6 +24,7 @@
>> # define TEST_NAME "memmove"
>> #endif
>> #include "test-string.h"
>> +#include <support/test-driver.h>
>>
>> char *simple_memmove (char *, const char *, size_t);
>>
>> @@ -245,6 +246,60 @@ do_random_tests (void)
>> }
>> }
>>
>> +static void
>> +do_test2 (void)
>> +{
>> + size_t size = 0x20000000;
>> + uint32_t * large_buf;
>> +
>> + large_buf = mmap ((void*)0x70000000, size, PROT_READ | PROT_WRITE,
>> + MAP_PRIVATE | MAP_ANON, -1, 0);
>
> Style: line up indentation with paren.
>
>> +
>> + if (large_buf == MAP_FAILED)
>> + error (EXIT_UNSUPPORTED, errno, "Large mmap failed");
>> +
>> + if ((uintptr_t)large_buf > 0x80000000 - 128
>> + || 0x80000000 - (uintptr_t)large_buf > 0x20000000)
>
> Style: space after cast.
>
>> + {
>> + error (0, 0,"Large mmap allocated improperly");
>
> Style: space after comma.
>
>> + ret = EXIT_UNSUPPORTED;
>> + munmap((void *)large_buf, size);
>
> Style: space before paren and after cast.
>
>> + return;
>> + }
>> +
>> + size_t bytes_move = 0x80000000 - (uintptr_t)large_buf;
>
> Style: space after cast.
>
>> + size_t arr_size = bytes_move / sizeof(uint32_t);
>
> Style: space before paren.
>
>> + size_t i;
>> +
>> + FOR_EACH_IMPL (impl, 0)
>> + {
>> + for (i = 0; i < arr_size; i++)
>> + large_buf[i] = i;
>> +
>> + uint32_t * dst = &large_buf[33];
>> +
>> +#ifdef TEST_BCOPY
>> + CALL (impl, (char *)large_buf, (char *)dst, bytes_move);
>> +#else
>> + CALL (impl, (char *)dst, (char *)large_buf, bytes_move);
>> +#endif
>
> Styles: space after cast.
>
>> +
>> + for (i = 0; i < arr_size; i++)
>> + {
>> + if (dst[i] != i)
>> + {
>
> Style: wrong indentation.
>
>> + error (0, 0,
>> + "Wrong result in function %s dst \"%p\" src \"%p\" offset \"%d\"",
>> + impl->name, dst, large_buf, i);
>
> Style: line up indentation with paren.
>
>> + ret = 1;
>> + break;
>> + }
>> + }
>> + }
>> +
>> + munmap((void *)large_buf, size);
>
> Style: space before paren and after cast.
Thanks, committed with fixed style.
I will also backport it to affected branches.
--
WBR,
Andrew