review

Signed-off-by: Vamsee Narapareddi <vnarapar@qti.qualcomm.com>

Author: vnarapar

Runner/suites/Kernel/Baseport/cma/cma.yaml

@@ -17,5 +17,7 @@ metadata:
 
 run:
     steps:
-        - cd $PWD/suites/Kernel/Baseport/cma
+        - REPO_PATH=$PWD
+        - cd Runner/suites/Kernel/Baseport/cma
         - ./run.sh
+        - $REPO_PATH/Runner/utils/send-to-lava.sh cma.res

Runner/suites/Kernel/Baseport/cma/run.sh

@@ -55,14 +55,30 @@ OPTIONAL_CMA_CONFIGS="CONFIG_CMA_SIZE_MBYTES CONFIG_CMA_SIZE_SEL_MBYTES CONFIG_C
 
 log_info "Checking optional CMA configurations..."
 for cfg in $OPTIONAL_CMA_CONFIGS; do
-    if check_kernel_config "$cfg" 2>/dev/null; then
-        value=$(grep "^$cfg=" /proc/config.gz 2>/dev/null | cut -d'=' -f2 || echo "enabled")
-        log_info "  $cfg: $value"
+    if check_optional_config "$cfg" 2>/dev/null; then
+        log_pass "  $cfg: enabled"
     else
-        log_info "  $cfg: not set (optional)"
+        log_warn "  $cfg: not enabled (optional)"
     fi
 done
 
+if check_kernel_config "CONFIG_CMA_DEBUGFS" 2>/dev/null; then
+    log_pass "CONFIG_CMA_DEBUGFS: enabled"
+    if [ ! -d "/sys/kernel/debug/cma" ]; then
+        if [ ! -d "/sys/kernel/debug" ]; then
+            log_info "CONFIG_CMA_DEBUGFS is enabled but debugfs is not mounted"
+            log_info "Mounting debugfs"
+            if mount -t debugfs debugfs /sys/kernel/debug 2>/dev/null; then
+                log_pass "debugfs mounted successfully"
+            else
+                log_warn "Could not mount debugfs — CMA debugfs checks will be skipped"
+            fi
+        else
+            log_warn "CONFIG_CMA_DEBUGFS is enabled but /sys/kernel/debug/cma not found"
+        fi
+    fi
+fi
+
 log_info "=== CMA Memory Statistics ==="
 
 if [ -f "/proc/meminfo" ]; then
@@ -114,53 +130,67 @@ fi
 
 log_info "=== CMA Initialization and Runtime ==="
 
-# Check dmesg for CMA initialization
-if dmesg | grep -i -q "cma.*reserved"; then
+# Capture dmesg once to a temp file to avoid subshell issues (pass=false inside
+# a pipe subshell would not propagate to the outer shell) and to avoid running
+# dmesg multiple times.
+dmesg_tmp=$(mktemp /tmp/cma_dmesg.XXXXXX 2>/dev/null || echo "/tmp/cma_dmesg_$$.tmp")
+dmesg > "$dmesg_tmp" 2>/dev/null
+
+# Broaden CMA reservation patterns to cover multiple kernel variants:
+#   cma: Reserved N MiB at ...          (common upstream)
+#   CMA: Reserved N MiB at ...          (some arch variants)
+#   Reserved memory: created CMA memory pool at ...
+#   OF: reserved mem: initialized node linux,cma ...
+#   reserved mem.*CMA  (generic DT path)
+CMA_INIT_PATTERN="cma:.*reserved|reserved memory:.*cma|linux,cma|of:.*reserved mem.*cma"
+
+if grep -i -q -E "$CMA_INIT_PATTERN" "$dmesg_tmp" 2>/dev/null; then
     log_pass "CMA initialization messages found in dmesg:"
-    
-    dmesg | grep -i "cma.*reserved" | tail -n 5 | while IFS= read -r line; do
+    grep -i -E "$CMA_INIT_PATTERN" "$dmesg_tmp" 2>/dev/null | tail -n 5 | while IFS= read -r line; do
         log_info "  $line"
     done
 else
     log_fail "No CMA initialization messages found in dmesg"
-	pass=false
+    pass=false
 fi
 
-if dmesg | grep -i -q "cma.*alloc\|cma.*release"; then
+# CMA allocation/release activity (informational only)
+if grep -i -q -E "cma.*alloc|cma.*release" "$dmesg_tmp" 2>/dev/null; then
     log_info "CMA allocation/release activity detected"
-    alloc_count=$(dmesg | grep -i -c "cma.*alloc" || echo 0)
-    release_count=$(dmesg | grep -i -c "cma.*release" || echo 0)
+    alloc_count=$(grep -i -c "cma.*alloc" "$dmesg_tmp" 2>/dev/null || echo 0)
+    release_count=$(grep -i -c "cma.*release" "$dmesg_tmp" 2>/dev/null || echo 0)
     log_info "  Allocations: $alloc_count"
     log_info "  Releases: $release_count"
 fi
 
-if dmesg | grep -i "cma" | grep -i -q "error\|fail\|warn"; then
+# Check for CMA errors/warnings — capture to variable (not a pipe) so pass=false works
+cma_errors=$(grep -i "cma" "$dmesg_tmp" 2>/dev/null | grep -i "error\|fail\|warn" || true)
+if [ -n "$cma_errors" ]; then
     log_fail "CMA warnings/errors found in dmesg:"
-	pass=false
-    dmesg | grep -i "cma" | grep -i "error\|fail\|warn" | tail -n 3 | while IFS= read -r line; do
+    pass=false
+    printf '%s\n' "$cma_errors" | tail -n 3 | while IFS= read -r line; do
         log_warn "  $line"
     done
 fi
 
+rm -f "$dmesg_tmp"
+
 log_info "=== CMA Sysfs/Debugfs Interface ==="
 
 if [ -d "/sys/kernel/debug/cma" ]; then
     log_info "Found CMA debugfs: /sys/kernel/debug/cma"
-    
-    # List CMA areas
-    if [ -d "/sys/kernel/debug/cma" ]; then
-        cma_area_count=0
-        for area in /sys/kernel/debug/cma/*; do
-            if [ -d "$area" ]; then
-                area_name=$(basename "$area")
-                log_info "  CMA area: $area_name"
-                cma_area_count=$((cma_area_count + 1))
-            fi
-        done
-        log_info "  Total CMA areas: $cma_area_count"
-    fi
+
+    cma_area_count=0
+    for area in /sys/kernel/debug/cma/*; do
+        if [ -d "$area" ]; then
+            area_name=$(basename "$area")
+            log_info "  CMA area: $area_name"
+            cma_area_count=$((cma_area_count + 1))
+        fi
+    done
+    log_info "  Total CMA areas: $cma_area_count"
 else
-    log_warn "CMA debugfs not found (may need debugfs mounted)"
+    log_warn "CMA debugfs not found (may need debugfs mounted or CONFIG_CMA_DEBUGFS enabled)"
 fi
 
 if [ -f "/proc/vmstat" ]; then
@@ -169,20 +199,18 @@ if [ -f "/proc/vmstat" ]; then
         grep "cma" /proc/vmstat | while IFS= read -r line; do
             log_info "  $line"
         done
-	else
-		log_fail "CMA statistics not found in /proc/vmstat:"
-		pass=false
+    else
+        log_fail "CMA statistics not found in /proc/vmstat"
+        pass=false
     fi
 fi
 
-log_info "================================================================================"
-
 if $pass; then
     log_pass "$TESTNAME : Test Passed"
     echo "$TESTNAME PASS" > "$res_file"
-    exit 0
 else
     log_fail "$TESTNAME : Test Failed"
     echo "$TESTNAME FAIL" > "$res_file"
-    exit 1
 fi
+log_info "================================================================================"
+exit 0