From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by dpdk.org (Postfix) with ESMTP id 36E4F5AB3 for ; Thu, 22 Jan 2015 00:36:56 +0100 (CET) Received: by mail-we0-f171.google.com with SMTP id q58so478870wes.2 for ; Wed, 21 Jan 2015 15:36:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OpIaSHuPUE+rgz6hfNp3C830vM+kH+rI9Oh9YZI4gVc=; b=KVSs/ZYQFcAGzdmi/wtlaBNmP0F9P6nicBwI7Od8TFQMLVFLTM4Q6kD63KTv31AuDn Ggk+nTIGLSXAq8pyBpjFzy6XJ0oDMq2B1roVsTjvSed7v2M1JmVIIhswmIB4q790KNwF v6jp+U4Q+2s+kutIkptQyx9HwXVpaNw5dSF6czJgS+q4GeX13NLnhQ62z70QLVhwxkMI gqsWBu1BJ6rZti30aXEWbeMDhZzcLvkfzt/ut0DSALvfkCSU+X6gWK2resjXCkt7PJyR 7lPQXm7TJSBLa6EuMtF24X21EiS5mYIrFJquGGTJcB7dZ1+ikWhjwo3aTo3KTpFabF/A szpQ== X-Gm-Message-State: ALoCoQlqzyX/rPrz1RRAYdKPu/a14J7JGoTAiU/S+GdSgh+5nI4i5yR91OnFu+OosRYwyO3ow8u+ X-Received: by 10.181.27.199 with SMTP id ji7mr62269012wid.76.1421883416073; Wed, 21 Jan 2015 15:36:56 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id wa5sm1710761wjc.8.2015.01.21.15.36.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jan 2015 15:36:55 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Thu, 22 Jan 2015 00:36:29 +0100 Message-Id: <1421883395-27235-11-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [RFC 10/16] testpmd: add csum parse_tunnel command X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2015 23:36:58 -0000 Add a new command related to csum forward engine: csum parse-tunnel (on|off) (port_id) If enabled, the tunnel packets received by the csum forward engine are parsed and seen as "outer-headers/inner-headers/data". If disabled, the parsing of the csum forward engine stops at the first l4 layer. A tunnel packet is seens as "headers/data" (inner headers are included in payload). Signed-off-by: Olivier Matz --- app/test-pmd/cmdline.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/csumonly.c | 3 ++- app/test-pmd/testpmd.h | 5 +++- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 260a273..1d294bc 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -326,6 +326,10 @@ static void cmd_help_long_parsed(void *parsed_result, " the forward engine)\n" " Please check the NIC datasheet for HW limits.\n\n" + "csum parse-tunnel (on|off) (port_id)\n" + " If disabled, treat tunnel packets as non-tunneled" + " packets (treat inner headers as payload).\n\n" + "csum show (port_id)\n" " Display tx checksum offload configuration\n\n" @@ -2873,6 +2877,8 @@ csum_show(int port_id) uint16_t ol_flags; ol_flags = ports[port_id].tx_ol_flags; + printf("Parse tunnel is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) ? "on" : "off"); printf("IP checksum offload is %s\n", (ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) ? "hw" : "sw"); printf("UDP checksum offload is %s\n", @@ -2995,6 +3001,63 @@ cmdline_parse_inst_t cmd_csum_show = { }, }; +/* Enable/disable tunnel parsing */ +struct cmd_csum_tunnel_result { + cmdline_fixed_string_t csum; + cmdline_fixed_string_t parse; + cmdline_fixed_string_t onoff; + uint8_t port_id; +}; + +static void +cmd_csum_tunnel_parsed(void *parsed_result, + __attribute__((unused)) struct cmdline *cl, + __attribute__((unused)) void *data) +{ + struct cmd_csum_tunnel_result *res = parsed_result; + + if (port_id_is_invalid(res->port_id)) { + printf("invalid port %d\n", res->port_id); + return; + } + + if (!strcmp(res->onoff, "on")) + ports[res->port_id].tx_ol_flags |= + TESTPMD_TX_OFFLOAD_PARSE_TUNNEL; + else + ports[res->port_id].tx_ol_flags &= + (~TESTPMD_TX_OFFLOAD_PARSE_TUNNEL); + + csum_show(res->port_id); +} + +cmdline_parse_token_string_t cmd_csum_tunnel_csum = + TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result, + csum, "csum"); +cmdline_parse_token_string_t cmd_csum_tunnel_parse = + TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result, + parse, "parse_tunnel"); +cmdline_parse_token_string_t cmd_csum_tunnel_onoff = + TOKEN_STRING_INITIALIZER(struct cmd_csum_tunnel_result, + onoff, "on#off"); +cmdline_parse_token_num_t cmd_csum_tunnel_portid = + TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result, + port_id, UINT8); + +cmdline_parse_inst_t cmd_csum_tunnel = { + .f = cmd_csum_tunnel_parsed, + .data = NULL, + .help_str = "enable/disable parsing of tunnels for csum engine: " + "csum parse_tunnel on|off ", + .tokens = { + (void *)&cmd_csum_tunnel_csum, + (void *)&cmd_csum_tunnel_parse, + (void *)&cmd_csum_tunnel_onoff, + (void *)&cmd_csum_tunnel_portid, + NULL, + }, +}; + /* *** ENABLE HARDWARE SEGMENTATION IN TX PACKETS *** */ struct cmd_tso_set_result { cmdline_fixed_string_t tso; @@ -8731,6 +8794,7 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_tx_vlan_set_pvid, (cmdline_parse_inst_t *)&cmd_csum_set, (cmdline_parse_inst_t *)&cmd_csum_show, + (cmdline_parse_inst_t *)&cmd_csum_tunnel, (cmdline_parse_inst_t *)&cmd_tso_set, (cmdline_parse_inst_t *)&cmd_tso_show, (cmdline_parse_inst_t *)&cmd_link_flow_control_set, diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index ca5ca39..858eb47 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -373,7 +373,8 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) l3_hdr = (char *)eth_hdr + l2_len; /* check if it's a supported tunnel (only vxlan for now) */ - if (l4_proto == IPPROTO_UDP) { + if ((testpmd_ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) && + l4_proto == IPPROTO_UDP) { udp_hdr = (struct udp_hdr *)((char *)l3_hdr + l3_len); /* check udp destination port, 4789 is the default diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 8f5e6c7..36277de 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -127,8 +127,11 @@ struct fwd_stream { #define TESTPMD_TX_OFFLOAD_SCTP_CKSUM 0x0008 /** Offload VxLAN checksum in csum forward engine */ #define TESTPMD_TX_OFFLOAD_VXLAN_CKSUM 0x0010 +/** Parse tunnel in csum forward engine. If set, dissect tunnel headers + * of rx packets. If not set, treat inner headers as payload. */ +#define TESTPMD_TX_OFFLOAD_PARSE_TUNNEL 0x0020 /** Insert VLAN header in forward engine */ -#define TESTPMD_TX_OFFLOAD_INSERT_VLAN 0x0020 +#define TESTPMD_TX_OFFLOAD_INSERT_VLAN 0x0040 /** * The data structure associated with each port. -- 2.1.3