diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2021-10-18 14:54:16 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2021-10-18 15:00:46 +0200 |
| commit | 3adcf7e104284b4867996b08f37ece50056ee8f6 (patch) | |
| tree | c8586c7a1d00e29b8c491f528cafcbf4d178a474 /libgomp | |
| parent | dece6ae77223f37494b9ccab45f4bc4154c9fd0b (diff) | |
| download | gcc-3adcf7e104284b4867996b08f37ece50056ee8f6.tar.gz | |
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 <jakub@redhat.com>
* config/linux/affinity.c (gomp_affinity_init_numa_domains): Add
&& gomp_places_list_len < count after nfirst <= nlast loop condition.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/config/linux/affinity.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |