Compile bpf_alignchecker by datapath loader

Remove bpf_alignchecker compiling from init.sh, and replace it with datapath loader to compile bpf_alignchecker this is part of work for deprecating init.sh Signed-off-by: Vincent Li <v.li@f5.com>
gazandic · Sep 20, 2022 · 8210bbf · 8210bbf
1 parent 3d001a8
commit 8210bbf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/bpf/init.sh b/bpf/init.sh
@@ -568,7 +568,3 @@ fi
 if [ "$HOST_DEV1" != "$HOST_DEV2" ]; then
 	bpf_unload $HOST_DEV2 "egress"
 fi
-
-# Compile dummy BPF file containing all shared struct definitions used by
-# pkg/alignchecker to validate C and Go equivalent struct alignments
-bpf_compile bpf_alignchecker.c bpf_alignchecker.o obj ""
diff --git a/pkg/datapath/linux/datapath.go b/pkg/datapath/linux/datapath.go
@@ -38,7 +38,7 @@ func NewDatapath(cfg DatapathConfiguration, ruleManager datapath.IptablesManager
 		IptablesManager: ruleManager,
 		nodeAddressing:  NewNodeAddressing(),
 		config:          cfg,
-		loader:          loader.NewLoader(canDisableDwarfRelocations),
+		loader:          loader.NewLoader(),
 		wgAgent:         wgAgent,
 		lbmap:           lbmap.New(),
 	}

diff --git a/pkg/datapath/linux/requirements.go b/pkg/datapath/linux/requirements.go
@@ -36,10 +36,6 @@ var (
 
 	isRecKernelVer = versioncheck.MustCompile(">=" + recKernelVer)
 	isRecClangVer  = versioncheck.MustCompile(">=" + recClangVer)
-
-	// LLVM/clang version which supports `-mattr=dwarfris`
-	isDwarfrisClangVer         = versioncheck.MustCompile(">=7.0.0")
-	canDisableDwarfRelocations bool
 )
 
 func getClangVersion(filePath string) (semver.Version, error) {
@@ -105,7 +101,6 @@ func CheckMinRequirements() {
 				"your kernel version to at least %s",
 				clangVersion, kernelVersion, recKernelVer)
 		}
-		canDisableDwarfRelocations = isDwarfrisClangVer(clangVersion)
 		log.Infof("clang (%s) and kernel (%s) versions: OK!", clangVersion, kernelVersion)
 	}
 

diff --git a/pkg/datapath/loader/base.go b/pkg/datapath/loader/base.go
@@ -436,13 +436,13 @@ func (l *Loader) Reinitialize(ctx context.Context, o datapath.BaseProgramOwner,
 		return err
 	}
 
-	if l.canDisableDwarfRelocations {
-		// Validate alignments of C and Go equivalent structs
-		if err := alignchecker.CheckStructAlignments(defaults.AlignCheckerName); err != nil {
-			log.WithError(err).Fatal("C and Go structs alignment check failed")
-		}
-	} else {
-		log.Warning("Cannot check matching of C and Go common struct alignments due to old LLVM/clang version")
+	// Compile alignchecker program
+	if err := Compile(ctx, "bpf_alignchecker.c", defaults.AlignCheckerName); err != nil {
+		log.WithError(err).Fatal("alignchecker compile failed")
+	}
+	// Validate alignments of C and Go equivalent structs
+	if err := alignchecker.CheckStructAlignments(defaults.AlignCheckerName); err != nil {
+		log.WithError(err).Fatal("C and Go structs alignment check failed")
 	}
 
 	if err := l.reinitializeIPSec(ctx); err != nil {

diff --git a/pkg/datapath/loader/loader.go b/pkg/datapath/loader/loader.go
@@ -61,15 +61,11 @@ type Loader struct {
 
 	// templateCache is the cache of pre-compiled datapaths.
 	templateCache *objectCache
-
-	canDisableDwarfRelocations bool
 }
 
 // NewLoader returns a new loader.
-func NewLoader(canDisableDwarfRelocations bool) *Loader {
-	return &Loader{
-		canDisableDwarfRelocations: canDisableDwarfRelocations,
-	}
+func NewLoader() *Loader {
+	return &Loader{}
 }
 
 // Init initializes the datapath cache with base program hashes derived from