From patchwork Mon Mar 19 19:29:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Senkevich X-Patchwork-Id: 26383 Received: (qmail 5346 invoked by alias); 19 Mar 2018 19:30:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 5237 invoked by uid 89); 19 Mar 2018 19:30:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-lf0-f67.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9r6ez9KCeNlAccsUCwCFIVZy64zRx2jugWISB+OKnO4=; b=isFRcr10dFhoXKHHyHOrxEMtpvPkTX7lEs3JAg8IMBcy1iRglkcD3gRSrBGmvYSr0e xdvFqNC6koRnCNpihZShvEuylHwpRxAxdVfOwIHPvQFHLJU4Y1F79DqS21m40FK7tmHI LrN8U0w0BzQBNC4Pgsb7Ty7x9pl9aJ5M8iKlaLz96cDlRodJcN1Wj12xQx7q6c7zcNzI I5deC1RD1LFd6bZYgqJGtJ4LVH12Ef7cCvGnmbz1lqB1LJ9UIF1E5+3rde/WRQKQwyE0 +cF17oaSDcJANdctpsjPwmRlt1+w/7RwPhm+OgxgVmcHWa8I4+xPURhpqOLUhDrLkhMJ BqyQ== X-Gm-Message-State: AElRT7H59pR001WbSHX/mi/rh99ihSl9U5btwOnMQyATShvt5jNS1sdq +Ie86ZOqZ2qumy3V4AIQ77uQJoavUYAVV+MpmLs= X-Google-Smtp-Source: AG47ELuCPAy6hRm2mwyffxEewMGYDn7Bmb5MQ6NhUP/ndYaoFC9BBo6Sz+5ga9NeI7f2ljgzxmtzIAMTN96aoDThcVI= X-Received: by 10.46.124.8 with SMTP id x8mr8509115ljc.121.1521487825226; Mon, 19 Mar 2018 12:30:25 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <597954a1-85da-e524-1454-27c46af57413@redhat.com> <8c8ab285-bddc-90e6-a50e-7be89703367a@redhat.com> From: Andrew Senkevich Date: Mon, 19 Mar 2018 20:29:54 +0100 Message-ID: Subject: Re: [PATCH] Fix i386 memmove issue [BZ #22644] To: "H.J. Lu" Cc: Florian Weimer , Szabolcs Nagy , Andreas Schwab , nd , libc-alpha , Max Horn , thomas@grindinggear.com 2018-03-19 18:57 GMT+01:00 H.J. Lu : > On Mon, Mar 19, 2018 at 10:52 AM, Andrew Senkevich > wrote: >> 2018-03-19 16:33 GMT+01:00 Florian Weimer : >>> On 03/19/2018 03:25 PM, Szabolcs Nagy wrote: >>>> >>>> i thought not using MAP_FIXED is the 'non-overriding MAP_FIXED variant' >> >> Hmm, I tried so and had got much bigger address. But now I see it >> works (with size just 0x20000000 and 0x70000000 as a hint) in both 64 >> and 32 bit cases, so proposing the following: >> >> diff --git a/string/test-memmove.c b/string/test-memmove.c >> index edc7a4c..fa4037d 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 >> >> char *simple_memmove (char *, const char *, size_t); >> >> @@ -245,6 +246,59 @@ 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); >> + >> + if (large_buf == MAP_FAILED) >> + error (EXIT_UNSUPPORTED, errno, "Large mmap failed"); >> + >> + if ((uintptr_t)large_buf > 0x80000000 - 128) > > Don't you need to test if address is too low such that > 0x80000000 - (uintptr_t)large_buf > 0x20000000? Indeed, thanks. Updated below. --- WBR, Andrew 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 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); + + 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) + { + error (0, 0,"Large mmap allocated improperly"); + ret = EXIT_UNSUPPORTED; + munmap((void *)large_buf, size); + return; + } + + size_t bytes_move = 0x80000000 - (uintptr_t)large_buf; + size_t arr_size = bytes_move / sizeof(uint32_t); + 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 + + for (i = 0; i < arr_size; i++) + { + if (dst[i] != i) + { + error (0, 0, + "Wrong result in function %s dst \"%p\" src \"%p\" offset \"%d\"", + impl->name, dst, large_buf, i); + ret = 1; + break; + } + } + } + + munmap((void *)large_buf, size); +} + int test_main (void) { @@ -284,6 +339,9 @@ test_main (void) } do_random_tests (); + + do_test2 (); + return ret; }