Last active
March 28, 2025 15:26
-
-
Save jdabtieu/0b947ae141eb82bb3188e056c1c65d8e to your computer and use it in GitHub Desktop.
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
| diff --git a/src/rust/catnip/runtime/mod.rs b/src/rust/catnip/runtime/mod.rs | |
| index 884dec5a..86c00d5d 100644 | |
| --- a/src/rust/catnip/runtime/mod.rs | |
| +++ b/src/rust/catnip/runtime/mod.rs | |
| @@ -20,7 +20,7 @@ use crate::{ | |
| rte_eth_dev_get_mtu, rte_eth_dev_info, rte_eth_dev_info_get, rte_eth_dev_is_valid_port, | |
| rte_eth_dev_set_mtu, rte_eth_dev_start, rte_eth_find_next_owned_by, rte_eth_link, rte_eth_link_get_nowait, | |
| rte_eth_promiscuous_enable, rte_eth_rss_ip, rte_eth_rx_burst, | |
| - rte_eth_rx_mq_mode_RTE_ETH_MQ_RX_RSS as RTE_ETH_MQ_RX_RSS, rte_eth_rx_offload_tcp_cksum, | |
| + rte_eth_rx_mq_mode_RTE_ETH_MQ_RX_NONE as RTE_ETH_MQ_RX_NONE, rte_eth_rx_offload_tcp_cksum, | |
| rte_eth_rx_offload_udp_cksum, rte_eth_rx_queue_setup, rte_eth_rxconf, rte_eth_tx_burst, | |
| rte_eth_tx_mq_mode_RTE_ETH_MQ_TX_NONE as RTE_ETH_MQ_TX_NONE, rte_eth_tx_offload_multi_segs, | |
| rte_eth_tx_offload_tcp_cksum, rte_eth_tx_offload_udp_cksum, rte_eth_tx_queue_setup, rte_eth_txconf, | |
| @@ -186,8 +186,8 @@ impl SharedDPDKRuntime { | |
| if udp_checksum_offload { | |
| port_conf.rxmode.offloads |= unsafe { rte_eth_rx_offload_udp_cksum() as u64 }; | |
| } | |
| - port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_RSS; | |
| - port_conf.rx_adv_conf.rss_conf.rss_hf = unsafe { rte_eth_rss_ip() as u64 } | dev_info.flow_type_rss_offloads; | |
| + port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE; | |
| + port_conf.rx_adv_conf.rss_conf.rss_hf = unsafe { rte_eth_rss_ip() as u64 } & 0; | |
| port_conf.txmode.mq_mode = RTE_ETH_MQ_TX_NONE; | |
| if tcp_checksum_offload { | |
| diff --git a/tests/rust/tcp-tests/socket/mod.rs b/tests/rust/tcp-tests/socket/mod.rs | |
| index a7562cc5..e442e3ef 100644 | |
| --- a/tests/rust/tcp-tests/socket/mod.rs | |
| +++ b/tests/rust/tcp-tests/socket/mod.rs | |
| @@ -123,6 +123,7 @@ fn create_socket_using_unsupported_domain(libos: &mut LibOS) -> Result<()> { | |
| fn create_socket_using_unsupported_type(libos: &mut LibOS) -> Result<()> { | |
| // Invalid socket types in Linux. | |
| #[cfg(target_os = "linux")] | |
| + #[allow(deprecated)] | |
| let socket_types: Vec<libc::c_int> = vec![ | |
| libc::SOCK_DCCP, | |
| // libc::SOCK_DGRAM, | |
| diff --git a/tests/rust/tcp.rs b/tests/rust/tcp.rs | |
| index 65c39d1a..72812c24 100644 | |
| --- a/tests/rust/tcp.rs | |
| +++ b/tests/rust/tcp.rs | |
| @@ -424,6 +424,7 @@ mod test { | |
| ]; | |
| #[cfg(target_os = "linux")] | |
| + #[allow(deprecated)] | |
| let socket_types: Vec<libc::c_int> = vec![ | |
| libc::SOCK_DCCP, | |
| // libc::SOCK_DGRAM, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment