From 5c51731ef45b84c2aab7b16d7daabc63ff2b21e2 Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Wed, 11 May 2022 05:11:28 +0000 Subject: Add gtpu flow offload test suite The implementation of GTPU offload rx is to use ip4_gtpu flow MARK action of NIC and vpp flow REDIRECT_TO_NODE and BUFFER_ADVANCE fuction to direct received gtpu flow to gtpu4-flow-input graph node, skipped ethernet-input, ip4-input, ip4-lookup, ip4-local, ip4-udp-lookup normal graph node processing. Verified on 3n-clx and Intel E810 NIC environment, single core with 64B packet, performance improve ~33% that compare with pure software way. Signed-off-by: xinfeng zhao Signed-off-by: Yulong Pei Change-Id: I2af4589448bdb1729e4ce206a8cf3a1239c61af8 Signed-off-by: Yulong Pei --- resources/api/vpp/supported_crcs.yaml | 2 ++ resources/libraries/python/Constants.py | 6 ++++++ resources/libraries/python/InterfaceUtil.py | 27 ++++++++++++++++++++++++++- resources/libraries/robot/overlay/gtpu.robot | 17 +++++++++++++++-- 4 files changed, 49 insertions(+), 3 deletions(-) (limited to 'resources') diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml index 927838bc8d..fc7308acf1 100644 --- a/resources/api/vpp/supported_crcs.yaml +++ b/resources/api/vpp/supported_crcs.yaml @@ -115,6 +115,8 @@ gtpu_add_del_tunnel_reply: '0x5383d31f' # perf # ^^ 64B-1c-ethip4gtpusw-ip4base-ndrpdr # ^ ndrpdrAND1cAND64BANDethip4gtpusw-ip4base + gtpu_offload_rx: '0xf0b08786' # perf + gtpu_offload_rx_reply: '0xe8d4e804' # perf hw_interface_set_mtu: '0xe6746899' # dev hw_interface_set_mtu_reply: '0xe8d4e804' # dev input_acl_set_interface: '0xde7ad708' # dev diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index c64461cdd0..2ecf50b770 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -308,6 +308,7 @@ class Constants: u"Intel-X710": 10000000000, u"Intel-XL710": 24500000000, u"Intel-XXV710": 24500000000, + u"Intel-E810XXV": 24500000000, u"Intel-E810CQ": 100000000000, u"Mellanox-CX556A": 100000000000, u"Amazon-Nitro-50G": 10000000000, @@ -321,6 +322,7 @@ class Constants: u"Intel-X710": 14880952, u"Intel-XL710": 18750000, u"Intel-XXV710": 18750000, + u"Intel-E810XXV": 29000000, u"Intel-E810CQ": 58500000, u"Mellanox-CX556A": 148809523, u"Amazon-Nitro-50G": 1200000, @@ -334,6 +336,7 @@ class Constants: u"Intel-X710": u"10ge2p1x710", u"Intel-XL710": u"40ge2p1xl710", u"Intel-XXV710": u"25ge2p1xxv710", + u"Intel-E810XXV": u"25ge2p1e810xxv", u"Intel-E810CQ": u"100ge2p1e810cq", u"Amazon-Nitro-50G": u"50ge1p1ena", u"Mellanox-CX556A": u"100ge2p1cx556a", @@ -346,6 +349,7 @@ class Constants: u"10ge2p1x710": u"x710", u"40ge2p1xl710": u"xl710", u"25ge2p1xxv710": u"xxv710", + u"25ge2p1e810xxv": u"e810xxv", u"100ge2p1e810cq": u"e810cq", u"50ge1p1ena": u"ena", u"100ge2p1cx556a": u"cx556a", @@ -358,6 +362,7 @@ class Constants: u"Intel-X710": [u"vfio-pci", u"avf", u"af_xdp"], u"Intel-XL710": [u"vfio-pci", u"avf", u"af_xdp"], u"Intel-XXV710": [u"vfio-pci", u"avf", u"af_xdp"], + u"Intel-E810XXV": [u"vfio-pci", u"avf", u"af_xdp"], u"Intel-E810CQ": [u"vfio-pci", u"avf", u"af_xdp"], u"Amazon-Nitro-50G": [u"vfio-pci"], u"Mellanox-CX556A": [u"rdma-core", u"af_xdp"], @@ -402,6 +407,7 @@ class Constants: u"Intel-X710": [u"vfio-pci"], u"Intel-XL710": [u"vfio-pci"], u"Intel-XXV710": [u"vfio-pci"], + u"Intel-E810XXV": [u"vfio-pci"], u"Intel-E810CQ": [u"vfio-pci"], u"Amazon-Nitro-50G": [u"vfio-pci"], u"Mellanox-CX556A": [u"mlx5_core"], diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 7e474abf8d..6ac166ac48 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -1107,6 +1107,31 @@ class InterfaceUtil: return sw_if_index + @staticmethod + def vpp_enable_gtpu_offload_rx(node, interface, gtpu_if_index): + """Enable GTPU offload RX onto interface. + + :param node: Node to run command on. + :param interface: Name of the specific interface. + :param gtpu_if_index: Index of GTPU tunnel interface. + + :type node: dict + :type interface: str + :type gtpu_interface: int + """ + sw_if_index = Topology.get_interface_sw_index(node, interface) + + cmd = u"gtpu_offload_rx" + args = dict( + hw_if_index=sw_if_index, + sw_if_index=gtpu_if_index, + enable=True + ) + + err_msg = f"Failed to enable GTPU offload RX on host {node[u'host']}" + with PapiSocketExecutor(node) as papi_exec: + papi_exec.add(cmd, **args).get_reply(err_msg) + @staticmethod def vpp_create_loopback(node, mac=None): """Create loopback interface on VPP node. diff --git a/resources/libraries/robot/overlay/gtpu.robot b/resources/libraries/robot/overlay/gtpu.robot index 3135be73fd..be82ca0fd5 100644 --- a/resources/libraries/robot/overlay/gtpu.robot +++ b/resources/libraries/robot/overlay/gtpu.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Intel and/or its affiliates. +# Copyright (c) 2022 Intel 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: @@ -23,7 +23,13 @@ | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Create GTPU tunnel on both DUT nodes, setup IPv4 adresses | | ... | with /30 prefix on DUT1-DUT2 link, and set routing on both DUT nodes -| | ... | with prefix /24 and next hop of neighbour DUT interface. +| | ... | with prefix /24 and next hop of neighbour DUT interface. Gtpu offload +| | ... | rx will be enabled on both DUT nodes if offload is set to true. +| | +| | ... | *Arguments:* +| | ... | - offload - False or True. Type: bool +| | +| | [Arguments] | ${offload}=${False} | | | | VPP Interface Set IP Address | ${dut1} | ${DUT1_${int}1}[0] | | ... | 10.10.10.1 | 24 @@ -60,3 +66,10 @@ | | ... | interface=${dut1_tunnel_if_index} | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 | | ... | interface=${dut2_tunnel_if_index} +| | +| | Run keyword if | ${offload} == ${True} +| | ... | Vpp Enable GTPU Offload rx +| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut1_tunnel_if_index} +| | Run keyword if | ${offload} == ${True} +| | ... | Vpp Enable GTPU Offload rx +| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut2_tunnel_if_index} -- cgit 1.2.3-korg