From 8d5673e27cdc794c53315b5e379b57d55ab493b2 Mon Sep 17 00:00:00 2001
From: "Harper, Jason M" <jason.m.harper@intel.com>
Date: Thu, 25 Sep 2025 14:49:27 -0700
Subject: [PATCH 1/2] improve SSTTF script error handling

Signed-off-by: Harper, Jason M <jason.m.harper@intel.com>
---
 internal/report/table_defs.go  | 10 ++++++
 internal/script/script_defs.go | 65 ++++++++++++++++++++++++++++++----
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/internal/report/table_defs.go b/internal/report/table_defs.go
index d95f42fe..04076cfe 100644
--- a/internal/report/table_defs.go
+++ b/internal/report/table_defs.go
@@ -1355,6 +1355,11 @@ func sstTFHPTableValues(outputs map[string]script.ScriptOutput) []Field {
 			continue
 		}
 		for j, value := range values {
+			// confirm value is a number
+			if _, err := strconv.Atoi(value); err != nil {
+				slog.Warn("unexpected non-numeric value in line", slog.String("line", line), slog.String("value", value))
+				return []Field{}
+			}
 			if j > 1 {
 				value = value + "00"
 			}
@@ -1393,6 +1398,11 @@ func sstTFLPTableValues(outputs map[string]script.ScriptOutput) []Field {
 			continue
 		}
 		for j, value := range values {
+			// confirm value is a number
+			if _, err := strconv.Atoi(value); err != nil {
+				slog.Warn("unexpected non-numeric value in line", slog.String("line", line), slog.String("value", value))
+				return []Field{}
+			}
 			fields[j].Values = append(fields[j].Values, value+"00")
 		}
 	}
diff --git a/internal/script/script_defs.go b/internal/script/script_defs.go
index 448f61c6..0fe8f454 100644
--- a/internal/script/script_defs.go
+++ b/internal/script/script_defs.go
@@ -604,13 +604,27 @@ done
 	SSTTFHPScriptName: {
 		Name: SSTTFHPScriptName,
 		ScriptTemplate: `# Is SST-TF supported?
-supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+if ! supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+    echo "Error: Failed to check if SST-TF is supported" >&2
+    exit 1
+fi
+if [[ ! "$supported" =~ ^[0-9]+$ ]]; then
+	echo "Error: Invalid output from pcm-tpmi when checking support" >&2
+	exit 1
+fi
 if [ "$supported" -eq 0 ]; then
 	echo "SST-TF is not supported"
 	exit 0
 fi
 # Is SST-TF enabled?
-enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+if ! enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+    echo "Error: Failed to check if SST-TF is enabled" >&2
+    exit 1
+fi
+if [[ ! "$enabled" =~ ^[0-9]+$ ]]; then
+	echo "Error: Invalid output from pcm-tpmi when checking enabled status" >&2
+	exit 1
+fi
 if [ "$enabled" -eq 0 ]; then
 	echo "SST-TF is not enabled"
 	exit 0
@@ -622,7 +636,14 @@ do
 	# Get the # of cores in this bucket
 	bithigh=$((i*8+7))
 	bitlow=$((i*8))
-	numcores=$(pcm-tpmi 5 0x100 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+	if ! numcores=$(pcm-tpmi 5 0x100 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+		echo "Error: Failed to get number of cores for bucket $i" >&2
+		exit 1
+	fi
+	if [[ ! "$numcores" =~ ^[0-9]+$ ]]; then
+		echo "Error: Invalid output from pcm-tpmi when getting number of cores for bucket $i" >&2
+		exit 1
+	fi
 	# if the number of cores is 0, skip this bucket
 	if [ "$numcores" -eq 0 ]; then
 		continue
@@ -635,7 +656,14 @@ do
 	for((j=0; j<5; j++))
 	do
 		offset=$((j*8 + 264)) // 264 is 0x108 (SST_TF_INFO_2) AVX
-		freq=$(pcm-tpmi 5 $offset -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+		if ! freq=$(pcm-tpmi 5 $offset -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+			echo "Error: Failed to get frequency for instruction set $j in bucket $i" >&2
+			exit 1
+		fi
+		if [[ ! "$freq" =~ ^[0-9]+$ ]]; then
+			echo "Error: Invalid frequency value for instruction set $j in bucket $i" >&2
+			exit 1
+		fi
 		echo -n "$freq"
 		if [ $j -lt 4 ]; then
 			echo -n ","
@@ -653,13 +681,29 @@ done
 	SSTTFLPScriptName: {
 		Name: SSTTFLPScriptName,
 		ScriptTemplate: `# Is SST-TF supported?
-supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+if ! supported=$(pcm-tpmi 5 0xF8 -d -b 12:12 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+    echo "Error: Failed to check if SST-TF is supported" >&2
+    exit 1
+fi
+if [[ ! "$supported" =~ ^[0-9]+$ ]]; then
+	echo "Error: Invalid output from pcm-tpmi when checking support" >&2
+	exit 1
+fi
+
 if [ "$supported" -eq 0 ]; then
 	echo "SST-TF is not supported"
 	exit 0
 fi
 # Is SST-TF enabled?
-enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+if ! enabled=$(pcm-tpmi 5 0x78 -d -b 9:9 -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+    echo "Error: Failed to check if SST-TF is enabled" >&2
+    exit 1
+fi
+if [[ ! "$enabled" =~ ^[0-9]+$ ]]; then
+	echo "Error: Invalid output from pcm-tpmi when checking enabled status" >&2
+	exit 1
+fi
+
 if [ "$enabled" -eq 0 ]; then
 	echo "SST-TF is not enabled"
 	exit 0
@@ -670,7 +714,14 @@ for((j=0; j<5; j++))
 do
 	bithigh=$((j*8+23))
 	bitlow=$((j*8+16))
-	freq=$(pcm-tpmi 5 0xF8 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}')
+	if ! freq=$(pcm-tpmi 5 0xF8 -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
+		echo "Error: Failed to get frequency for instruction set $j" >&2
+		exit 1
+	fi
+	if [[ ! "$freq" =~ ^[0-9]+$ ]]; then
+		echo "Error: Invalid frequency value for instruction set $j" >&2
+		exit 1
+	fi
 	echo -n "$freq"
 	if [ $j -ne 4 ]; then
 		echo -n ","

From 2b1dd0338a4cda96b3fbc0022e07223f316b001f Mon Sep 17 00:00:00 2001
From: Jason Harper <78619061+harp-intel@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:02:39 -0700
Subject: [PATCH 2/2] fix comment

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 internal/script/script_defs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/script/script_defs.go b/internal/script/script_defs.go
index 0fe8f454..0f1e3cb5 100644
--- a/internal/script/script_defs.go
+++ b/internal/script/script_defs.go
@@ -655,7 +655,7 @@ do
 	# 5 isa frequencies per bucket (AVX, AVX2, AVX-512, AVX-512 heavy, AMX)
 	for((j=0; j<5; j++))
 	do
-		offset=$((j*8 + 264)) // 264 is 0x108 (SST_TF_INFO_2) AVX
+		offset=$((j*8 + 264)) # 264 is 0x108 (SST_TF_INFO_2) AVX
 		if ! freq=$(pcm-tpmi 5 $offset -d -b $bithigh:$bitlow -i 0 -e 0 | tail -n 2 | head -n 1 | awk '{print $5}'); then
 			echo "Error: Failed to get frequency for instruction set $j in bucket $i" >&2
 			exit 1