From c7d50970d4ed8a4889b4374e6a1559aef7d3dcc0 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Tue, 12 Jun 2018 15:15:49 +0200 Subject: acl-plugin: change the src/dst L3 info in 5tuple struct to be always contiguous with L4 data Using ip46_address_t was convenient from operational point of view but created some difficulties dealing with IPv4 addresses - the extra 3x of u32 padding are costly, and the "holes" mean we can not use the smaller key-value data structures for the lookup. This commit changes the 5tuple layout for the IPv4 case, such that the src/dst addresses directly precede the L4 information. That will allow to treat the same data within 40x8 key-value structure as a 16x8 key-value structure starting with 24 byte offset. Change-Id: Ifea8d266ca0b9c931d44440bf6dc62446c1a83ec Signed-off-by: Andrew Yourtchenko --- src/plugins/acl/fa_node.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/plugins/acl/fa_node.h') diff --git a/src/plugins/acl/fa_node.h b/src/plugins/acl/fa_node.h index 5c55cb995a1..ba080446613 100644 --- a/src/plugins/acl/fa_node.h +++ b/src/plugins/acl/fa_node.h @@ -54,7 +54,17 @@ typedef union { typedef union { struct { - ip46_address_t addr[2]; + union { + struct { + /* we put the IPv4 addresses + after padding so we can still + use them as (shorter) key together with + L4 info */ + u32 l3_zero_pad[6]; + ip4_address_t ip4_addr[2]; + }; + ip6_address_t ip6_addr[2]; + }; fa_session_l4_key_t l4; /* This field should align with u64 value in bihash_40_8 keyvalue struct */ fa_packet_info_t pkt; @@ -81,7 +91,8 @@ typedef struct { u32 link_next_idx; /* +4 bytes = 16 */ u8 link_list_id; /* +1 bytes = 17 */ u8 deleted; /* +1 bytes = 18 */ - u8 reserved1[6]; /* +6 bytes = 24 */ + u8 is_ip6; /* +1 bytes = 19 */ + u8 reserved1[5]; /* +5 bytes = 24 */ u64 reserved2[5]; /* +5*8 bytes = 64 */ } fa_session_t; -- cgit 1.2.3-korg