Add missing program type feature probes

btf/ext_info.go

@@ -115,7 +115,7 @@ func (ei *ExtInfos) Assign(insns asm.Instructions, section string) {
 	iter := insns.Iterate()
 	for iter.Next() {
 		if len(funcInfos) > 0 && funcInfos[0].offset == iter.Offset {
-			iter.Ins.Metadata.Set(funcInfoMeta{}, funcInfos[0].fn)
+			*iter.Ins = WithFuncMetadata(*iter.Ins, funcInfos[0].fn)
 			funcInfos = funcInfos[1:]
 		}
 

btf/types.go

@@ -408,6 +408,12 @@ func FuncMetadata(ins *asm.Instruction) *Func {
 	return fn
 }
 
+// WithFuncMetadata adds a btf.Func to the Metadata of asm.Instruction.
+func WithFuncMetadata(ins asm.Instruction, fn *Func) asm.Instruction {
+	ins.Metadata.Set(funcInfoMeta{}, fn)
+	return ins
+}
+
 func (f *Func) Format(fs fmt.State, verb rune) {
 	formatType(fs, verb, f, f.Linkage, "proto=", f.Type)
 }

features/prog.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/cilium/ebpf"
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/unix"
@@ -92,7 +93,16 @@ var haveProgramTypeMatrix = internal.FeatureMatrix[ebpf.ProgramType]{
 			})
 		},
 	},
-	// ebpf.Tracing:               {Version: "5.5"},
+	ebpf.Tracing: {
+		Version: "5.5",
+		Fn: func() error {
+			return probeProgram(&ebpf.ProgramSpec{
+				Type:       ebpf.Tracing,
+				AttachType: ebpf.AttachTraceFEntry,
+				AttachTo:   "bpf_init",
+			})
+		},
+	},
 	ebpf.StructOps: {
 		Version: "5.6",
 		Fn: func() error {
@@ -107,16 +117,55 @@ var haveProgramTypeMatrix = internal.FeatureMatrix[ebpf.ProgramType]{
 			return err
 		},
 	},
-	// ebpf.Extension:             {Version: "5.6"},
+	ebpf.Extension: {
+		Version: "5.6",
+		Fn: func() error {
+			// create btf.Func to add to first ins of target and extension so both progs are btf powered
+			btfFn := btf.Func{
+				Name: "a",
+				Type: &btf.FuncProto{
+					Return: &btf.Int{},
+				},
+				Linkage: btf.GlobalFunc,
+			}
+			insns := asm.Instructions{
+				btf.WithFuncMetadata(asm.Mov.Imm(asm.R0, 0), &btfFn),
+				asm.Return(),
+			}
+
+			// create target prog
+			prog, err := ebpf.NewProgramWithOptions(
+				&ebpf.ProgramSpec{
+					Type:         ebpf.XDP,
+					Instructions: insns,
+				},
+				ebpf.ProgramOptions{
+					LogDisabled: true,
+				},
+			)
+			if err != nil {
+				return err
+			}
+			defer prog.Close()
+
+			// probe for Extension prog with target
+			return probeProgram(&ebpf.ProgramSpec{
+				Type:         ebpf.Extension,
+				Instructions: insns,
+				AttachTarget: prog,
+				AttachTo:     btfFn.Name,
+			})
+		},
+	},
 	ebpf.LSM: {
 		Version: "5.7",
 		Fn: func() error {
-			return probeProgram((&ebpf.ProgramSpec{
+			return probeProgram(&ebpf.ProgramSpec{
 				Type:       ebpf.LSM,
 				AttachType: ebpf.AttachLSMMac,
 				AttachTo:   "file_mprotect",
 				License:    "GPL",
-			}))
+			})
 		},
 	},
 	ebpf.SkLookup: {