From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Liu, Jijiang" Subject: Re: [RFC 09/16] testpmd: move csum_show in a function Date: Fri, 23 Jan 2015 11:03:00 +0000 Message-ID: <1ED644BD7E0A5F4091CF203DAFB8E4CC01DB63D6@SHSMSX101.ccr.corp.intel.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> <1421883395-27235-10-git-send-email-olivier.matz@6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: "dev-VfR2kkLFssw@public.gmane.org" To: Olivier Matz Return-path: In-Reply-To: <1421883395-27235-10-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> Content-Language: en-US List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Hi, -----Original Message----- From: Olivier Matz [mailto:olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org]=20 Sent: Thursday, January 22, 2015 7:36 AM To: dev-VfR2kkLFssw@public.gmane.org Cc: olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org; Ananyev, Konstantin; Liu, Jijiang Subject: [RFC 09/16] testpmd: move csum_show in a function No functional changes in this commit, we just move the code that displays t= he csum forward engine configuration in a function. This makes the next commit easier to read as it will also use this function= . Signed-off-by: Olivier Matz --- app/test-pmd/cmdline.c | 82 +++++++++++++++++++++++++++-------------------= ---- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 1aecbbb.= .260a273 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -2867,14 +2867,56 @@ struct cmd_csum_result { }; =20 static void +csum_show(int port_id) +{ + struct rte_eth_dev_info dev_info; + uint16_t ol_flags; + + ol_flags =3D ports[port_id].tx_ol_flags; + printf("IP checksum offload is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) ? "hw" : "sw"); + printf("UDP checksum offload is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) ? "hw" : "sw"); + printf("TCP checksum offload is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) ? "hw" : "sw"); + printf("SCTP checksum offload is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw"); + printf("VxLAN checksum offload is %s\n", + (ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) ? "hw" : "sw"); + + /* display warnings if configuration is not supported by the NIC */ + rte_eth_dev_info_get(port_id, &dev_info); + if ((ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) && + (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) =3D=3D 0) { + printf("Warning: hardware IP checksum enabled but not " + "supported by port %d\n", port_id); + } + if ((ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) && + (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) =3D=3D 0) { + printf("Warning: hardware UDP checksum enabled but not " + "supported by port %d\n", port_id); + } + if ((ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) && + (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) =3D=3D 0) { + printf("Warning: hardware TCP checksum enabled but not " + "supported by port %d\n", port_id); + } + if ((ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) && + (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) =3D=3D 0) { + printf("Warning: hardware SCTP checksum enabled but not " + "supported by port %d\n", port_id); + } The ESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM check is missed here. =20 + +} + +static void cmd_csum_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, __attribute__((unused)) void *data) { struct cmd_csum_result *res =3D parsed_result; int hw =3D 0; - uint16_t ol_flags, mask =3D 0; - struct rte_eth_dev_info dev_info; + uint16_t mask =3D 0; =20 if (port_id_is_invalid(res->port_id)) { printf("invalid port %d\n", res->port_id); @@ -2903,41 +2945,7 @@ cmd_cs= um_parsed(void *parsed_result, else ports[res->port_id].tx_ol_flags &=3D (~mask); } - - ol_flags =3D ports[res->port_id].tx_ol_flags; - printf("IP checksum offload is %s\n", - (ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) ? "hw" : "sw"); - printf("UDP checksum offload is %s\n", - (ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) ? "hw" : "sw"); - printf("TCP checksum offload is %s\n", - (ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) ? "hw" : "sw"); - printf("SCTP checksum offload is %s\n", - (ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) ? "hw" : "sw"); - printf("VxLAN checksum offload is %s\n", - (ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) ? "hw" : "sw"); - - /* display warnings if configuration is not supported by the NIC */ - rte_eth_dev_info_get(res->port_id, &dev_info); - if ((ol_flags & TESTPMD_TX_OFFLOAD_IP_CKSUM) && - (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) =3D=3D 0) { - printf("Warning: hardware IP checksum enabled but not " - "supported by port %d\n", res->port_id); - } - if ((ol_flags & TESTPMD_TX_OFFLOAD_UDP_CKSUM) && - (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_UDP_CKSUM) =3D=3D 0) { - printf("Warning: hardware UDP checksum enabled but not " - "supported by port %d\n", res->port_id); - } - if ((ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) && - (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_CKSUM) =3D=3D 0) { - printf("Warning: hardware TCP checksum enabled but not " - "supported by port %d\n", res->port_id); - } - if ((ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) && - (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) =3D=3D 0) { - printf("Warning: hardware SCTP checksum enabled but not " - "supported by port %d\n", res->port_id); - } + csum_show(res->port_id); } =20 cmdline_parse_token_string_t cmd_csum_csum =3D -- 2.1.3