From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 3D40F385800D; Tue, 19 Oct 2021 13:39:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D40F385800D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] openmp: Fix handling of numa_domains(1) X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: dd409835f568358a8f159edce94ad06a471dc59b X-Git-Newrev: d5a841968fb12b71c20fedad55d99656711dcc3e Message-Id: <20211019133906.3D40F385800D@sourceware.org> Date: Tue, 19 Oct 2021 13:39:06 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2021 13:39:06 -0000 https://gcc.gnu.org/g:d5a841968fb12b71c20fedad55d99656711dcc3e commit d5a841968fb12b71c20fedad55d99656711dcc3e Author: Jakub Jelinek Date: Tue Oct 19 08:30:52 2021 +0200 openmp: Fix handling of numa_domains(1) If numa-domains is used with num-places count, sometimes the function could create more places than requested and crash. This depended on the content of /sys/devices/system/node/online file, e.g. if the file contains 0-1,16-17 and all NUMA nodes contain at least one CPU in the cpuset of the program, then numa_domains(2) or numa_domains(4) (or 5+) work fine while numa_domains(1) or numa_domains(3) misbehave. I.e. the function was able to stop after reaching limit on the , separators (or trivially at the end), but not within in the ranges. 2021-10-18 Jakub Jelinek * config/linux/affinity.c (gomp_affinity_init_numa_domains): Add && gomp_places_list_len < count after nfirst <= nlast loop condition. (cherry picked from commit 3adcf7e104284b4867996b08f37ece50056ee8f6) Diff: --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/config/linux/affinity.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 12291307b64..157d89b9196 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2021-10-19 Tobias Burnus + + Backported from master: + 2021-10-18 Jakub Jelinek + + * config/linux/affinity.c (gomp_affinity_init_numa_domains): Add + && gomp_places_list_len < count after nfirst <= nlast loop condition. + 2021-10-15 Tobias Burnus Backported from master: diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c index e11906abec4..ce86c5898c1 100644 --- a/libgomp/config/linux/affinity.c +++ b/libgomp/config/linux/affinity.c @@ -401,7 +401,7 @@ gomp_affinity_init_numa_domains (unsigned long count, cpu_set_t *copy, break; q = end; } - for (; nfirst <= nlast; nfirst++) + for (; nfirst <= nlast && gomp_places_list_len < count; nfirst++) { sprintf (name + prefix_len, "node%lu/cpulist", nfirst); f = fopen (name, "r");