libbpf-cargo: Add test for special sauce section names

Add a test for custom section names containing dots in them. Also make
escaping of said names a more comprehensive thing, fixing another
location where we did not escape stuff.

Signed-off-by: Daniel Müller <[email protected]>

Author: d-e-s-o

libbpf-cargo/src/gen/mod.rs

@@ -36,6 +36,11 @@ use crate::metadata::UnprocessedObj;
 
 use self::btf::GenBtf;
 
+/// Escape certain characters in a "raw" name of a section, for example.
+fn escape_raw_name(name: &str) -> String {
+    name.replace('.', "_")
+}
+
 #[derive(Debug, PartialEq)]
 pub(crate) enum InternalMapType<'name> {
     Data,
@@ -52,11 +57,11 @@ impl Display for InternalMapType<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
         match self {
             Self::Data => write!(f, "data"),
-            Self::CustomData(name) => write!(f, "data_{}", name),
+            Self::CustomData(name) => write!(f, "data_{}", escape_raw_name(name)),
             Self::Rodata => write!(f, "rodata"),
-            Self::CustomRodata(name) => write!(f, "rodata_{}", name),
+            Self::CustomRodata(name) => write!(f, "rodata_{}", escape_raw_name(name)),
             Self::Bss => write!(f, "bss"),
-            Self::CustomBss(name) => write!(f, "bss_{}", name),
+            Self::CustomBss(name) => write!(f, "bss_{}", escape_raw_name(name)),
             Self::Kconfig => write!(f, "kconfig"),
             Self::StructOps => write!(f, "struct_ops"),
         }
@@ -239,7 +244,7 @@ fn get_map_name(map: *const libbpf_sys::bpf_map) -> Result<Option<String>> {
     let name = get_raw_map_name(map)?;
 
     if unsafe { !libbpf_sys::bpf_map__is_internal(map) } {
-        Ok(Some(name))
+        Ok(Some(escape_raw_name(&name)))
     } else {
         Ok(canonicalize_internal_map_name(&name).map(|map| map.to_string()))
     }
@@ -366,7 +371,7 @@ fn gen_skel_map_defs(
 
         for map in MapIter::new(object.as_mut_ptr()) {
             let map_name = match get_map_name(map)? {
-                Some(n) => n.replace('.', "_"),
+                Some(n) => n,
                 None => continue,
             };
 

libbpf-cargo/src/test.rs

@@ -650,7 +650,7 @@ fn test_skeleton_datasec() {
         void * const myconst = 0;
         int mycustomdata SEC(".data.custom");
         int mycustombss SEC(".bss.custom");
-        const int mycustomrodata SEC(".rodata.custom") = 43;
+        const int mycustomrodata SEC(".rodata.custom.1") = 43;
 
         SEC("kprobe/foo")
         int this_is_my_prog(u64 *ctx)
@@ -720,7 +720,7 @@ fn test_skeleton_datasec() {
 
             open_skel.data_custom_mut().mycustomdata = 1337;
             open_skel.bss_custom_mut().mycustombss = 12;
-            assert_eq!(open_skel.rodata_custom().mycustomrodata, 43);
+            assert_eq!(open_skel.rodata_custom_1().mycustomrodata, 43);
 
             let mut skel = open_skel
                 .load()
@@ -730,7 +730,7 @@ fn test_skeleton_datasec() {
             skel.bss_mut().myglobal = 24;
             skel.data_custom_mut().mycustomdata += 1;
             skel.bss_custom_mut().mycustombss += 1;
-            assert_eq!(skel.rodata_custom().mycustomrodata, 43);
+            assert_eq!(skel.rodata_custom_1().mycustomrodata, 43);
 
             // Read only for rodata after load
             let _rodata: &prog_types::rodata = skel.rodata();
@@ -2057,7 +2057,7 @@ fn test_btf_dump_definition_datasec_custom() {
 
 int bss_array[1] SEC(".bss.custom");
 int data_array[1] SEC(".data.custom");
-const int rodata_array[1] SEC(".rodata.custom");
+const int rodata_array[1] SEC(".rodata.custom.1");
 "#;
 
     let bss_custom_output = r#"
@@ -2079,7 +2079,7 @@ pub struct data_custom {
     let rodata_custom_output = r#"
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
-pub struct rodata_custom {
+pub struct rodata_custom_1 {
     pub rodata_array: [i32; 1],
 }
 "#;
@@ -2088,7 +2088,7 @@ pub struct rodata_custom {
     let btf = btf_from_mmap(&mmap);
     let bss_custom = find_type_in_btf!(btf, types::DataSec<'_>, ".bss.custom", false);
     let data_custom = find_type_in_btf!(btf, types::DataSec<'_>, ".data.custom", false);
-    let rodata_custom = find_type_in_btf!(btf, types::DataSec<'_>, ".rodata.custom", false);
+    let rodata_custom = find_type_in_btf!(btf, types::DataSec<'_>, ".rodata.custom.1", false);
 
     assert_definition(&btf, &bss_custom, bss_custom_output);
     assert_definition(&btf, &data_custom, data_custom_output);