Revert "all: add KernelModule cfg to show DLKM coverage"

This reverts commit 69a06ca2b532ff4021a43fdead4e2ac1452a44c0.

2 files changed, 10 insertions, 17 deletions

diff --git a/pkg/symbolizer/symbolizer.go b/pkg/symbolizer/symbolizer.go
index 87342e750..96b62fb95 100644
--- a/pkg/symbolizer/symbolizer.go
+++ b/pkg/symbolizer/symbolizer.go
@@ -23,7 +23,6 @@ type Symbolizer struct {
 }
 
 type Frame struct {
-	Module string
 	PC     uint64
 	Func   string
 	File   string
@@ -44,15 +43,15 @@ func NewSymbolizer(target *targets.Target) *Symbolizer {
 }
 
 func (s *Symbolizer) Symbolize(bin string, pc uint64) ([]Frame, error) {
-	return s.SymbolizeArray("kernel", bin, []uint64{pc})
+	return s.SymbolizeArray(bin, []uint64{pc})
 }
 
-func (s *Symbolizer) SymbolizeArray(module, bin string, pcs []uint64) ([]Frame, error) {
+func (s *Symbolizer) SymbolizeArray(bin string, pcs []uint64) ([]Frame, error) {
 	sub, err := s.getSubprocess(bin)
 	if err != nil {
 		return nil, err
 	}
-	return symbolize(sub.input, sub.scanner, pcs, module)
+	return symbolize(sub.input, sub.scanner, pcs)
 }
 
 func (s *Symbolizer) Close() {
@@ -101,7 +100,7 @@ func (s *Symbolizer) getSubprocess(bin string) (*subprocess, error) {
 	return sub, nil
 }
 
-func symbolize(input *bufio.Writer, scanner *bufio.Scanner, pcs []uint64, module string) ([]Frame, error) {
+func symbolize(input *bufio.Writer, scanner *bufio.Scanner, pcs []uint64) ([]Frame, error) {
 	var frames []Frame
 	done := make(chan error, 1)
 	go func() {
@@ -117,7 +116,7 @@ func symbolize(input *bufio.Writer, scanner *bufio.Scanner, pcs []uint64, module
 		}
 		for range pcs {
 			var frames1 []Frame
-			frames1, err = parse(scanner, module)
+			frames1, err = parse(scanner)
 			if err != nil {
 				return
 			}
@@ -146,7 +145,7 @@ func symbolize(input *bufio.Writer, scanner *bufio.Scanner, pcs []uint64, module
 	return frames, nil
 }
 
-func parse(s *bufio.Scanner, module string) ([]Frame, error) {
+func parse(s *bufio.Scanner) ([]Frame, error) {
 	pc, err := strconv.ParseUint(s.Text(), 0, 64)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse pc '%v' in addr2line output: %v", s.Text(), err)
@@ -183,7 +182,6 @@ func parse(s *bufio.Scanner, module string) ([]Frame, error) {
 			continue
 		}
 		frames = append(frames, Frame{
-			Module: module,
 			PC:     pc,
 			Func:   fn,
 			File:   file,
diff --git a/pkg/symbolizer/symbolizer_test.go b/pkg/symbolizer/symbolizer_test.go
index cdbef8e6c..0bddb2f71 100644
--- a/pkg/symbolizer/symbolizer_test.go
+++ b/pkg/symbolizer/symbolizer_test.go
@@ -25,7 +25,6 @@ func TestParse(t *testing.T) {
 				"mm/kasan/report.c:320\n",
 			[]Frame{
 				{
-					Module: "kernel",
 					PC:     0xffffffff8180a42e,
 					Func:   "__asan_report_load2_noabort",
 					File:   "mm/kasan/report.c",
@@ -43,7 +42,6 @@ func TestParse(t *testing.T) {
 				"mm/kasan/report.c:320\n",
 			[]Frame{
 				{
-					Module: "kernel",
 					PC:     0xffffffff8180a42d,
 					Func:   "kasan_report",
 					File:   "mm/kasan/report.c",
@@ -51,7 +49,6 @@ func TestParse(t *testing.T) {
 					Inline: true,
 				},
 				{
-					Module: "kernel",
 					PC:     0xffffffff8180a42d,
 					Func:   "__asan_report_load2_noabort",
 					File:   "mm/kasan/report.c",
@@ -67,7 +64,6 @@ func TestParse(t *testing.T) {
 				"drivers/video/console/fbcon.c:2750\n",
 			[]Frame{
 				{
-					Module: "kernel",
 					PC:     0xffffffff82fdbe0b,
 					Func:   "fbcon_invert_region",
 					File:   "drivers/video/console/fbcon.c",
@@ -97,7 +93,6 @@ func TestParse(t *testing.T) {
 				"fs/devpts/inode.c:588 (discriminator 3)\n",
 			[]Frame{
 				{
-					Module: "kernel",
 					PC:     0xffffffff81a2aff9,
 					Func:   "devpts_get_priv",
 					File:   "fs/devpts/inode.c",
@@ -158,7 +153,7 @@ func TestParse(t *testing.T) {
 	var allPCs []uint64
 	var allFrames []Frame
 	for _, addr := range addresses {
-		frames, err := symbolize(input, scanner, []uint64{addr.pc}, "kernel")
+		frames, err := symbolize(input, scanner, []uint64{addr.pc})
 		if err != nil {
 			t.Fatalf("got error: %v", err)
 		}
@@ -171,11 +166,11 @@ func TestParse(t *testing.T) {
 
 	// Symbolize PCs in 2 groups.
 	for i := 0; i <= len(addresses); i++ {
-		frames, err := symbolize(input, scanner, allPCs[:i], "kernel")
+		frames, err := symbolize(input, scanner, allPCs[:i])
 		if err != nil {
 			t.Fatalf("got error: %v", err)
 		}
-		frames2, err := symbolize(input, scanner, allPCs[i:], "kernel")
+		frames2, err := symbolize(input, scanner, allPCs[i:])
 		if err != nil {
 			t.Fatalf("got error: %v", err)
 		}
@@ -190,7 +185,7 @@ func TestParse(t *testing.T) {
 	for i := range lots {
 		lots[i] = addresses[0].pc
 	}
-	frames, err := symbolize(input, scanner, lots, "kernel")
+	frames, err := symbolize(input, scanner, lots)
 	if err != nil {
 		t.Fatalf("got error: %v", err)
 	}