From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 7CB713858426; Mon, 18 Oct 2021 13:00:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CB713858426 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-4478] openmp: Fix handling of numa_domains(1) X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: dece6ae77223f37494b9ccab45f4bc4154c9fd0b X-Git-Newrev: 3adcf7e104284b4867996b08f37ece50056ee8f6 Message-Id: <20211018130052.7CB713858426@sourceware.org> Date: Mon, 18 Oct 2021 13:00:52 +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: Mon, 18 Oct 2021 13:00:52 -0000 https://gcc.gnu.org/g:3adcf7e104284b4867996b08f37ece50056ee8f6 commit r12-4478-g3adcf7e104284b4867996b08f37ece50056ee8f6 Author: Jakub Jelinek Date: Mon Oct 18 14:54:16 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. Diff: --- libgomp/config/linux/affinity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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");