From da4e2ebc3f4645ad455f7b8c3e68401fcf5d771d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:51:24 +0000 Subject: [PATCH] build: bump aya from 0.12.0 to 0.13.0 Bumps [aya](https://github.com/aya-rs/aya) from 0.12.0 to 0.13.0. - [Release notes](https://github.com/aya-rs/aya/releases) - [Changelog](https://github.com/aya-rs/aya/blob/main/release.toml) - [Commits](https://github.com/aya-rs/aya/compare/aya-v0.12.0...aya-v0.13.0) --- updated-dependencies: - dependency-name: aya dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 49 ++++++++++-------- NOTICE.md | 1 + .../rust/ockam/ockam_ebpf/Cargo.lock | 28 +++++----- .../rust/ockam/ockam_ebpf/Cargo.toml | 6 +-- .../rust/ockam/ockam_ebpf/ockam_ebpf | Bin 69664 -> 69896 bytes .../rust/ockam/ockam_transport_tcp/Cargo.toml | 6 +-- .../src/ebpf_portal/ebpf_support.rs | 31 +++++------ 7 files changed, 64 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a3bb711b56..50dc5571d3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -936,27 +936,27 @@ dependencies = [ [[package]] name = "aya" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eea657cc8028447cbda5068f4e10c4fadba0131624f4f7dd1a9c46ffc8d81f" +checksum = "7127cbe933572dfabb7a87d2c740f5b720c3e19b4d2b8c99a262ffa35c8761ff" dependencies = [ "assert_matches", "aya-obj", "bitflags 2.6.0", "bytes 1.7.2", - "lazy_static", "libc", "log", - "object 0.32.2", + "object", + "once_cell", "thiserror", "tokio", ] [[package]] name = "aya-log" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f11a92f305b983e9f53433457dede617a4ad0aa22e4702220092f39e844c1a2" +checksum = "b600d806c1d07d3b81ab5f4a2a95fd80f479a0d3f1d68f29064d660865f85f02" dependencies = [ "aya", "aya-log-common", @@ -968,24 +968,24 @@ dependencies = [ [[package]] name = "aya-log-common" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d38a351ee2d5dc24e04cac6184b1b39408642d9a8b585892c99146f8dd4edb" +checksum = "befef9fe882e63164a2ba0161874e954648a72b0e1c4b361f532d590638c4eec" dependencies = [ "num_enum", ] [[package]] name = "aya-obj" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c02024a307161cf3d1f052161958fd13b1a33e3e038083e58082c0700fdab85" +checksum = "56e133d505de14d5948a312060b8b12752c22a965632cc57da12f5db653de4c0" dependencies = [ "bytes 1.7.2", "core-error", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "log", - "object 0.32.2", + "object", "thiserror", ] @@ -999,7 +999,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.5", + "object", "rustc-demangle", "serde", "windows-targets 0.52.6", @@ -2679,6 +2679,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.5.0" @@ -3091,6 +3097,11 @@ name = "hashbrown" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" @@ -4553,21 +4564,15 @@ dependencies = [ "objc", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "object" version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ + "crc32fast", + "hashbrown 0.15.0", + "indexmap 2.6.0", "memchr", ] diff --git a/NOTICE.md b/NOTICE.md index baa83798b22..a4b924ae198 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -209,6 +209,7 @@ This file contains attributions for any 3rd-party open source code used in this | flexi_logger | MIT, Apache-2.0 | https://crates.io/crates/flexi_logger | | flume | Apache-2.0, MIT | https://crates.io/crates/flume | | fnv | Apache-2.0, MIT | https://crates.io/crates/fnv | +| foldhash | Zlib | https://crates.io/crates/foldhash | | foreign-types | MIT, Apache-2.0 | https://crates.io/crates/foreign-types | | foreign-types-macros | MIT, Apache-2.0 | https://crates.io/crates/foreign-types-macros | | foreign-types-shared | MIT, Apache-2.0 | https://crates.io/crates/foreign-types-shared | diff --git a/implementations/rust/ockam/ockam_ebpf/Cargo.lock b/implementations/rust/ockam/ockam_ebpf/Cargo.lock index 0adeafcb447..e7234cad7e2 100644 --- a/implementations/rust/ockam/ockam_ebpf/Cargo.lock +++ b/implementations/rust/ockam/ockam_ebpf/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aya-ebpf" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7318de0c49a17873182763831cb22f74fb30d04e2eb7e6d7b7e9b7d86d70ed3" +checksum = "d8dbaf5409a1a0982e5c9bdc0f499a55fe5ead39fe9c846012053faf0d404f73" dependencies = [ "aya-ebpf-bindings", "aya-ebpf-cty", @@ -16,24 +16,24 @@ dependencies = [ [[package]] name = "aya-ebpf-bindings" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8536b7e39b232ecd854e587f473ba15640c09afc3e08408fc28144a7404ae75" +checksum = "783dc1a82a3d71d83286165381dcc1b1d41643f4b110733d135547527c000a9a" dependencies = [ "aya-ebpf-cty", ] [[package]] name = "aya-ebpf-cty" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c130d898322b9698937465b3b749095dae85dba0da4ee648235947eb95738d" +checksum = "2cce099aaf3abb89f9a1f8594ffe07fa53738ebc2882fac624d10d9ba31a1b10" [[package]] name = "aya-ebpf-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce7820cc83547582284a140ffbdd46ab527d7ee2d9d0cfedf3f184fad3f8e15c" +checksum = "72f47f7b4a75eb5f1d7ba0fb5628d247b1cf20388658899177875dabdda66865" dependencies = [ "proc-macro-error", "proc-macro2", @@ -43,18 +43,18 @@ dependencies = [ [[package]] name = "aya-log-common" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d38a351ee2d5dc24e04cac6184b1b39408642d9a8b585892c99146f8dd4edb" +checksum = "befef9fe882e63164a2ba0161874e954648a72b0e1c4b361f532d590638c4eec" dependencies = [ "num_enum", ] [[package]] name = "aya-log-ebpf" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a10bbadd0829895a91eb1cd2bb02d7af145704087f03812bed60cb9fe65dbb3" +checksum = "ae348f459df78a79e5cd5e164b6562b927033b97ca3b033605b341a474f44510" dependencies = [ "aya-ebpf", "aya-log-common", @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "network-types" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b13eba62f530cd2ea031938ac4472b9b649694baa1e587c2a2fadc07844d3c" +checksum = "e82e9f64c09f56aa7c80c3fa087997bd99a913f91d9c74d36cf5fd75dd5773e6" [[package]] name = "num_enum" diff --git a/implementations/rust/ockam/ockam_ebpf/Cargo.toml b/implementations/rust/ockam/ockam_ebpf/Cargo.toml index 6c72366448c..7d81b9a2ada 100644 --- a/implementations/rust/ockam/ockam_ebpf/Cargo.toml +++ b/implementations/rust/ockam/ockam_ebpf/Cargo.toml @@ -16,9 +16,9 @@ eBPF program used by Ockam TCP Portals """ [dependencies] -aya-ebpf = "0.1.0" -aya-log-ebpf = "0.1.0" -network-types = "0.0.6" +aya-ebpf = "0.1.1" +aya-log-ebpf = "0.1.1" +network-types = "0.0.7" [[bin]] name = "ockam_ebpf" diff --git a/implementations/rust/ockam/ockam_ebpf/ockam_ebpf b/implementations/rust/ockam/ockam_ebpf/ockam_ebpf index 03abe81074a2c4afdce85118aacd3a99ddbe2665..573e5e83a6df4ea8c016e299066856d9aa53cda4 100644 GIT binary patch delta 1801 zcmZ8he@q-j6y8~W+#SdrP{?`O3qsH|CYNyB9Sc%QX(TyYPAoqXW7@*rFIvckVxtL7 z2)2KihCphWq^m?MZDZ2Vu7axt&k&?hd#PS(sR^VlmZ}KV5Ii}fR0+XOwDenZ zOh`J*sk4GQ8>Vn>x@cS1UggmpI5)<@LMrFZen;mdH? z5rKBF(vLTe6yk;sBC87>^k}=(reD|>uO=@n*qywvx;GB%7nXQ)#0b@#tyaG~eTih% zp0mAhcbn%dnFO*f&%rr%uT}l$${0}P11NvsLzty8n0@2Wiv6QxD>qcV?9q>P*7u3d z+OO)ZoSA@DswV%_N>Kz_Q6kz?{EW6TJTIvIGcVJtyQ?5P_$Azf{dz4v{*}hyMj+lB zg?Kdz@5tt23=iH&I=`muo1`;FoiXZMn!+b;ZofjF zsX9F0%R{es>j_|KLEmiXd)Tb%z8<$P!i%xFNZ%jn2R%LXBengc$L&khwnX0_-!g4^ zV1+{LA%(18Gt-UzKKYg?^!sEi6>*xwoNl3>i9w%xMtNH5x)JymQQ7c)^_n7)P!(VXDy4B`o z=Qfc4Nf^87%yIAF8lpCmEOg{$>LOE5;4Y$Wu$_Nqs{XA0#^=|qPrSxz9%X7iTl*)% zv+IXYKXxXpwjfF7kUv-Uugh&`rXDONtVqJ$iI$w_NiLV?xz9KEk9CVes#h^T9LNz%hqQ69N`^$wAArNr7g0=ER zBdW=Exxy|n>~xoh1MaZX@0Smm(4Op|(^Vc8oE6Scz~c#5xF%2rlF^f$feuk>3HgtP z9bqxxuJ8*UkKig7OFeEm=P|TnVmcFvJgSom&B$t+H)?&a$u(wF&7VqpNH^bT#i84BtIabDH_)vz;80jMg{)@ DGf@l& delta 1721 zcmY*YYfM~46rQ=fLAtEeuG_HMl4x5ZgneEXx;&~I`v9@nXf)ln`z(QM(ZUa?X>5%~ zLnH!|^d`ilbbn}Kd!uk|QCd}_7IFuQW(8#;B|i=8m00H4bP6YRzXOCfy#)|2$jHQc63eVoY)>sf z7~Ui*wI$O66;0+AOqnjr5}Vy**czdc$EK}2?Y&@gs5Vifhs&7FsjWN9nXRIpo~DF% zRsqN^2JuP;#nopa#i-kmLO)-imNM>EytdLPSmxs%Zhif%Zi;+ukO8hdP9n*dx<7WJl$2wJ5qHPWxnm# zQ1=C7U3?Md+)FUWFF^$(L+dIS z{0b^?4X>-9@CvO!xp?I$WN#XS9xC!T_0Y=IYj7c}*W9FN94;g}uB{(Tz^1NA_I_5c zYjjbR*`nI|!S~EI#okYBn!Om)O$MHs4CsYvOjJJlaku(W8I#@^oB*FZ@iRoGdF`yd z3$Ttaz?M%w~puZ!WZRGea!OI3?BUi^cdy1ot zn5lY(=ln5e(>WFpFI6L{YR&_krDirZlOC$}^PDepb}PqvGD_8lEa!BT{8W7>qq!q8~29btyYTLRuTFKY2O zd&7r=zSl#=A)n3e3);NF(m=@X3rXc!*eR7{W0zhm6GP^p#VLyBfG=PTx}}yZ{A!-l zXZM%d?N*ybG+P}$yYyx@-j(OIIf71S$ZYeM+MEv2D$Ql#8ofVc@q4X)(HaPr*#i!X zTN=&5+lT(j#>cQUmV>tqeewwQ3Te;L8dBhK=4bt#p>||R+M&Z$!qwnSc62iqLb?YAGSG Qe@A9Q)#jw%^6-=Y10vD, outlet_port_map: aya::maps::HashMap, @@ -145,26 +145,27 @@ impl TcpTransportEbpfSupport { // reach for `Bpf::load_file` instead. let ebpf_binary = aya::include_bytes_aligned!("../../../ockam_ebpf/ockam_ebpf"); - let mut bpf = Bpf::load(ebpf_binary).map_err(map_bpf_error)?; + let mut ebpf = Ebpf::load(ebpf_binary).map_err(map_ebpf_error)?; // eBPF can be read from the filesystem in the runtime for development purposes // let ebpf_binary = std::fs::read(PATH).unwrap(); - // let mut bpf = Bpf::load(&ebpf_binary).map_err(map_bpf_error)?; + // let mut ebpf = Ebpf::load(&ebpf_binary).map_err(map_bpf_error)?; - if let Err(e) = BpfLogger::init(&mut bpf) { + if let Err(e) = EbpfLogger::init(&mut ebpf) { // This can happen if you remove all log statements from your eBPF program. warn!("failed to initialize eBPF logger for ingress: {}", e); } - let inlet_port_map = - aya::maps::HashMap::<_, Port, Proto>::try_from(bpf.take_map("INLET_PORT_MAP").unwrap()) - .map_err(map_map_error)?; + let inlet_port_map = aya::maps::HashMap::<_, Port, Proto>::try_from( + ebpf.take_map("INLET_PORT_MAP").unwrap(), + ) + .map_err(map_map_error)?; let outlet_port_map = aya::maps::HashMap::<_, Port, Proto>::try_from( - bpf.take_map("OUTLET_PORT_MAP").unwrap(), + ebpf.take_map("OUTLET_PORT_MAP").unwrap(), ) .map_err(map_map_error)?; let bpf = OckamBpf { - bpf, + ebpf, inlet_port_map, outlet_port_map, }; @@ -216,7 +217,7 @@ impl TcpTransportEbpfSupport { debug!("Attaching eBPF ingress to {}", iface); let program_ingress: &mut SchedClassifier = bpf - .bpf + .ebpf .program_mut("ockam_ingress") .unwrap() .try_into() @@ -245,7 +246,7 @@ impl TcpTransportEbpfSupport { debug!("Attaching eBPF egress to {}", iface); let program_egress: &mut SchedClassifier = bpf - .bpf + .ebpf .program_mut("ockam_egress") .unwrap() .try_into() @@ -332,8 +333,8 @@ impl TcpTransportEbpfSupport { } #[track_caller] -fn map_bpf_error(bpf_error: BpfError) -> Error { - Error::new(Origin::Core, Kind::Io, bpf_error) +fn map_ebpf_error(ebpf_error: EbpfError) -> Error { + Error::new(Origin::Core, Kind::Io, ebpf_error) } #[track_caller]