From patchwork Fri Oct 11 04:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kumar Sharma X-Patchwork-Id: 60920 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CCB11E85F; Fri, 11 Oct 2019 06:05:34 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id ADB251E85D for ; Fri, 11 Oct 2019 06:05:32 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x9B45NB6017490; Thu, 10 Oct 2019 21:05:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=t3XU7YWM1Kciy9cKD7WUF+yp+f2bZgMDjkzqkXGIR2U=; b=KGwF3MvxXa7iNeCDi73RbjmNBzp11ZMvzTW1Wbv2PV2+VOTmeMgxYxUmOgbGrahfrZkJ 71ORMpTfcI2Sot6olYJY61u7v9WtDp3V+dLa94P0u22RCtxl1EbM7Frl/NXzzyp3DLUq Z96bZbSjW/NQBw6Hkm3KpSE6e1g45arknNw1HPiBJORNo5v2mESInzTCa3usdfhJIvce czjlR5qpm8UdEmEZWLgKMWraRO5Vxs6Si9M+2UYfm7UsyJZwAJMwqP+lhj2ugetG+blY qWROugw+1Q/LnctyqIEsoU5H5UMNtjzpFS5QFthcF86bYrZynK1CXTL1t8Lc2+kzHYut HQ== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2vjj6v01cp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 10 Oct 2019 21:05:31 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 10 Oct 2019 21:05:30 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 10 Oct 2019 21:05:30 -0700 Received: from dell-e5540.caveonetworks.com (unknown [10.29.16.81]) by maili.marvell.com (Postfix) with ESMTP id 072393F703F; Thu, 10 Oct 2019 21:05:25 -0700 (PDT) From: To: CC: , , Vivek Sharma Date: Fri, 11 Oct 2019 09:35:21 +0530 Message-ID: <1570766721-4242-1-git-send-email-viveksharma@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568376912-9585-1-git-send-email-viveksharma@marvell.com> References: <1568376912-9585-1-git-send-email-viveksharma@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-11_02:2019-10-10,2019-10-11 signatures=0 Subject: [dpdk-dev] [PATCH v2] app/testpmd: support QinQ offload in VLAN set command X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Vivek Sharma Segregate QinQ from Extend Offload and support QinQ offload in vlan set command. Merge all port wise rx vlan offloads in command line help and documentation for a cleaner structure. Fix port info display to distinguish between qinq strip and extend offloads. Flatten all VLAN offload info into a single line to reduce info length. Signed-off-by: Vivek Sharma Reviewed-by: Ferruh Yigit --- v2: * Added fix for port info display. * Flattened port info display VLAN info. app/test-pmd/cmdline.c | 19 +++++-------- app/test-pmd/config.c | 44 +++++++++++++++++++++++++---- app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 29 ++++--------------- 4 files changed, 52 insertions(+), 41 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b1be6b4..291effe 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -325,9 +325,6 @@ static void cmd_help_long_parsed(void *parsed_result, "set vf broadcast (port_id) (vf_id) (on|off)\n" " Set VF broadcast for a VF from the PF.\n\n" - "vlan set strip (on|off) (port_id)\n" - " Set the VLAN strip on a port.\n\n" - "vlan set stripq (on|off) (port_id,queue_id)\n" " Set the VLAN strip for a queue on a port.\n\n" @@ -358,12 +355,8 @@ static void cmd_help_long_parsed(void *parsed_result, "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n" " Set all TCs' min bandwidth(%%) for all PF and VFs.\n\n" - "vlan set filter (on|off) (port_id)\n" - " Set the VLAN filter on a port.\n\n" - - "vlan set qinq (on|off) (port_id)\n" - " Set the VLAN QinQ (extended queue in queue)" - " on a port.\n\n" + "vlan set (strip|filter|qinq_strip|extend) (on|off) (port_id)\n" + " Set the VLAN strip or filter or qinq strip or extend\n\n" "vlan set (inner|outer) tpid (value) (port_id)\n" " Set the VLAN TPID for Packet Filtering on" @@ -3918,6 +3911,8 @@ cmd_vlan_offload_parsed(void *parsed_result, } else if (!strcmp(res->what, "filter")) rx_vlan_filter_set(port_id, on); + else if (!strcmp(res->what, "qinq_strip")) + rx_vlan_qinq_strip_set(port_id, on); else vlan_extend_set(port_id, on); @@ -3932,7 +3927,7 @@ cmdline_parse_token_string_t cmd_vlan_offload_set = set, "set"); cmdline_parse_token_string_t cmd_vlan_offload_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result, - what, "strip#filter#qinq#stripq"); + what, "strip#filter#qinq_strip#extend#stripq"); cmdline_parse_token_string_t cmd_vlan_offload_on = TOKEN_STRING_INITIALIZER(struct cmd_vlan_offload_result, on, "on#off"); @@ -3943,9 +3938,9 @@ cmdline_parse_token_string_t cmd_vlan_offload_portid = cmdline_parse_inst_t cmd_vlan_offload = { .f = cmd_vlan_offload_parsed, .data = NULL, - .help_str = "vlan set strip|filter|qinq|stripq on|off " + .help_str = "vlan set strip|filter|qinq_strip|extend|stripq on|off " ": " - "Filter/Strip for rx side qinq(extended) for both rx/tx sides", + "Strip/Filter/QinQ for rx side Extend for both rx/tx sides", .tokens = { (void *)&cmd_vlan_offload_vlan, (void *)&cmd_vlan_offload_set, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 24158e5..e428ea8 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -524,19 +524,24 @@ port_infos_display(portid_t port_id) if (vlan_offload >= 0){ printf("VLAN offload: \n"); if (vlan_offload & ETH_VLAN_STRIP_OFFLOAD) - printf(" strip on \n"); + printf(" strip on, "); else - printf(" strip off \n"); + printf(" strip off, "); if (vlan_offload & ETH_VLAN_FILTER_OFFLOAD) - printf(" filter on \n"); + printf("filter on, "); else - printf(" filter off \n"); + printf("filter off, "); if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) - printf(" qinq(extend) on \n"); + printf("extend on, "); else - printf(" qinq(extend) off \n"); + printf("extend off, "); + + if (vlan_offload & ETH_QINQ_STRIP_OFFLOAD) + printf("qinq strip on\n"); + else + printf("qinq strip off\n"); } if (dev_info.hash_key_size > 0) @@ -3028,6 +3033,33 @@ rx_vlan_filter_set(portid_t port_id, int on) ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } +void +rx_vlan_qinq_strip_set(portid_t port_id, int on) +{ + int diag; + int vlan_offload; + uint64_t port_rx_offloads = ports[port_id].dev_conf.rxmode.offloads; + + if (port_id_is_invalid(port_id, ENABLED_WARN)) + return; + + vlan_offload = rte_eth_dev_get_vlan_offload(port_id); + + if (on) { + vlan_offload |= ETH_QINQ_STRIP_OFFLOAD; + port_rx_offloads |= DEV_RX_OFFLOAD_QINQ_STRIP; + } else { + vlan_offload &= ~ETH_QINQ_STRIP_OFFLOAD; + port_rx_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP; + } + + diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); + if (diag < 0) + printf("%s(port_pi=%d, on=%d) failed " + "diag=%d\n", __func__, port_id, on, diag); + ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; +} + int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index d73955d..f729649 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -752,6 +752,7 @@ void rx_vlan_strip_set_on_queue(portid_t port_id, uint16_t queue_id, int on); void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); +void rx_vlan_qinq_strip_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 67f4339..53e05ef 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -198,9 +198,7 @@ For example: Maximum number of MAC addresses: 64 Maximum number of MAC addresses of hash filtering: 0 VLAN offload: - strip on - filter on - qinq(extend) off + strip on, filter on, extend off, qinq strip off Redirection table size: 512 Supported flow types: ipv4-frag @@ -799,13 +797,6 @@ Set broadcast mode for a VF from the PF:: testpmd> set vf broadcast (port_id) (vf_id) (on|off) -vlan set strip -~~~~~~~~~~~~~~ - -Set the VLAN strip on a port:: - - testpmd> vlan set strip (on|off) (port_id) - vlan set stripq ~~~~~~~~~~~~~~~ @@ -841,19 +832,11 @@ Set VLAN antispoof for a VF from the PF:: testpmd> set vf vlan antispoof (port_id) (vf_id) (on|off) -vlan set filter -~~~~~~~~~~~~~~~ - -Set the VLAN filter on a port:: - - testpmd> vlan set filter (on|off) (port_id) - -vlan set qinq -~~~~~~~~~~~~~ - -Set the VLAN QinQ (extended queue in queue) on for a port:: +vlan set (strip|filter|qinq_strip|extend) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Set the VLAN strip/filter/QinQ strip/extend on for a port:: - testpmd> vlan set qinq (on|off) (port_id) + testpmd> vlan set (strip|filter|qinq_strip|extend) (on|off) (port_id) vlan set tpid ~~~~~~~~~~~~~ @@ -4359,7 +4342,7 @@ Sample QinQ flow rules Before creating QinQ rule(s) the following commands should be issued to enable QinQ:: testpmd> port stop 0 - testpmd> vlan set qinq on 0 + testpmd> vlan set qinq_strip on 0 The above command sets the inner and outer TPID's to 0x8100.