From 85714d5cf3622da49d1442c34caa63451d9efe48 Mon Sep 17 00:00:00 2001
From: epompeii <epompeii@protonmail.com>
Date: Tue, 21 Mar 2023 13:53:21 -0400
Subject: [PATCH] review

---
 aya-bpf-macros/src/expand.rs |  4 ++--
 aya-obj/src/obj.rs           | 32 +++++++++++++-------------------
 aya/src/bpf.rs               | 13 ++++---------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/aya-bpf-macros/src/expand.rs b/aya-bpf-macros/src/expand.rs
index bf60c8e5..b96db0fe 100644
--- a/aya-bpf-macros/src/expand.rs
+++ b/aya-bpf-macros/src/expand.rs
@@ -212,7 +212,7 @@ impl Xdp {
                 frags = m
             } else {
                 return Err(Error::new_spanned(
-                    "mutlibuffer",
+                    s,
                     "invalid value. should be 'true' or 'false'",
                 ));
             }
@@ -626,7 +626,7 @@ impl Lsm {
                 sleepable = m
             } else {
                 return Err(Error::new_spanned(
-                    "mutlibuffer",
+                    s,
                     "invalid value. should be 'true' or 'false'",
                 ));
             }
diff --git a/aya-obj/src/obj.rs b/aya-obj/src/obj.rs
index af78ac87..54d884cb 100644
--- a/aya-obj/src/obj.rs
+++ b/aya-obj/src/obj.rs
@@ -183,7 +183,7 @@ pub enum ProgramSection {
     },
     Xdp {
         name: String,
-        frags_supported: bool,
+        frags: bool,
     },
     SkMsg {
         name: String,
@@ -231,7 +231,7 @@ pub enum ProgramSection {
     },
     Lsm {
         name: String,
-        sleepable_supported: bool,
+        sleepable: bool,
     },
     BtfTracePoint {
         name: String,
@@ -314,14 +314,8 @@ impl FromStr for ProgramSection {
             "kretprobe" => KRetProbe { name },
             "uprobe" => UProbe { name },
             "uretprobe" => URetProbe { name },
-            "xdp" => Xdp {
-                name,
-                frags_supported: false,
-            },
-            "xdp.frags" => Xdp {
-                name,
-                frags_supported: true,
-            },
+            "xdp" => Xdp { name, frags: false },
+            "xdp.frags" => Xdp { name, frags: true },
             "tp_btf" => BtfTracePoint { name },
             _ if kind.starts_with("tracepoint") || kind.starts_with("tp") => {
                 // tracepoint sections are named `tracepoint/category/event_name`,
@@ -475,11 +469,11 @@ impl FromStr for ProgramSection {
             "raw_tp" | "raw_tracepoint" => RawTracePoint { name },
             "lsm" => Lsm {
                 name,
-                sleepable_supported: false,
+                sleepable: false,
             },
             "lsm.s" => Lsm {
                 name,
-                sleepable_supported: true,
+                sleepable: true,
             },
             "fentry" => FEntry { name },
             "fexit" => FExit { name },
@@ -1846,7 +1840,7 @@ mod tests {
         assert_matches!(
             obj.programs.get("foo"),
             Some(Program {
-                section: ProgramSection::Xdp { .. },
+                section: ProgramSection::Xdp { frags: false, .. },
                 ..
             })
         );
@@ -1867,10 +1861,7 @@ mod tests {
         assert_matches!(
             obj.programs.get("foo"),
             Some(Program {
-                section: ProgramSection::Xdp {
-                    frags_supported: true,
-                    ..
-                },
+                section: ProgramSection::Xdp { frags: true, .. },
                 ..
             })
         );
@@ -1928,7 +1919,10 @@ mod tests {
         assert_matches!(
             obj.programs.get("foo"),
             Some(Program {
-                section: ProgramSection::Lsm { .. },
+                section: ProgramSection::Lsm {
+                    sleepable: false,
+                    ..
+                },
                 ..
             })
         );
@@ -1950,7 +1944,7 @@ mod tests {
             obj.programs.get("foo"),
             Some(Program {
                 section: ProgramSection::Lsm {
-                    sleepable_supported: true,
+                    sleepable: true,
                     ..
                 },
                 ..
diff --git a/aya/src/bpf.rs b/aya/src/bpf.rs
index 86b53719..0e74d160 100644
--- a/aya/src/bpf.rs
+++ b/aya/src/bpf.rs
@@ -478,12 +478,10 @@ impl<'a> BpfLoader<'a> {
                                 data: ProgramData::new(prog_name, obj, btf_fd, verifier_log_level),
                             })
                         }
-                        ProgramSection::Xdp {
-                            frags_supported, ..
-                        } => {
+                        ProgramSection::Xdp { frags, .. } => {
                             let mut data =
                                 ProgramData::new(prog_name, obj, btf_fd, verifier_log_level);
-                            if *frags_supported {
+                            if *frags {
                                 data.flags = BPF_F_XDP_HAS_FRAGS;
                             }
                             Program::Xdp(Xdp { data })
@@ -551,13 +549,10 @@ impl<'a> BpfLoader<'a> {
                                 data: ProgramData::new(prog_name, obj, btf_fd, verifier_log_level),
                             })
                         }
-                        ProgramSection::Lsm {
-                            sleepable_supported,
-                            ..
-                        } => {
+                        ProgramSection::Lsm { sleepable, .. } => {
                             let mut data =
                                 ProgramData::new(prog_name, obj, btf_fd, verifier_log_level);
-                            if *sleepable_supported {
+                            if *sleepable {
                                 data.flags = BPF_F_SLEEPABLE;
                             }
                             Program::Lsm(Lsm { data })