From patchwork Mon Mar 19 17:52:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Senkevich X-Patchwork-Id: 26379 Received: (qmail 88482 invoked by alias); 19 Mar 2018 17:52:35 -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 88463 invoked by uid 89); 19 Mar 2018 17:52:34 -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-f68.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=geAcmQ/gIy4KFNjOo3ZIxx5Kjalv2RFoLHq0WnyhwYc=; b=bzzUuaG4kw5O79X4nBTDn9zU6IoyR/ipoFZiGwFIRIQ7cSgUJa5tzR38ITHPvbtRMh 6gpwoafva/t9jLMsUghEyprq1f/L3xY5CGwYyoEV7T4yPfJu1bQntk9bxeZj/ZKzvU7T 8iekSm5hAyEcY1HU+6H8+D1NrOUcizsoKbZX4IKyFh+LZv7y8Y1yTMi7eLl/g6+FyPzX 617Py6yYENV0pc2eICfSA9l+2SHqqMTiv1H1zDOARJ++SrTKPOdrEiXGukV//Je31rOH +2LEqwWxrhfwD0Pwy/3SknNfVNOPcUkAei0HNqYU4rEkgxRA1DDnRbIF/LV7HeodSoZc fbHA== X-Gm-Message-State: AElRT7FsR7jtUoTQVw331pQH88STUICHCVpie4gU95EdeSl1QXeWdvPZ vieF2VIBgtCrCKdFU8GE5nD5CemVO80I8h+olgg= X-Google-Smtp-Source: AG47ELuKWtmyzuXVepE4+BiSkpWVy1qPul/w9l+vOS4xhTNEhCyc+Qlk46F8EbAjfqm0v9tI7yT/JEPVXzT1yO1wN8o= X-Received: by 2002:a19:e48e:: with SMTP id x14-v6mr9044974lfi.115.1521481951190; Mon, 19 Mar 2018 10:52:31 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <8c8ab285-bddc-90e6-a50e-7be89703367a@redhat.com> References: <597954a1-85da-e524-1454-27c46af57413@redhat.com> <8c8ab285-bddc-90e6-a50e-7be89703367a@redhat.com> From: Andrew Senkevich Date: Mon, 19 Mar 2018 18:52:00 +0100 Message-ID: Subject: Re: [PATCH] Fix i386 memmove issue [BZ #22644] To: Florian Weimer Cc: Szabolcs Nagy , Andreas Schwab , nd@arm.com, "H.J. Lu" , libc-alpha , Max Horn , thomas@grindinggear.com 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: Ok? --- WBR, Andrew 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) + { + error (0, 0,"Large mmap doesn't cross 0x80000000 boundary"); + ret = EXIT_UNSUPPORTED; + munmap((void *)large_buf, size); + return; + } + + uint32_t bytes_move = 0x80000000 - (uintptr_t)large_buf; + uint32_t arr_size = bytes_move / sizeof(uint32_t); + uint32_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 +338,9 @@ test_main (void) } do_random_tests (); + + do_test2 (); + return ret; }