From 014ea2ed39986793d6b82e7a43533e91c6ec2e18 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Tue, 10 Nov 2020 14:50:26 +0000 Subject: [HICN-651] Offload checksum computation also for data packets. Signed-off-by: Mauro Sardara Change-Id: I3663ac73cdbaad3e53d4b1973a7bcbb333b3910c --- ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt | 4 ++- hicn-plugin/src/CMakeLists.txt | 1 + hicn-plugin/src/faces/face_node.c | 22 +++--------- hicn-plugin/src/faces/iface_node.c | 22 ++++++++---- hicn-plugin/src/faces/inlines.h | 42 ++++++++++++++++++++++ lib/src/protocol/tcp.c | 47 +++++++++++++++++-------- 6 files changed, 99 insertions(+), 39 deletions(-) create mode 100644 hicn-plugin/src/faces/inlines.h diff --git a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt index 705bd3cee..11075aabd 100644 --- a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt @@ -35,7 +35,9 @@ list(APPEND SYSREPO_PLUGIN_INCLUDE_DIRS list(APPEND LIBRARIES ${SYSREPO_LIBRARIES} - ${VPP_LIBRARIES}) + ${VPP_LIBRARIES} + ${SYSREPO_INCLUDE_DIRS} +) build_library(sysrepohicn SHARED diff --git a/hicn-plugin/src/CMakeLists.txt b/hicn-plugin/src/CMakeLists.txt index 97284b218..a3480c21d 100644 --- a/hicn-plugin/src/CMakeLists.txt +++ b/hicn-plugin/src/CMakeLists.txt @@ -125,6 +125,7 @@ set(HICN_PLUGIN_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/faces/face.h ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_node.h ${CMAKE_CURRENT_SOURCE_DIR}/faces/iface_node.h + ${CMAKE_CURRENT_SOURCE_DIR}/faces/inlines.h ${CMAKE_CURRENT_SOURCE_DIR}/faces/face_dpo.h ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/address_mgr.h ${CMAKE_CURRENT_SOURCE_DIR}/faces/app/face_cons.h diff --git a/hicn-plugin/src/faces/face_node.c b/hicn-plugin/src/faces/face_node.c index fd8649e6b..48d97ad51 100644 --- a/hicn-plugin/src/faces/face_node.c +++ b/hicn-plugin/src/faces/face_node.c @@ -16,6 +16,7 @@ #include #include "face.h" +#include "inlines.h" #include "face_node.h" #include "../strategy_dpo_manager.h" #include "face.h" @@ -558,7 +559,6 @@ hicn_face_rewrite_interest (vlib_main_t * vm, vlib_buffer_t * b0, /* return; */ hicn_header_t *hicn = vlib_buffer_get_current (b0); - size_t l3_header_size = sizeof(ip6_header_t); //hicn_face_ip_t *ip_face = (hicn_face_ip_t *) face->data; @@ -568,24 +568,10 @@ hicn_face_rewrite_interest (vlib_main_t * vm, vlib_buffer_t * b0, int ret = hicn_ops_vft[type.l1]->rewrite_interest (type, &hicn->protocol, &face->nat_addr, &temp_addr); - if (ip46_address_is_ip4(&face->nat_addr)) { - b0->flags |= VNET_BUFFER_F_OFFLOAD_IP_CKSUM; - l3_header_size = sizeof(ip4_header_t); - } - - if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED) { - b0->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; - - /* Make sure l3_hdr_offset and l4_hdr_offset are set */ - if (!(b0->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID)) { - b0->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID; - vnet_buffer (b0)->l3_hdr_offset = b0->current_data; - } - if (!(b0->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID)) { - b0->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID; - vnet_buffer (b0)->l4_hdr_offset = vnet_buffer (b0)->l3_hdr_offset + l3_header_size; + if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED) + { + ensure_offload_flags(b0, ip46_address_is_ip4(&face->nat_addr)); } - } ASSERT(face->flags & HICN_FACE_FLAGS_FACE); diff --git a/hicn-plugin/src/faces/iface_node.c b/hicn-plugin/src/faces/iface_node.c index 433cf0b02..a4fd1885c 100644 --- a/hicn-plugin/src/faces/iface_node.c +++ b/hicn-plugin/src/faces/iface_node.c @@ -14,6 +14,7 @@ */ #include "face.h" +#include "inlines.h" #include "../strategy_dpo_manager.h" #include "../hicn.h" #include "../infra.h" @@ -554,9 +555,13 @@ hicn_rewrite_iface_data4 (vlib_main_t * vm, vlib_buffer_t * b0, ip46_address_t temp_addr; ip46_address_reset (&temp_addr); hicn_type_t type = hicn_get_buffer (b0)->type; - hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol, - &(iface->nat_addr), &(temp_addr), - iface->pl_id); + int ret = hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol, + &(iface->nat_addr), &(temp_addr), + iface->pl_id); + if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED) + { + ensure_offload_flags(b0, 1 /* is_v4 */); + } } static inline void @@ -583,9 +588,14 @@ hicn_rewrite_iface_data6 (vlib_main_t * vm, vlib_buffer_t * b0, ip46_address_t temp_addr; ip46_address_reset (&temp_addr); hicn_type_t type = hicn_get_buffer (b0)->type; - hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol, - &(iface->nat_addr), &(temp_addr), - iface->pl_id); + int ret = hicn_ops_vft[type.l1]->rewrite_data (type, &hicn->protocol, + &(iface->nat_addr), &(temp_addr), + iface->pl_id); + + if (ret == HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED) + { + ensure_offload_flags(b0, 0 /* is_v4 */); + } } #define iface_output_x1(ipv) \ diff --git a/hicn-plugin/src/faces/inlines.h b/hicn-plugin/src/faces/inlines.h new file mode 100644 index 000000000..bfe56c8e6 --- /dev/null +++ b/hicn-plugin/src/faces/inlines.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2020 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __HICN_FACE_INLINES_H__ +#define __HICN_FACE_INLINES_H__ + +#include + +always_inline void +ensure_offload_flags (vlib_buffer_t * b, int is_v4) +{ + b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; + b->flags |= is_v4 * VNET_BUFFER_F_OFFLOAD_IP_CKSUM; + size_t l3_header_size = is_v4 * sizeof(ip4_header_t) + (!is_v4) * sizeof(ip6_header_t); + + /* Make sure l3_hdr_offset and l4_hdr_offset are set */ + if (!(b->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID)) + { + b->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID; + vnet_buffer(b)->l3_hdr_offset = b->current_data; + } + if (!(b->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID)) + { + b->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID; + vnet_buffer(b)->l4_hdr_offset = + vnet_buffer(b)->l3_hdr_offset + l3_header_size; + } +} + +#endif /* __HICN_FACE_INLINES_H__ */ \ No newline at end of file diff --git a/lib/src/protocol/tcp.c b/lib/src/protocol/tcp.c index 7b7c44ef7..c6099bf8f 100644 --- a/lib/src/protocol/tcp.c +++ b/lib/src/protocol/tcp.c @@ -45,6 +45,28 @@ DECLARE_get_length (tcp, UNEXPECTED); DECLARE_get_payload_length (tcp, UNEXPECTED); DECLARE_set_payload_length (tcp, UNEXPECTED); +always_inline int +check_tcp_checksum(u16 csum) +{ + /* As per RFC1624 + * In one's complement, there are two representations of zero: the all + * zero and the all one bit values, often referred to as +0 and -0. + * One's complement addition of non-zero inputs can produce -0 as a + * result, but never +0. Since there is guaranteed to be at least one + * non-zero field in the IP header, and the checksum field in the + * protocol header is the complement of the sum, the checksum field can + * never contain ~(+0), which is -0 (0xFFFF). It can, however, contain + * ~(-0), which is +0 (0x0000). + */ + if (csum == 0xffff) + { + /* Invalid checksum, no need to compute incremental update */ + return HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED; + } + + return HICN_LIB_ERROR_NONE; +} + int tcp_init_packet_header (hicn_type_t type, hicn_protocol_t * h) { @@ -257,21 +279,12 @@ tcp_rewrite_interest (hicn_type_t type, hicn_protocol_t * h, ip46_address_t * addr_old) { u16 *tcp_checksum = &(h->tcp.csum); + int ret = check_tcp_checksum(*tcp_checksum); - /* As per RFC1624 - * In one's complement, there are two representations of zero: the all - * zero and the all one bit values, often referred to as +0 and -0. - * One's complement addition of non-zero inputs can produce -0 as a - * result, but never +0. Since there is guaranteed to be at least one - * non-zero field in the IP header, and the checksum field in the - * protocol header is the complement of the sum, the checksum field can - * never contain ~(+0), which is -0 (0xFFFF). It can, however, contain - * ~(-0), which is +0 (0x0000). - */ - if (*tcp_checksum == 0xffff) { - /* Invalid checksum, no need to compute incremental update */ - return HICN_LIB_ERROR_REWRITE_CKSUM_REQUIRED; - } + if (ret) + { + return ret; + } /* * Padding fields are set to zero so we can apply checksum on the @@ -297,6 +310,12 @@ tcp_rewrite_data (hicn_type_t type, hicn_protocol_t * h, const hicn_faceid_t face_id) { u16 *tcp_checksum = &(h->tcp.csum); + int ret = check_tcp_checksum(*tcp_checksum); + + if (ret) + { + return ret; + } /* * Padding fields are set to zero so we can apply checksum on the -- cgit 1.2.3-korg