Refactor map API #397

astoycos · 2022-09-29T18:54:50Z

Fixes #386

netlify · 2022-09-29T18:54:54Z

✅ Deploy Preview for aya-rs-docs ready!

Built without sensitive environment variables

Name	Link
🔨 Latest commit	`82edd68`
🔍 Latest deploy log	https://app.netlify.com/sites/aya-rs-docs/deploys/63519bbb7ff1c60009fa17c1
😎 Deploy Preview	https://deploy-preview-397--aya-rs-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

astoycos · 2022-09-29T18:55:21Z

Still need to clean up commits and other stuff but the core bits are building and passing unit tests

aya/src/bpf.rs

aya/src/maps/array/array.rs

aya/src/maps/array/per_cpu_array.rs

aya/src/maps/array/program_array.rs

aya/src/maps/bloom_filter.rs

aya/src/maps/hash_map/hash_map.rs

aya/src/maps/mod.rs

aya/src/maps/perf/async_perf_event_array.rs

aya-log/src/lib.rs

aya/src/maps/bloom_filter.rs

astoycos · 2022-10-03T18:27:03Z

This PR is rebased against #398 to ensure CI goes green

Also there are still some tasks left on #386 to finish this up, Please let me know if there are any others i'm missing.

astoycos · 2022-10-03T19:05:11Z

@alessandrod @dave-tucker I think this is ready for you to start reviewing....I'm happy to add more testing or anything else you would like to this PR or in follow up Issues, Thanks!

astoycos · 2022-10-03T19:07:39Z

(also I can't assign you since I'm not a member of the org, any chance I could get added? )

astoycos · 2022-10-03T20:56:29Z

Ah #398 Merged updating now :)

aya/src/maps/sock/sock_hash.rs

Remove MapError::UnexpectedMapType Add Macro for converting from aya::Map to u32 (map type) for use in `MapError::InvalidMapType { map_type: x }` Signed-off-by: Andrew Stoycos <[email protected]>

alessandrod · 2022-10-19T08:06:44Z

aya/src/maps/mod.rs

+macro_rules! impl_try_from_map_generic_key_or_value {
+    ($($typ:ty),+ $(,)?) => {
+        $(
+            impl From<$typ> for u32 {


Someone is getting excited with these macros! :P

I think this should be just an internal utility method and not a from impl (nor a macro). Right now you've made it (accidentally) a public API and I don't think we want to expose Map => u32 publicly

Lol yeah I go over excited, I forgot this was as simple as adding a simple aya::Map Method, and I do like Macros :)

alessandrod

Looking great now, see last thing about the from impl, then it's good to go

Remove From method and replace with internal helper function. Signed-off-by: Andrew Stoycos <[email protected]>

astoycos · 2022-10-20T12:36:11Z

Should be all set! :)

aya/src/bpf.rs

switch map() and map_mut() from returning a `Result` to an `Option` since it's just getting a value from a Hashmap, and to stay in line with the Programs API. Remove `MapError::MapNotFound` Signed-off-by: Andrew Stoycos <[email protected]>

aya/src/maps/sock/mod.rs

aya/src/maps/mod.rs

alessandrod · 2022-10-20T17:25:32Z

aya/src/bpf.rs

    ///
-    /// # Errors
+    /// This API is intended for cases where the map must be moved into spawned


Use this when borrowing with [`map`] or [`map_mut`] is not possible (eg when using the map from an async task). The returned map will be closed on `Drop`, therefore the caller is responsible for managing its lifetime.

Fix some broken rust doc links. Make sure rustdoc build fail on warnings so we catch these broken links in CI. Signed-off-by: Andrew Stoycos <[email protected]>

ajwerner · 2022-12-28T17:26:59Z

aya-log/src/lib.rs

@@ -90,7 +90,7 @@ impl BpfLogger {
        logger: T,
    ) -> Result<BpfLogger, Error> {
        let logger = Arc::new(logger);
-        let mut logs: AsyncPerfEventArray<_> = bpf.map_mut("AYA_LOGS")?.try_into()?;
+        let mut logs: AsyncPerfEventArray<_> = bpf.take_map("AYA_LOGS").unwrap().try_into()?;


this ? -> .unwrap() means that bpf programs that don't log will result in a panic on the userspace side.

Sent #476 to fix this.

They were broken by aya-rs#397

These were broken by #89 which pulled in aya-rs/aya#397 and other changes which were not reflected in the templates.

astoycos force-pushed the refactor-map-api2 branch from 2b95d14 to 8f2b5ca Compare September 30, 2022 13:59

astoycos commented Sep 30, 2022

View reviewed changes

aya/src/bpf.rs Outdated Show resolved Hide resolved

astoycos commented Sep 30, 2022

View reviewed changes

aya/src/bpf.rs Outdated Show resolved Hide resolved

astoycos mentioned this pull request Sep 30, 2022

Convert BPF maps to using enums #386

Closed

astoycos force-pushed the refactor-map-api2 branch 2 times, most recently from 8db7617 to 67bc3b9 Compare September 30, 2022 17:58

astoycos commented Sep 30, 2022

View reviewed changes

aya/src/bpf.rs Outdated Show resolved Hide resolved