feat: add test for .plt.sec

Author: not-matthias

callgrind/tests/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.tool-tests.am
 SUBDIRS = .
 DIST_SUBDIRS = .
 
-dist_noinst_SCRIPTS = filter_stderr filter_inline
+dist_noinst_SCRIPTS = filter_stderr filter_inline filter_plt_sec
 
 EXTRA_DIST = \
 	ann1.post.exp ann1.stderr.exp ann1.vgtest \
@@ -26,9 +26,10 @@ EXTRA_DIST = \
 	find-source.vgtest find-source.stderr.exp find-source.post.exp \
 	inline-samefile.vgtest inline-samefile.stderr.exp inline-samefile.stdout.exp inline-samefile.post.exp \
 	inline-crossfile.vgtest inline-crossfile.stderr.exp inline-crossfile.stdout.exp inline-crossfile.post.exp \
-	inline-crossfile-helper1.h inline-crossfile-helper2.h filter_inline
+	inline-crossfile-helper1.h inline-crossfile-helper2.h filter_inline \
+	plt-sec-skip.vgtest plt-sec-skip.stderr.exp plt-sec-skip.stdout.exp plt-sec-skip.post.exp
 
-check_PROGRAMS = clreq simwork threads inline-samefile inline-crossfile
+check_PROGRAMS = clreq simwork threads inline-samefile inline-crossfile plt_sec_test
 
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
@@ -37,4 +38,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 inline_samefile_CFLAGS = $(AM_CFLAGS) -O2 -g
 inline_crossfile_CFLAGS = $(AM_CFLAGS) -O2 -g
 
+# We need to generate .plt.sec sections by enabling control flow protection
+plt_sec_test_CFLAGS = $(AM_CFLAGS) -fcf-protection=full -O2
+
 threads_LDADD = -lpthread

callgrind/tests/filter_plt_sec

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+CGout=$1
+
+# This is a wrong output of `puts` which includes a call to the .plt.sec section:
+# ```
+# fn=(408) puts
+# 0 9
+# cob=(3)
+# cfi=(3)
+# cfn=(410) 0x0000000004869530
+# calls=1 0 
+# 0 16
+# 0 18
+# cfn=(414)
+# calls=1 0 
+# 0 179
+# 0 46
+# cfn=(452)
+# calls=1 0 
+# 0 183
+# 0 2
+#
+# ```
+
+# We should expect this:
+# ```
+# fn=(408) puts
+# 0 9
+# cfn=(412) __strlen_avx2
+# calls=1 0 
+# 0 14
+# 0 2
+# 0 18
+# cfn=(414) _IO_file_xsputn@@GLIBC_2.2.5
+# calls=1 0 
+# 0 179
+# 0 46
+# cfn=(452) __overflow
+# calls=1 0 
+# 0 183
+# 0 2
+# 
+# ```
+# 
+# Then just print the cfn lines
+
+awk '
+    /^fn=\([0-9]+\) puts$/ { in_puts = 1 }
+    in_puts && /^fn=/ && !/^fn=\([0-9]+\) puts$/ { exit }
+    in_puts {
+        # Only print cfn lines (partial match, only check if we start with cfn=()
+        if (/^cfn=\(/) {
+            # Extract the function name (just split by space and take second part)
+            split($0, parts, " ")
+            print parts[2]
+        } else {
+            next
+        }
+    }
+' "$CGout"

callgrind/tests/plt-sec-skip.post.exp

@@ -0,0 +1,3 @@
+__strlen_avx2
+_IO_file_xsputn@@GLIBC_2.2.5
+__overflow

callgrind/tests/plt-sec-skip.stderr.exp

@@ -0,0 +1,12 @@
+
+Starting plt_sec_test
+String length: 11
+Allocated and initialized 10 ints
+Direct printf call
+Sum result: 4950
+plt_sec_test completed
+
+Events    : Ir
+Collected :
+
+I   refs:

callgrind/tests/plt-sec-skip.stdout.exp

@@ -0,0 +1,6 @@
+Starting plt_sec_test
+String length: 11
+Allocated and initialized 10 ints
+Direct printf call
+Sum result: 4950
+plt_sec_test completed

callgrind/tests/plt-sec-skip.vgtest

@@ -0,0 +1,4 @@
+prog: plt_sec_test
+vgopts: --tool=callgrind --skip-plt=yes
+post: ./filter_plt_sec callgrind.out.* plt-sec-skip
+cleanup: rm callgrind.out.*

callgrind/tests/plt_sec_test.c

@@ -0,0 +1,65 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "../callgrind.h"
+
+// Forward declarations
+void lib_function1(void);
+void lib_function2(void);
+void lib_function3(void);
+
+// Simple helper functions to do some work
+int compute_sum(int n) {
+    int sum = 0;
+    for (int i = 0; i < n; i++) {
+        sum += i;
+    }
+    return sum;
+}
+
+// Functions that call library functions
+void lib_function1(void) {
+    // Call strlen (from libc)
+    const char *str = "test string";
+    int len = strlen(str);
+    printf("String length: %d\n", len);
+}
+
+void lib_function2(void) {
+    // Call malloc/free (from libc)
+    int *ptr = (int *)malloc(sizeof(int) * 10);
+    if (ptr) {
+        for (int i = 0; i < 10; i++) {
+            ptr[i] = i;
+        }
+        printf("Allocated and initialized 10 ints\n");
+        free(ptr);
+    }
+}
+
+void lib_function3(void) {
+    // Call printf directly
+    printf("Direct printf call\n");
+}
+
+int main(void) {
+    printf("Starting plt_sec_test\n");
+
+    // Request callgrind to start collecting data
+    CALLGRIND_START_INSTRUMENTATION;
+
+    // Call functions that will use PLT/PLT.SEC
+    lib_function1();
+    lib_function2();
+    lib_function3();
+
+    // Do some work
+    int result = compute_sum(100);
+    printf("Sum result: %d\n", result);
+
+    // Request callgrind to dump stats
+    CALLGRIND_DUMP_STATS;
+
+    printf("plt_sec_test completed\n");
+    return 0;
+}