-
Notifications
You must be signed in to change notification settings - Fork 400
Implement BPF_MAP_TYPE_TASK_STORAGE on kernel side. #1485
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
sugarraysam
wants to merge
1
commit into
aya-rs:main
Choose a base branch
from
sugarraysam:kernel-map-task-storage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| use core::ptr; | ||
|
|
||
| use aya_ebpf_bindings::bindings::{BPF_F_NO_PREALLOC, BPF_LOCAL_STORAGE_GET_F_CREATE, task_struct}; | ||
|
|
||
| use crate::{ | ||
| btf_maps::btf_map_def, | ||
| helpers::{bpf_get_current_task_btf, bpf_task_storage_delete, bpf_task_storage_get}, | ||
| }; | ||
|
|
||
| btf_map_def!( | ||
| /// A BTF-compatible BPF task storage map. | ||
| /// | ||
| /// Task storage maps require `BPF_F_NO_PREALLOC` flag and `max_entries: 0`. | ||
| pub struct TaskStorage<T>, | ||
| map_type: BPF_MAP_TYPE_TASK_STORAGE, | ||
| max_entries: 0, | ||
| map_flags: BPF_F_NO_PREALLOC as usize, | ||
| key_type: i32, | ||
| value_type: T, | ||
| ); | ||
|
|
||
| impl<T> TaskStorage<T> { | ||
| #[inline(always)] | ||
| fn get_ptr(&self, task: Option<*mut task_struct>, value: *mut T, flags: u64) -> *mut T { | ||
| let task = task.unwrap_or_else(|| unsafe { bpf_get_current_task_btf() }); | ||
| unsafe { bpf_task_storage_get(self.as_ptr(), task.cast(), value.cast(), flags) }.cast() | ||
| } | ||
|
|
||
| /// Gets a mutable reference to the value associated with `task`. | ||
| /// | ||
| /// If `task` is `None`, the current task is used. | ||
| /// | ||
| /// # Safety | ||
| /// | ||
| /// This function may dereference the pointer `task`. | ||
| #[inline(always)] | ||
| pub unsafe fn get_ptr_mut(&self, task: Option<*mut task_struct>) -> *mut T { | ||
| self.get_ptr(task, ptr::null_mut(), 0) | ||
| } | ||
|
|
||
| /// Gets a mutable reference to the value associated with `task`. | ||
| /// | ||
| /// If no value is associated with `task`, `value` will be inserted. If | ||
| /// `task` is `None`, the current task is used. | ||
| /// | ||
| /// # Safety | ||
| /// | ||
| /// This function may dereference the pointer `task`. | ||
| #[inline(always)] | ||
| pub unsafe fn get_or_insert_ptr_mut( | ||
| &self, | ||
| task: Option<*mut task_struct>, | ||
| value: Option<&mut T>, | ||
| ) -> *mut T { | ||
| self.get_ptr( | ||
| task, | ||
| value.map_or(ptr::null_mut(), ptr::from_mut), | ||
| BPF_LOCAL_STORAGE_GET_F_CREATE.into(), | ||
| ) | ||
| } | ||
|
|
||
| /// Deletes the value associated with `task`. If `task` is `None`, the | ||
| /// current task is used. | ||
| /// | ||
| /// # Safety | ||
| /// | ||
| /// This function may dereference the pointer `task`. | ||
| #[inline(always)] | ||
| pub unsafe fn delete(&self, task: Option<*mut task_struct>) -> Result<(), i32> { | ||
| let task = task.unwrap_or_else(|| unsafe { bpf_get_current_task_btf() }); | ||
| let ret = unsafe { bpf_task_storage_delete(self.as_ptr(), task.cast()) }; | ||
| if ret == 0 { Ok(()) } else { Err(ret as i32) } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| #![no_std] | ||
| #![no_main] | ||
| #![expect(unused_crate_dependencies, reason = "used in other bins")] | ||
|
|
||
| use aya_ebpf::{ | ||
| btf_maps::TaskStorage, | ||
| helpers::bpf_get_current_task_btf, | ||
| macros::{btf_map, kprobe}, | ||
| programs::ProbeContext, | ||
| }; | ||
|
|
||
| #[cfg(not(test))] | ||
| extern crate ebpf_panic; | ||
|
|
||
| #[btf_map] | ||
| static TASK_STORAGE: TaskStorage<u64> = TaskStorage::new(); | ||
|
|
||
| #[kprobe] | ||
| fn task_storage_test(_ctx: ProbeContext) -> i64 { | ||
| let task = unsafe { bpf_get_current_task_btf() }; | ||
|
|
||
| let mut initial_val: u64 = 42; | ||
| let ptr = unsafe { TASK_STORAGE.get_or_insert_ptr_mut(Some(task), Some(&mut initial_val)) }; | ||
| if ptr.is_null() { | ||
| return 0; | ||
| } | ||
|
|
||
| let val = unsafe { *ptr }; | ||
| if val != 42 { | ||
| return 0; | ||
| } | ||
|
|
||
| unsafe { | ||
| *ptr = 1337; | ||
| } | ||
| let ptr = unsafe { TASK_STORAGE.get_ptr_mut(Some(task)) }; | ||
| if ptr.is_null() { | ||
| return 0; | ||
| } | ||
|
|
||
| let val = unsafe { *ptr }; | ||
| if val != 1337 { | ||
| return 0; | ||
| } | ||
|
|
||
| let ret = unsafe { | ||
| TASK_STORAGE.delete(None /* uses current task */) | ||
| }; | ||
| if ret.is_err() { | ||
| return 0; | ||
| } | ||
|
|
||
| let ptr = unsafe { TASK_STORAGE.get_ptr_mut(Some(task)) }; | ||
| if !ptr.is_null() { | ||
| return 0; | ||
| } | ||
|
|
||
| 0 | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please ignore this program for now, will modify it in due time.