From c7f942175b8c25c77ddc21561b52e3e6b5620b80 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Sat, 19 Jan 2019 17:28:57 +0100 Subject: Improved performance on data-fwd node: - Removed full pit entry initialization in favor of a lighter initialization on few fields - Squeezed pit entry size in order to store only the number of incomplete faces (as set in HICN_PARAM_PIT_ENTRY_PHOPS_MAX). The bitmap size is now determined by HICN_PARAM_FACES_MAX and optimized to do a fast lookup Replaced the field is_appface with the field flags in the hicn_buffer_t: - is_appface is now a flag with value 0x01 (HICN_BUFFER_FLAGS_FACE_IS_APP) - Added flag HICN_BUFFER_FLAGS_PKT_LESS_TWO_CL (0x02) to handle the copy of pkt with length < than 2*CACHE_LINES (in this case cloning is prevented by the cloning function in vpp). Such flag is initialized by the incoming face of the pkt. Change-Id: Ia956fd5719a28ee29f7fa2fd23d283964743efd8 Signed-off-by: Alberto Compagno --- hicn-plugin/src/faces/udp/dpo_udp.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'hicn-plugin/src/faces/udp/dpo_udp.h') diff --git a/hicn-plugin/src/faces/udp/dpo_udp.h b/hicn-plugin/src/faces/udp/dpo_udp.h index fdde4192b..33e4b5d46 100755 --- a/hicn-plugin/src/faces/udp/dpo_udp.h +++ b/hicn-plugin/src/faces/udp/dpo_udp.h @@ -64,8 +64,8 @@ hicn_dpo_udp4_create (dpo_id_t * dpo, * @param remote_addr: Remote address of the UDP tunnel * @param local_port: Local port of the UDP tunnel * @param remote_port: Remote port of the UDP tunnel - * @param is_appface: Boolean that indicates whether the face is an application - * face or not. (Currently only IP faces can be appface) + * @param hicnb_flags: Flags that indicate whether the face is an application + * face or not in the hicn_buffer. (Currently only IP faces can be appface) * * @result HICN_ERROR_FACE_NOT_FOUND if the face does not exist, otherwise HICN_ERROR_NONE. */ @@ -73,7 +73,7 @@ always_inline int hicn_dpo_udp4_lock (dpo_id_t * dpo, const ip4_address_t * local_addr, const ip4_address_t * remote_addr, - u16 local_port, u16 remote_port, u8 * is_appface) + u16 local_port, u16 remote_port, u8 * hicnb_flags) { hicn_face_t *face = hicn_face_udp4_get (local_addr, remote_addr, local_port, remote_port); @@ -86,7 +86,7 @@ hicn_dpo_udp4_lock (dpo_id_t * dpo, dpo->dpoi_next_node = ~0; dpo_lock (dpo); - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; return HICN_ERROR_NONE; } @@ -101,7 +101,7 @@ hicn_dpo_udp4_lock (dpo_id_t * dpo, * @param remote_addr: Remote address of the UDP tunnel * @param local_port: Local port of the UDP tunnel * @param remote_port: Remote port of the UDP tunnel - * @param is_appface: Boolean that indicates whether the face is an application + * @param hicnb_flags: Flags that indicate whether the face is an application * face or not. (Currently only IP faces can be appface) * @param node_index: vlib edge index to use in the packet processing */ @@ -110,7 +110,7 @@ hicn_dpo_udp4_add_and_lock (dpo_id_t * dpo, const ip4_address_t * local_addr, const ip4_address_t * remote_addr, u16 local_port, u16 remote_port, - u32 node_index, u8 * is_appface) + u32 node_index, u8 * hicnb_flags) { hicn_face_t *face = hicn_face_udp4_get (local_addr, remote_addr, local_port, remote_port); @@ -145,7 +145,7 @@ hicn_dpo_udp4_add_and_lock (dpo_id_t * dpo, mhash_set_mem (&hicn_face_udp_hashtb, &key, (uword *) & dpoi_index, 0); face = face; - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; dpo_set (dpo, hicn_face_udp_type, DPO_PROTO_IP4, dpoi_index); dpo->dpoi_next_node = node_index; dpo_lock (dpo); @@ -153,7 +153,7 @@ hicn_dpo_udp4_add_and_lock (dpo_id_t * dpo, return; } - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; hicn_face_id_t dpoi_index = hicn_dpoi_get_index (face); dpo_set (dpo, hicn_face_udp_type, DPO_PROTO_IP4, dpoi_index); @@ -196,7 +196,7 @@ hicn_dpo_udp6_create (dpo_id_t * dpo, * @param remote_addr: Remote address of the UDP tunnel * @param local_port: Local port of the UDP tunnel * @param remote_port: Remote port of the UDP tunnel - * @param is_appface: Boolean that indicates whether the face is an application + * @param hicnb_flags: Flags that indicate whether the face is an application * face or not. (Currently only IP faces can be appface) * * @result HICN_ERROR_FACE_NOT_FOUND if the face does not exist, otherwise HICN_ERROR_NONE. @@ -205,7 +205,7 @@ always_inline int hicn_dpo_udp6_lock (dpo_id_t * dpo, const ip6_address_t * local_addr, const ip6_address_t * remote_addr, - u16 local_port, u16 remote_port, u8 * is_appface) + u16 local_port, u16 remote_port, u8 * hicnb_flags) { hicn_face_t *face = hicn_face_udp6_get (local_addr, remote_addr, local_port, remote_port); @@ -218,7 +218,7 @@ hicn_dpo_udp6_lock (dpo_id_t * dpo, dpo_set (dpo, hicn_face_udp_type, DPO_PROTO_IP4, dpoi_index); dpo->dpoi_next_node = ~0; dpo_lock (dpo); - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; return HICN_ERROR_NONE; } @@ -233,7 +233,7 @@ hicn_dpo_udp6_lock (dpo_id_t * dpo, * @param remote_addr: Remote address of the UDP tunnel * @param local_port: Local port of the UDP tunnel * @param remote_port: Remote port of the UDP tunnel - * @param is_appface: Boolean that indicates whether the face is an application + * @param hicnb_flags: Flags that indicate whether the face is an application * face or not. (Currently only IP faces can be appface) * @param node_index: vlib edge index to use in the packet processing */ @@ -242,7 +242,7 @@ hicn_dpo_udp6_add_and_lock (dpo_id_t * dpo, const ip6_address_t * local_addr, const ip6_address_t * remote_addr, u16 local_port, u16 remote_port, - u32 node_index, u8 * is_appface) + u32 node_index, u8 * hicnb_flags) { hicn_face_t *face = hicn_face_udp6_get (local_addr, remote_addr, local_port, remote_port); @@ -276,7 +276,7 @@ hicn_dpo_udp6_add_and_lock (dpo_id_t * dpo, mhash_set_mem (&hicn_face_udp_hashtb, &key, (uword *) & dpoi_index, 0); - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; dpo_set (dpo, hicn_face_udp_type, DPO_PROTO_IP6, dpoi_index); dpo->dpoi_next_node = node_index; dpo_lock (dpo); @@ -284,7 +284,7 @@ hicn_dpo_udp6_add_and_lock (dpo_id_t * dpo, return; } - *is_appface = 0; + *hicnb_flags = HICN_BUFFER_FLAGS_DEFAULT; hicn_face_id_t dpoi_index = hicn_dpoi_get_index (face); dpo_set (dpo, hicn_face_udp_type, DPO_PROTO_IP6, dpoi_index); -- cgit 1.2.3-korg