Merge branch 'aya-rs:main' into main

pull/103/head
catalin-h 11 months ago committed by GitHub
commit 99af3dcd96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -8,7 +8,7 @@ default = []
user = ["aya"] user = ["aya"]
[dependencies] [dependencies]
aya = { git = "https://github.com/aya-rs/aya", optional = true } aya = { version = "0.12", optional = true }
[lib] [lib]
path = "src/lib.rs" path = "src/lib.rs"

@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
aya-bpf = { git = "https://github.com/aya-rs/aya" } aya-ebpf = "0.1.0"
aya-log-ebpf = { git = "https://github.com/aya-rs/aya" } aya-log-ebpf = "0.1.0"
{{ project-name }}-common = { path = "../{{ project-name }}-common" } {{ project-name }}-common = { path = "../{{ project-name }}-common" }
[[bin]] [[bin]]

@ -2,7 +2,7 @@
#![no_main] #![no_main]
{% case program_type -%} {% case program_type -%}
{%- when "kprobe" %} {%- when "kprobe" %}
use aya_bpf::{macros::kprobe, programs::ProbeContext}; use aya_ebpf::{macros::kprobe, programs::ProbeContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[kprobe] #[kprobe]
@ -18,7 +18,7 @@ fn try_{{crate_name}}(ctx: ProbeContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "kretprobe" %} {%- when "kretprobe" %}
use aya_bpf::{macros::kretprobe, programs::ProbeContext}; use aya_ebpf::{macros::kretprobe, programs::ProbeContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[kretprobe] #[kretprobe]
@ -34,7 +34,7 @@ fn try_{{crate_name}}(ctx: ProbeContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "fentry" %} {%- when "fentry" %}
use aya_bpf::{ use aya_ebpf::{
macros::fentry, macros::fentry,
programs::FEntryContext, programs::FEntryContext,
}; };
@ -53,7 +53,7 @@ fn try_{{crate_name}}(ctx: FEntryContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "fexit" %} {%- when "fexit" %}
use aya_bpf::{ use aya_ebpf::{
macros::fexit, macros::fexit,
programs::FExitContext, programs::FExitContext,
}; };
@ -72,7 +72,7 @@ fn try_{{crate_name}}(ctx: FExitContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "uprobe" %} {%- when "uprobe" %}
use aya_bpf::{ use aya_ebpf::{
macros::uprobe, macros::uprobe,
programs::ProbeContext, programs::ProbeContext,
}; };
@ -91,7 +91,7 @@ fn try_{{crate_name}}(ctx: ProbeContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "uretprobe" %} {%- when "uretprobe" %}
use aya_bpf::{ use aya_ebpf::{
macros::uretprobe, macros::uretprobe,
programs::ProbeContext, programs::ProbeContext,
}; };
@ -110,7 +110,7 @@ fn try_{{crate_name}}(ctx: ProbeContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "sock_ops" %} {%- when "sock_ops" %}
use aya_bpf::{ use aya_ebpf::{
macros::sock_ops, macros::sock_ops,
programs::SockOpsContext, programs::SockOpsContext,
}; };
@ -129,7 +129,7 @@ fn try_{{crate_name}}(ctx: SockOpsContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "sk_msg" %} {%- when "sk_msg" %}
use aya_bpf::{ use aya_ebpf::{
macros::{map, sk_msg}, macros::{map, sk_msg},
maps::SockHash, maps::SockHash,
programs::SkMsgContext, programs::SkMsgContext,
@ -154,7 +154,7 @@ fn try_{{crate_name}}(ctx: SkMsgContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "xdp" %} {%- when "xdp" %}
use aya_bpf::{bindings::xdp_action, macros::xdp, programs::XdpContext}; use aya_ebpf::{bindings::xdp_action, macros::xdp, programs::XdpContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[xdp] #[xdp]
@ -170,7 +170,7 @@ fn try_{{crate_name}}(ctx: XdpContext) -> Result<u32, u32> {
Ok(xdp_action::XDP_PASS) Ok(xdp_action::XDP_PASS)
} }
{%- when "classifier" %} {%- when "classifier" %}
use aya_bpf::{macros::classifier, programs::TcContext}; use aya_ebpf::{macros::classifier, programs::TcContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[classifier] #[classifier]
@ -186,7 +186,7 @@ fn try_{{crate_name}}(ctx: TcContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "cgroup_skb" %} {%- when "cgroup_skb" %}
use aya_bpf::{ use aya_ebpf::{
macros::cgroup_skb, macros::cgroup_skb,
programs::SkBuffContext, programs::SkBuffContext,
}; };
@ -205,7 +205,7 @@ fn try_{{crate_name}}(ctx: SkBuffContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "tracepoint" %} {%- when "tracepoint" %}
use aya_bpf::{ use aya_ebpf::{
macros::tracepoint, macros::tracepoint,
programs::TracePointContext, programs::TracePointContext,
}; };
@ -224,7 +224,7 @@ fn try_{{crate_name}}(ctx: TracePointContext) -> Result<u32, u32> {
Ok(0) Ok(0)
} }
{%- when "lsm" %} {%- when "lsm" %}
use aya_bpf::{ use aya_ebpf::{
macros::lsm, macros::lsm,
programs::LsmContext, programs::LsmContext,
}; };
@ -243,7 +243,7 @@ fn try_{{lsm_hook}}(ctx: LsmContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "tp_btf" %} {%- when "tp_btf" %}
use aya_bpf::{ use aya_ebpf::{
macros::btf_tracepoint, macros::btf_tracepoint,
programs::BtfTracePointContext, programs::BtfTracePointContext,
}; };
@ -262,7 +262,7 @@ fn try_{{tracepoint_name}}(ctx: BtfTracePointContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "socket_filter" %} {%- when "socket_filter" %}
use aya_bpf::{ use aya_ebpf::{
macros::socket_filter, macros::socket_filter,
programs::SkBuffContext, programs::SkBuffContext,
}; };
@ -272,7 +272,7 @@ pub fn {{crate_name}}(_ctx: SkBuffContext) -> i64 {
return 0 return 0
} }
{%- when "cgroup_sysctl" %} {%- when "cgroup_sysctl" %}
use aya_bpf::{ use aya_ebpf::{
macros::cgroup_sysctl, macros::cgroup_sysctl,
programs::SysctlContext, programs::SysctlContext,
}; };
@ -291,7 +291,7 @@ fn try_{{crate_name}}(ctx: SysctlContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "cgroup_sockopt" %} {%- when "cgroup_sockopt" %}
use aya_bpf::{macros::cgroup_sockopt, programs::SockoptContext}; use aya_ebpf::{macros::cgroup_sockopt, programs::SockoptContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[cgroup_sockopt({{sockopt_target}})] #[cgroup_sockopt({{sockopt_target}})]
@ -307,7 +307,7 @@ fn try_{{crate_name}}(ctx: SockoptContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "raw_tracepoint" %} {%- when "raw_tracepoint" %}
use aya_bpf::{macros::raw_tracepoint, programs::RawTracePointContext}; use aya_ebpf::{macros::raw_tracepoint, programs::RawTracePointContext};
use aya_log_ebpf::info; use aya_log_ebpf::info;
#[raw_tracepoint(tracepoint="{{tracepoint_name}}")] #[raw_tracepoint(tracepoint="{{tracepoint_name}}")]
@ -323,8 +323,8 @@ fn try_{{crate_name}}(ctx: RawTracePointContext) -> Result<i32, i32> {
Ok(0) Ok(0)
} }
{%- when "perf_event" %} {%- when "perf_event" %}
use aya_bpf::{ use aya_ebpf::{
helpers::bpf_get_smp_processor_id, macros::perf_event, programs::PerfEventContext, BpfContext, helpers::bpf_get_smp_processor_id, macros::perf_event, programs::PerfEventContext, EbpfContext,
}; };
use aya_log_ebpf::info; use aya_log_ebpf::info;

@ -5,8 +5,8 @@ edition = "2021"
publish = false publish = false
[dependencies] [dependencies]
aya = { git = "https://github.com/aya-rs/aya", features = ["async_tokio"] } aya = "0.12"
aya-log = { git = "https://github.com/aya-rs/aya" } aya-log = "0.2"
{% if program_types_with_opts contains program_type -%} {% if program_types_with_opts contains program_type -%}
clap = { version = "4.1", features = ["derive"] } clap = { version = "4.1", features = ["derive"] }
{% endif -%} {% endif -%}

@ -123,11 +123,11 @@ async fn main() -> Result<(), anyhow::Error> {
program.attach(cgroup)?; program.attach(cgroup)?;
{%- when "sk_msg" -%} {%- when "sk_msg" -%}
let sock_map: SockHash::<_, SockKey> = bpf.map("{{sock_map}}").unwrap().try_into()?; let sock_map: SockHash::<_, SockKey> = bpf.map("{{sock_map}}").unwrap().try_into()?;
let map_fd = sock_map.fd()?; let map_fd = sock_map.fd().try_clone()?;
let prog: &mut SkMsg = bpf.program_mut("{{crate_name}}").unwrap().try_into()?; let prog: &mut SkMsg = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
prog.load()?; prog.load()?;
prog.attach(map_fd)?; prog.attach(&map_fd)?;
// insert sockets to the map using sock_map.insert here, or from a sock_ops program // insert sockets to the map using sock_map.insert here, or from a sock_ops program
{%- when "xdp" -%} {%- when "xdp" -%}
let program: &mut Xdp = bpf.program_mut("{{crate_name}}").unwrap().try_into()?; let program: &mut Xdp = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
@ -186,6 +186,7 @@ async fn main() -> Result<(), anyhow::Error> {
perf_event::perf_sw_ids::PERF_COUNT_SW_CPU_CLOCK as u64, perf_event::perf_sw_ids::PERF_COUNT_SW_CPU_CLOCK as u64,
perf_event::PerfEventScope::AllProcessesOneCpu { cpu }, perf_event::PerfEventScope::AllProcessesOneCpu { cpu },
perf_event::SamplePolicy::Frequency(1), perf_event::SamplePolicy::Frequency(1),
true,
)?; )?;
} }
{%- when "raw_tracepoint" -%} {%- when "raw_tracepoint" -%}

Loading…
Cancel
Save