From 9d0f2334e0d06e8085fc50060d1556e60d8c428f Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 17 Mar 2009 17:02:06 +0000
Subject: [PATCH] Critical bug fix in task/affinity when the CoresPerSocket is
greater than the ThreadsPerCore (invalid memory reference).
---
NEWS | 5 +++++
src/plugins/task/affinity/dist_tasks.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index ad6b617614a..9fcd494bf10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
This file describes changes in recent versions of SLURM. It primarily
documents those changes that are of interest to users and admins.
+* Changes in SLURM 1.4.0-pre10
+==============================
+ -- Critical bug fix in task/affinity when the CoresPerSocket is greater
+ than the ThreadsPerCore (invalid memory reference).
+
* Changes in SLURM 1.4.0-pre9
=============================
-- OpenMPI users only: Add srun logic to automatically recreate and
diff --git a/src/plugins/task/affinity/dist_tasks.c b/src/plugins/task/affinity/dist_tasks.c
index cbb27a87762..80931304ae9 100644
--- a/src/plugins/task/affinity/dist_tasks.c
+++ b/src/plugins/task/affinity/dist_tasks.c
@@ -483,7 +483,7 @@ static char *_alloc_mask(launch_tasks_request_msg_t *req,
i = mask = 0;
for (s=0, s_miss=false; s<sockets; s++) {
for (c=0, c_hit=c_miss=false; c<cores; c++) {
- for (t=0, t_hit=t_miss=false; t<cores; t++) {
+ for (t=0, t_hit=t_miss=false; t<threads; t++) {
if (bit_test(alloc_bitmap, i)) {
mask |= (1 << i);
(*whole_thread_cnt)++;
--
GitLab