use aya kernel version implementation

crates/bpf-common/src/program.rs

@@ -13,10 +13,10 @@ use aya::{
         Array, HashMap, Map, MapData,
     },
     programs::{CgroupSkb, CgroupSkbAttachType, KProbe, Lsm, RawTracePoint, TracePoint},
-    util::online_cpus,
+    util::{online_cpus, KernelVersion},
     Bpf, BpfLoader, Btf, BtfError, Pod,
 };
-use bpf_feature_autodetect::{autodetect_features, kernel_version::KernelVersion};
+use bpf_feature_autodetect::autodetect_features;
 use bpf_features::BpfFeatures;
 use bytes::{Buf, Bytes, BytesMut};
 use thiserror::Error;
@@ -83,15 +83,11 @@ impl BpfContext {
             log::warn!("The default value {PERF_PAGES_DEFAULT} will be used.");
             perf_pages = PERF_PAGES_DEFAULT;
         }
-        let kernel_version = match KernelVersion::autodetect() {
+        let kernel_version = match KernelVersion::current() {
             Ok(version) => version,
             Err(err) => {
                 log::warn!("Error identifying kernel version {err:?}. Assuming kernel 5.0.4");
-                KernelVersion {
-                    major: 5,
-                    minor: 0,
-                    patch: 4,
-                }
+                KernelVersion::new(5, 0, 4)
             }
         };
         // aya doesn't support specifying from userspace wether or not to pin maps.
@@ -280,7 +276,7 @@ impl ProgramBuilder {
                 .set_global("log_level", &(self.ctx.log_level as i32), true)
                 .set_global(
                     "LINUX_KERNEL_VERSION",
-                    &self.ctx.kernel_version.as_i32(),
+                    &self.ctx.kernel_version.code(),
                     true,
                 )
                 .load(&self.probe)?;

crates/bpf-feature-autodetect/src/lib.rs

@@ -13,7 +13,6 @@ pub mod atomic;
 pub mod bpf_loop;
 pub mod func;
 pub mod insn;
-pub mod kernel_version;
 pub mod lsm;
 
 use crate::{

crates/modules/process-monitor/src/lib.rs

@@ -1,6 +1,6 @@
 use anyhow::Context;
 use bpf_common::{
-    bpf_feature_autodetect::kernel_version::KernelVersion,
+    aya::util::KernelVersion,
     containers::ContainerError,
     ebpf_program,
     parsing::{BufferIndex, IndexError},
@@ -19,12 +19,7 @@ pub async fn program(
     let binary = ebpf_program!(&ctx, "probes");
     let attach_to_lsm = ctx.lsm_supported();
     // LSM task_fix_set* calls are available since kernel commit 39030e1351aa1, in 5.10
-    let has_cred_specific_functions = ctx.kernel_version()
-        >= &KernelVersion {
-            major: 5,
-            minor: 10,
-            patch: 0,
-        };
+    let has_cred_specific_functions = ctx.kernel_version() >= &KernelVersion::new(5, 10, 0);
     let mut builder = ProgramBuilder::new(ctx, MODULE_NAME, binary)
         .raw_tracepoint("sched_process_exec")
         .raw_tracepoint("sched_process_exit")