From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id A67353858C78 for ; Thu, 16 Feb 2023 21:39:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A67353858C78 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,302,1669104000"; d="scan'208,223";a="97280236" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 16 Feb 2023 13:39:54 -0800 IronPort-SDR: ftQe1QTN5rJ/6JcBXSJcZcMSwrvF/XTSmT2q+kUg1SRFvZ/uH5JXkvx8ABKoDDBHVDvk+XbZCR KMbusJEV/VVcHhEePKPq+70WO7RBURsCFYi2TFzAYT+zb1X6PxVNK+mFini6mIQPsbPAWRYzw5 YpFYS6tkZ5vmY8nkXj4OysUF5zBn3mMlRkuDFkrOo+oarsv1ho19ZSfuefZpkntD8Lcx2BGshy t/V71z9OqxFvp4nVTiSsPw3kcP23kcSkfz6tLkTvsAO43nBJJOA57NBv5IYG5fYAOQXaCT8pRZ Eks= From: Thomas Schwinge To: Andrew Stubbs , CC: Jakub Jelinek Subject: [og12] Clarify/verify OpenMP 'omp_calloc' zero-initialization for pinned memory (was: [PATCH] libgomp, openmp: pinned memory) In-Reply-To: References: <20220104155558.GG2646553@tucnak> <48ee767a-0d90-53b4-ea54-9deba9edd805@codesourcery.com> <20220104182829.GK2646553@tucnak> <20220104184740.GL2646553@tucnak> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 16 Feb 2023 22:39:44 +0100 Message-ID: <87ttzlxpb3.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2022-01-13T13:53:03+0000, Andrew Stubbs wrote: > Pinned memory is allocated via mmap > --- /dev/null > +++ b/libgomp/config/linux/allocator.c > +static void * > +linux_memspace_calloc (omp_memspace_handle_t memspace, size_t size, int = pin) > +{ > + if (pin) > + return linux_memspace_alloc (memspace, size, pin); > +[...] This confused me for a moment, why we don't have to manually zero-initialize here. I've pushed to devel/omp/gcc-12 branch commit 57b8f0600262566cd4f1ab12bf1bdafb29dbdc34 "Clarify/verify OpenMP 'omp_calloc' zero-initialization for pinned memory", see attached. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-Clarify-verify-OpenMP-omp_calloc-zero-initialization.patch" >From 57b8f0600262566cd4f1ab12bf1bdafb29dbdc34 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 15 Feb 2023 10:23:03 +0100 Subject: [PATCH] Clarify/verify OpenMP 'omp_calloc' zero-initialization for pinned memory Clarification for og12 commit ab7520b3b4cd9fdabfd63652badde478955bd3b5 "libgomp: pinned memory". No functional change. libgomp/ * config/linux/allocator.c (linux_memspace_alloc) (linux_memspace_calloc): Clarify zero-initialization for pinned memory. * testsuite/libgomp.c/alloc-pinned-1.c: Verify zero-initialization for pinned memory. * testsuite/libgomp.c/alloc-pinned-2.c: Likewise. * testsuite/libgomp.c/alloc-pinned-3.c: Likewise. * testsuite/libgomp.c/alloc-pinned-4.c: Likewise. * testsuite/libgomp.c/alloc-pinned-5.c: Likewise. --- libgomp/ChangeLog.omp | 10 ++++++++++ libgomp/config/linux/allocator.c | 2 ++ libgomp/testsuite/libgomp.c/alloc-pinned-1.c | 10 ++++++++++ libgomp/testsuite/libgomp.c/alloc-pinned-2.c | 10 ++++++++++ libgomp/testsuite/libgomp.c/alloc-pinned-3.c | 9 +++++++++ libgomp/testsuite/libgomp.c/alloc-pinned-4.c | 9 +++++++++ libgomp/testsuite/libgomp.c/alloc-pinned-5.c | 10 ++++++++++ 7 files changed, 60 insertions(+) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 1c4b1833c0b..530f5c6acf6 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,15 @@ 2023-02-16 Thomas Schwinge + * config/linux/allocator.c (linux_memspace_alloc) + (linux_memspace_calloc): Clarify zero-initialization for pinned + memory. + * testsuite/libgomp.c/alloc-pinned-1.c: Verify zero-initialization + for pinned memory. + * testsuite/libgomp.c/alloc-pinned-2.c: Likewise. + * testsuite/libgomp.c/alloc-pinned-3.c: Likewise. + * testsuite/libgomp.c/alloc-pinned-4.c: Likewise. + * testsuite/libgomp.c/alloc-pinned-5.c: Likewise. + * config/linux/allocator.c (linux_memspace_calloc): Elide (innocuous) duplicate 'if' condition. * config/nvptx/allocator.c (nvptx_memspace_free): Explicitly diff --git a/libgomp/config/linux/allocator.c b/libgomp/config/linux/allocator.c index 8a9171c36df..f278e5cdf14 100644 --- a/libgomp/config/linux/allocator.c +++ b/libgomp/config/linux/allocator.c @@ -65,6 +65,7 @@ linux_memspace_alloc (omp_memspace_handle_t memspace, size_t size, int pin) } else if (pin) { + /* 'mmap' zero-initializes, which 'linux_memspace_calloc' relies on. */ void *addr = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (addr == MAP_FAILED) @@ -96,6 +97,7 @@ linux_memspace_calloc (omp_memspace_handle_t memspace, size_t size, int pin) return ret; } else if (pin) + /* If PINned, 'linux_memspace_alloc' 'mmap's, which zero-initializes. */ return linux_memspace_alloc (memspace, size, pin); else return calloc (1, size); diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c index 79792b16d83..fb7ac8b0080 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c @@ -54,6 +54,14 @@ get_pinned_mem () } #endif +static void +verify0 (char *p, size_t s) +{ + for (size_t i = 0; i < s; ++i) + if (p[i] != 0) + abort (); +} + #include int @@ -91,5 +99,7 @@ main () if (get_pinned_mem () <= amount2) abort (); + verify0 (p, SIZE); + return 0; } diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c index 228c656b715..651b89fb42f 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c @@ -54,6 +54,14 @@ get_pinned_mem () } #endif +static void +verify0 (char *p, size_t s) +{ + for (size_t i = 0; i < s; ++i) + if (p[i] != 0) + abort (); +} + #include int @@ -97,5 +105,7 @@ main () if (get_pinned_mem () <= amount2) abort (); + verify0 (p, SIZE); + return 0; } diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-3.c b/libgomp/testsuite/libgomp.c/alloc-pinned-3.c index 90539ffe3e0..f41797881ef 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-3.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-3.c @@ -61,6 +61,14 @@ set_pin_limit () } #endif +static void +verify0 (char *p, size_t s) +{ + for (size_t i = 0; i < s; ++i) + if (p[i] != 0) + abort (); +} + #include int @@ -109,6 +117,7 @@ main () p = omp_calloc (1, SIZE, allocator2); if (!p) abort (); + verify0 (p, SIZE); // Should fail to realloc void *notpinned = omp_alloc (SIZE, omp_default_mem_alloc); diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-4.c b/libgomp/testsuite/libgomp.c/alloc-pinned-4.c index 534e49eefc4..a878da8c558 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-4.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-4.c @@ -61,6 +61,14 @@ set_pin_limit () } #endif +static void +verify0 (char *p, size_t s) +{ + for (size_t i = 0; i < s; ++i) + if (p[i] != 0) + abort (); +} + #include int @@ -111,6 +119,7 @@ main () p = omp_calloc (1, SIZE, allocator2); if (!p) abort (); + verify0 (p, SIZE); // Should fail to realloc void *notpinned = omp_alloc (SIZE, omp_default_mem_alloc); diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-5.c b/libgomp/testsuite/libgomp.c/alloc-pinned-5.c index 315c7161a39..65983b3d03d 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-5.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-5.c @@ -54,6 +54,14 @@ get_pinned_mem () } #endif +static void +verify0 (char *p, size_t s) +{ + for (size_t i = 0; i < s; ++i) + if (p[i] != 0) + abort (); +} + #include int @@ -86,5 +94,7 @@ main () if (get_pinned_mem () <= amount2) abort (); + verify0 (p, SIZE); + return 0; } -- 2.25.1 --=-=-=--