Enumerize tracepoint categories as described in libbpf#314

Signed-off-by: yogaraj.s <[email protected]>

Author: syogaraj

libbpf-rs/src/lib.rs

@@ -93,6 +93,7 @@ pub mod query;
 mod ringbuf;
 mod skeleton;
 mod tc;
+mod tracepoint;
 mod user_ringbuf;
 mod util;
 mod xdp;
@@ -151,7 +152,6 @@ pub use crate::program::ProgramAttachType;
 pub use crate::program::ProgramImpl;
 pub use crate::program::ProgramMut;
 pub use crate::program::ProgramType;
-pub use crate::program::TracepointOpts;
 pub use crate::program::UprobeOpts;
 pub use crate::program::UsdtOpts;
 pub use crate::ringbuf::RingBuffer;
@@ -166,6 +166,8 @@ pub use crate::tc::TC_H_INGRESS;
 pub use crate::tc::TC_H_MIN_EGRESS;
 pub use crate::tc::TC_H_MIN_INGRESS;
 pub use crate::tc::TC_INGRESS;
+pub use crate::tracepoint::TracepointCategory;
+pub use crate::tracepoint::TracepointOpts;
 pub use crate::user_ringbuf::UserRingBuffer;
 pub use crate::user_ringbuf::UserRingBufferSample;
 pub use crate::util::num_possible_cpus;

libbpf-rs/src/program.rs

@@ -35,6 +35,8 @@ use crate::ErrorExt as _;
 use crate::Link;
 use crate::Mut;
 use crate::Result;
+use crate::TracepointCategory;
+use crate::TracepointOpts;
 
 /// Options to optionally be provided when attaching to a uprobe.
 #[derive(Clone, Debug, Default)]
@@ -87,33 +89,6 @@ impl From<UsdtOpts> for libbpf_sys::bpf_usdt_opts {
     }
 }
 
-/// Options to optionally be provided when attaching to a tracepoint.
-#[derive(Clone, Debug, Default)]
-pub struct TracepointOpts {
-    /// Custom user-provided value accessible through `bpf_get_attach_cookie`.
-    pub cookie: u64,
-    #[doc(hidden)]
-    pub _non_exhaustive: (),
-}
-
-impl From<TracepointOpts> for libbpf_sys::bpf_tracepoint_opts {
-    fn from(opts: TracepointOpts) -> Self {
-        let TracepointOpts {
-            cookie,
-            _non_exhaustive,
-        } = opts;
-
-        #[allow(clippy::needless_update)]
-        libbpf_sys::bpf_tracepoint_opts {
-            sz: size_of::<Self>() as _,
-            bpf_cookie: cookie,
-            // bpf_tracepoint_opts might have padding fields on some platform
-            ..Default::default()
-        }
-    }
-}
-
-
 /// An immutable parsed but not yet loaded BPF program.
 pub type OpenProgram<'obj> = OpenProgramImpl<'obj>;
 /// A mutable parsed but not yet loaded BPF program.
@@ -915,7 +890,7 @@ impl<'obj> ProgramMut<'obj> {
     /// tracepoint](https://www.kernel.org/doc/html/latest/trace/tracepoints.html).
     pub fn attach_tracepoint(
         &self,
-        tp_category: impl AsRef<str>,
+        tp_category: TracepointCategory,
         tp_name: impl AsRef<str>,
     ) -> Result<Link> {
         self.attach_tracepoint_impl(tp_category.as_ref(), tp_name.as_ref(), None)
@@ -926,7 +901,7 @@ impl<'obj> ProgramMut<'obj> {
     /// providing additional options.
     pub fn attach_tracepoint_with_opts(
         &self,
-        tp_category: impl AsRef<str>,
+        tp_category: TracepointCategory,
         tp_name: impl AsRef<str>,
         tp_opts: TracepointOpts,
     ) -> Result<Link> {