Skip to content

Commit 49392d8

Browse files
committed
refactor(ebpf): use AsyncFd in PerfEventReader for tokio integration as AsyncPerfEventArray is removed
1 parent 07743c0 commit 49392d8

10 files changed

Lines changed: 218 additions & 77 deletions

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

auraed/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ path = "src/bin/main.rs"
2828
anyhow = { workspace = true }
2929
client = { workspace = true }
3030
aurae-ebpf-shared = { path = "../ebpf-shared" }
31-
aya = { version = "0.13.1", features = ["async_tokio"] }
31+
aya = { version = "0.13.1" }
3232
backoff = { version = "0.4.0", features = ["tokio"] }
3333
bytes = "1.2.1"
3434
clap = { workspace = true }

auraed/src/ebpf/perf_buffer_reader.rs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
use anyhow::Context;
1717
use aya::{
1818
Ebpf,
19-
maps::perf::AsyncPerfEventArray,
19+
maps::perf::PerfEventArray,
2020
util::{nr_cpus, online_cpus},
2121
};
2222
use bytes::BytesMut;
2323
use procfs::page_size;
2424
use std::mem::size_of;
25-
use tokio::sync::broadcast;
25+
use tokio::{
26+
io::{Interest, unix::AsyncFd},
27+
sync::broadcast,
28+
};
2629
use tracing::{error, trace};
2730

2831
use super::perf_event_broadcast::PerfEventBroadcast;
@@ -66,7 +69,7 @@ pub trait PerfBufferReader<T: Clone + Send + 'static> {
6669
// kernel to userspace. This array contains the per-CPU buffers and is
6770
// indexed by CPU id.
6871
// https://libbpf.readthedocs.io/en/latest/api.html
69-
let mut perf_array = AsyncPerfEventArray::try_from(
72+
let mut perf_array = PerfEventArray::try_from(
7073
bpf.take_map(perf_buffer)
7174
.context("Failed to find '{perf_buffer}' perf event array")?,
7275
)?;
@@ -81,8 +84,10 @@ pub trait PerfBufferReader<T: Clone + Send + 'static> {
8184
for cpu_id in online_cpus {
8285
trace!("spawning task for cpu {cpu_id}");
8386
// Open the per-CPU buffer for the current CPU id
84-
let mut per_cpu_buffer =
87+
let per_cpu_buffer =
8588
perf_array.open(cpu_id, Some(PER_CPU_BUFFER_SIZE_IN_PAGES))?;
89+
let mut fd =
90+
AsyncFd::with_interest(per_cpu_buffer, Interest::READABLE)?;
8691

8792
// Clone the sender of the event broadcast channel
8893
let per_cpu_tx = tx.clone();
@@ -99,9 +104,13 @@ pub trait PerfBufferReader<T: Clone + Send + 'static> {
99104

100105
// Start polling the per-CPU buffer for events
101106
loop {
102-
let events = match per_cpu_buffer
103-
.read_events(&mut buffers)
107+
let mut guard = fd
108+
.readable_mut()
104109
.await
110+
.expect("Failed to read from per-CPU event buffer");
111+
let events = match guard
112+
.get_inner_mut()
113+
.read_events(&mut buffers)
105114
{
106115
Ok(events) => events,
107116
Err(error) => {

auraed/tests/common/tls/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,4 @@ fn run_openssl(cmd: &mut Command) {
217217
if !status.success() {
218218
panic!("openssl command {:?} failed with status {status:?}", cmd);
219219
}
220-
}
220+
}

ebpf/LICENSE-APACHE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
File renamed without changes.

ebpf/LICENSE.MIT

Lines changed: 0 additions & 8 deletions
This file was deleted.

ebpf/src/probe-kprobe-taskstats-exit.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@
1212
* Copyright 2022 - 2024, the aurae contributors *
1313
* SPDX-License-Identifier: Apache-2.0 *
1414
\* -------------------------------------------------------------------------- */
15-
/* -------------------------------------------------------------------------- *\
16-
* SPDX-License-Identifier: GPL-2.0 *
17-
* SPDX-License-Identifier: MIT *
18-
* *
19-
* +--------------------------------------------+ *
20-
* | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | *
21-
* | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | *
22-
* | ███████║██║ ██║██████╔╝███████║█████╗ | *
23-
* | ██╔══██║██║ ██║██╔══██╗██╔══██║██╔══╝ | *
24-
* | ██║ ██║╚██████╔╝██║ ██║██║ ██║███████╗ | *
25-
* | ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ | *
26-
* +--------------------------------------------+ *
27-
* *
28-
* Distributed Systems Runtime *
29-
* *
30-
* -------------------------------------------------------------------------- *
31-
* Dual Licensed: GNU GENERAL PUBLIC LICENSE 2.0 *
32-
* Dual Licensed: MIT License *
33-
* Copyright 2023 The Aurae Authors (The Nivenly Foundation) *
34-
\* -------------------------------------------------------------------------- */
3515

3616
#![no_std]
3717
#![no_main]

ebpf/src/probe-tracepoint-sched-sched-process-fork.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@
1212
* Copyright 2022 - 2024, the aurae contributors *
1313
* SPDX-License-Identifier: Apache-2.0 *
1414
\* -------------------------------------------------------------------------- */
15-
/* -------------------------------------------------------------------------- *\
16-
* SPDX-License-Identifier: GPL-2.0 *
17-
* SPDX-License-Identifier: MIT *
18-
* *
19-
* +--------------------------------------------+ *
20-
* | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | *
21-
* | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | *
22-
* | ███████║██║ ██║██████╔╝███████║█████╗ | *
23-
* | ██╔══██║██║ ██║██╔══██╗██╔══██║██╔══╝ | *
24-
* | ██║ ██║╚██████╔╝██║ ██║██║ ██║███████╗ | *
25-
* | ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ | *
26-
* +--------------------------------------------+ *
27-
* *
28-
* Distributed Systems Runtime *
29-
* *
30-
* -------------------------------------------------------------------------- *
31-
* Dual Licensed: GNU GENERAL PUBLIC LICENSE 2.0 *
32-
* Dual Licensed: MIT License *
33-
* Copyright 2023 The Aurae Authors (The Nivenly Foundation) *
34-
\* -------------------------------------------------------------------------- */
3515

3616
#![no_std]
3717
#![no_main]

0 commit comments

Comments
 (0)