From 884c126239b3a6c7822f77df33bb6923c38d807a Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Wed, 2 Aug 2023 14:28:17 +0100 Subject: [PATCH] aya-obj: Remove name from ProgramSection The name here is never used as we get the program name from the symbol table instead. Signed-off-by: Dave Tucker --- aya-obj/src/obj.rs | 274 ++++++------------------ test/integration-test/src/tests/rbpf.rs | 7 +- 2 files changed, 66 insertions(+), 215 deletions(-) diff --git a/aya-obj/src/obj.rs b/aya-obj/src/obj.rs index 06864abb..2fdc6946 100644 --- a/aya-obj/src/obj.rs +++ b/aya-obj/src/obj.rs @@ -188,35 +188,6 @@ pub struct Function { /// /// [Program Types and ELF Sections]: https://docs.kernel.org/bpf/libbpf/program_types.html /// -/// ## Program Name -/// -/// Each section name is parsed into a section type and a program name. -/// -/// Generally speaking, -/// - if the section name does not contain any slashes, -/// then the program name is just that section name; -/// - if there are some slashes, the name is `section_name.rsplitn(2, '/')[0]`, -/// - except for tracepoint programs, for which the name is -/// `section_name.splitn(2, '/')[1]`. -/// -/// ```rust -/// use aya_obj::ProgramSection; -/// use std::str::FromStr; -/// -/// assert_eq!( -/// ProgramSection::from_str("kprobe/do_unlinkat") -/// .unwrap().name(), -/// "do_unlinkat", -/// ); -/// assert_eq!( -/// ProgramSection::from_str("tracepoint/syscalls/sys_enter_openat") -/// .unwrap().name(), -/// "syscalls/sys_enter_openat", -/// ); -/// ``` -/// -/// The program name will be used in [Object] as references to each program. -/// /// # Unsupported Sections /// /// Currently, the following section names are not supported yet: @@ -240,135 +211,45 @@ pub struct Function { #[derive(Debug, Clone)] #[allow(missing_docs)] pub enum ProgramSection { - KRetProbe { - name: String, - }, - KProbe { - name: String, - }, - UProbe { - name: String, - }, - URetProbe { - name: String, - }, - TracePoint { - name: String, - }, - SocketFilter { - name: String, - }, + KRetProbe, + KProbe, + UProbe, + URetProbe, + TracePoint, + SocketFilter, Xdp { - name: String, frags: bool, }, - SkMsg { - name: String, - }, - SkSkbStreamParser { - name: String, - }, - SkSkbStreamVerdict { - name: String, - }, - SockOps { - name: String, - }, - SchedClassifier { - name: String, - }, - CgroupSkb { - name: String, - }, - CgroupSkbIngress { - name: String, - }, - CgroupSkbEgress { - name: String, - }, + SkMsg, + SkSkbStreamParser, + SkSkbStreamVerdict, + SockOps, + SchedClassifier, + CgroupSkb, + CgroupSkbIngress, + CgroupSkbEgress, CgroupSockAddr { - name: String, attach_type: CgroupSockAddrAttachType, }, - CgroupSysctl { - name: String, - }, + CgroupSysctl, CgroupSockopt { - name: String, attach_type: CgroupSockoptAttachType, }, - LircMode2 { - name: String, - }, - PerfEvent { - name: String, - }, - RawTracePoint { - name: String, - }, + LircMode2, + PerfEvent, + RawTracePoint, Lsm { - name: String, sleepable: bool, }, - BtfTracePoint { - name: String, - }, - FEntry { - name: String, - }, - FExit { - name: String, - }, - Extension { - name: String, - }, - SkLookup { - name: String, - }, + BtfTracePoint, + FEntry, + FExit, + Extension, + SkLookup, CgroupSock { - name: String, attach_type: CgroupSockAttachType, }, - CgroupDevice { - name: String, - }, -} - -impl ProgramSection { - /// Returns the program name - pub fn name(&self) -> &str { - match self { - ProgramSection::KRetProbe { name } => name, - ProgramSection::KProbe { name } => name, - ProgramSection::UProbe { name } => name, - ProgramSection::URetProbe { name } => name, - ProgramSection::TracePoint { name } => name, - ProgramSection::SocketFilter { name } => name, - ProgramSection::Xdp { name, .. } => name, - ProgramSection::SkMsg { name } => name, - ProgramSection::SkSkbStreamParser { name } => name, - ProgramSection::SkSkbStreamVerdict { name } => name, - ProgramSection::SockOps { name } => name, - ProgramSection::SchedClassifier { name } => name, - ProgramSection::CgroupSkb { name, .. } => name, - ProgramSection::CgroupSkbIngress { name, .. } => name, - ProgramSection::CgroupSkbEgress { name, .. } => name, - ProgramSection::CgroupSockAddr { name, .. } => name, - ProgramSection::CgroupSysctl { name } => name, - ProgramSection::CgroupSockopt { name, .. } => name, - ProgramSection::LircMode2 { name } => name, - ProgramSection::PerfEvent { name } => name, - ProgramSection::RawTracePoint { name } => name, - ProgramSection::Lsm { name, .. } => name, - ProgramSection::BtfTracePoint { name } => name, - ProgramSection::FEntry { name } => name, - ProgramSection::FExit { name } => name, - ProgramSection::Extension { name } => name, - ProgramSection::SkLookup { name } => name, - ProgramSection::CgroupSock { name, .. } => name, - ProgramSection::CgroupDevice { name } => name, - } - } + CgroupDevice, } impl FromStr for ProgramSection { @@ -386,67 +267,59 @@ impl FromStr for ProgramSection { let name = name.to_owned(); Ok(match kind { - "kprobe" => KProbe { name }, - "kretprobe" => KRetProbe { name }, - "uprobe" => UProbe { name }, - "uretprobe" => URetProbe { name }, - "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`, - // and we want to parse the name as "category/event_name" - let name = section.splitn(2, '/').last().unwrap().to_owned(); - TracePoint { name } - } - "socket" => SocketFilter { name }, - "sk_msg" => SkMsg { name }, + "kprobe" => KProbe, + "kretprobe" => KRetProbe, + "uprobe" => UProbe, + "uretprobe" => URetProbe, + "xdp" => Xdp { frags: false }, + "xdp.frags" => Xdp { frags: true }, + "tp_btf" => BtfTracePoint, + _ if kind.starts_with("tracepoint") || kind.starts_with("tp") => TracePoint, + "socket" => SocketFilter, + "sk_msg" => SkMsg, "sk_skb" => match &*name { - "stream_parser" => SkSkbStreamParser { name }, - "stream_verdict" => SkSkbStreamVerdict { name }, + "stream_parser" => SkSkbStreamParser, + "stream_verdict" => SkSkbStreamVerdict, _ => { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), }) } }, - "sk_skb/stream_parser" => SkSkbStreamParser { name }, - "sk_skb/stream_verdict" => SkSkbStreamVerdict { name }, - "sockops" => SockOps { name }, - "classifier" => SchedClassifier { name }, + "sk_skb/stream_parser" => SkSkbStreamParser, + "sk_skb/stream_verdict" => SkSkbStreamVerdict, + "sockops" => SockOps, + "classifier" => SchedClassifier, "cgroup_skb" => match &*name { - "ingress" => CgroupSkbIngress { name }, - "egress" => CgroupSkbEgress { name }, + "ingress" => CgroupSkbIngress, + "egress" => CgroupSkbEgress, _ => { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), }) } }, - "cgroup_skb/ingress" => CgroupSkbIngress { name }, - "cgroup_skb/egress" => CgroupSkbEgress { name }, - "cgroup/skb" => CgroupSkb { name }, + "cgroup_skb/ingress" => CgroupSkbIngress, + "cgroup_skb/egress" => CgroupSkbEgress, + "cgroup/skb" => CgroupSkb, "cgroup/sock" => CgroupSock { - name, attach_type: CgroupSockAttachType::default(), }, - "cgroup/sysctl" => CgroupSysctl { name }, - "cgroup/dev" => CgroupDevice { name }, + "cgroup/sysctl" => CgroupSysctl, + "cgroup/dev" => CgroupDevice, "cgroup/getsockopt" => CgroupSockopt { - name, attach_type: CgroupSockoptAttachType::Get, }, "cgroup/setsockopt" => CgroupSockopt { - name, attach_type: CgroupSockoptAttachType::Set, }, "cgroup" => match &*name { - "skb" => CgroupSkb { name }, - "sysctl" => CgroupSysctl { name }, - "dev" => CgroupDevice { name }, + "skb" => CgroupSkb, + "sysctl" => CgroupSysctl, + "dev" => CgroupDevice, "getsockopt" | "setsockopt" => { if let Ok(attach_type) = CgroupSockoptAttachType::try_from(name.as_str()) { - CgroupSockopt { name, attach_type } + CgroupSockopt { attach_type } } else { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), @@ -454,12 +327,11 @@ impl FromStr for ProgramSection { } } "sock" => CgroupSock { - name, attach_type: CgroupSockAttachType::default(), }, "post_bind4" | "post_bind6" | "sock_create" | "sock_release" => { if let Ok(attach_type) = CgroupSockAttachType::try_from(name.as_str()) { - CgroupSock { name, attach_type } + CgroupSock { attach_type } } else { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), @@ -468,7 +340,7 @@ impl FromStr for ProgramSection { } _ => { if let Ok(attach_type) = CgroupSockAddrAttachType::try_from(name.as_str()) { - CgroupSockAddr { name, attach_type } + CgroupSockAddr { attach_type } } else { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), @@ -477,84 +349,62 @@ impl FromStr for ProgramSection { } }, "cgroup/post_bind4" => CgroupSock { - name, attach_type: CgroupSockAttachType::PostBind4, }, "cgroup/post_bind6" => CgroupSock { - name, attach_type: CgroupSockAttachType::PostBind6, }, "cgroup/sock_create" => CgroupSock { - name, attach_type: CgroupSockAttachType::SockCreate, }, "cgroup/sock_release" => CgroupSock { - name, attach_type: CgroupSockAttachType::SockRelease, }, "cgroup/bind4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::Bind4, }, "cgroup/bind6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::Bind6, }, "cgroup/connect4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::Connect4, }, "cgroup/connect6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::Connect6, }, "cgroup/getpeername4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::GetPeerName4, }, "cgroup/getpeername6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::GetPeerName6, }, "cgroup/getsockname4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::GetSockName4, }, "cgroup/getsockname6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::GetSockName6, }, "cgroup/sendmsg4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::UDPSendMsg4, }, "cgroup/sendmsg6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::UDPSendMsg6, }, "cgroup/recvmsg4" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::UDPRecvMsg4, }, "cgroup/recvmsg6" => CgroupSockAddr { - name, attach_type: CgroupSockAddrAttachType::UDPRecvMsg6, }, - "lirc_mode2" => LircMode2 { name }, - "perf_event" => PerfEvent { name }, - "raw_tp" | "raw_tracepoint" => RawTracePoint { name }, - "lsm" => Lsm { - name, - sleepable: false, - }, - "lsm.s" => Lsm { - name, - sleepable: true, - }, - "fentry" => FEntry { name }, - "fexit" => FExit { name }, - "freplace" => Extension { name }, - "sk_lookup" => SkLookup { name }, + "lirc_mode2" => LircMode2, + "perf_event" => PerfEvent, + "raw_tp" | "raw_tracepoint" => RawTracePoint, + "lsm" => Lsm { sleepable: false }, + "lsm.s" => Lsm { sleepable: true }, + "fentry" => FEntry, + "fexit" => FExit, + "freplace" => Extension, + "sk_lookup" => SkLookup, _ => { return Err(ParseError::InvalidProgramSection { section: section.to_owned(), diff --git a/test/integration-test/src/tests/rbpf.rs b/test/integration-test/src/tests/rbpf.rs index 4e5314c3..44e648d1 100644 --- a/test/integration-test/src/tests/rbpf.rs +++ b/test/integration-test/src/tests/rbpf.rs @@ -9,8 +9,10 @@ fn run_with_rbpf() { let object = Object::parse(crate::PASS).unwrap(); assert_eq!(object.programs.len(), 1); - assert_matches!(object.programs["pass"].section, ProgramSection::Xdp { .. }); - assert_eq!(object.programs["pass"].section.name(), "xdp.frags"); + assert_matches!( + object.programs["pass"].section, + ProgramSection::Xdp { frags: true } + ); let instructions = &object .functions @@ -40,7 +42,6 @@ fn use_map_with_rbpf() { object.programs["bpf_prog"].section, ProgramSection::TracePoint { .. } ); - assert_eq!(object.programs["bpf_prog"].section.name(), "tracepoint"); // Initialize maps: // - fd: 0xCAFE00 or 0xCAFE01 (the 0xCAFE00 part is used to distinguish fds from indices),