From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 950ABF928 for ; Fri, 16 Dec 2016 20:06:09 +0100 (CET) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP; 16 Dec 2016 11:06:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,359,1477983600"; d="scan'208";a="43190798" Received: from sivswdev02.ir.intel.com ([10.237.217.46]) by orsmga005.jf.intel.com with ESMTP; 16 Dec 2016 11:06:07 -0800 From: Ferruh Yigit To: dev@dpdk.org Cc: Jingjing Wu ; Helin Zhang , Ferruh Yigit , Bernard Iremonger Date: Fri, 16 Dec 2016 19:02:51 +0000 Message-Id: <20161216190257.6921-24-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20161216190257.6921-1-ferruh.yigit@intel.com> References: <20161216143919.4909-1-ferruh.yigit@intel.com> <20161216190257.6921-1-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH v5 23/29] app/testpmd: handle i40e in VF VLAN filter 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: , X-List-Received-Date: Fri, 16 Dec 2016 19:06:10 -0000 From: Bernard Iremonger modify set_vf_rx_vlan function to handle the i40e PMD. Signed-off-by: Bernard Iremonger --- app/test-pmd/cmdline.c | 40 +++++++++++++++++++++++++++++++++------- app/test-pmd/config.c | 13 ------------- app/test-pmd/testpmd.h | 2 -- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 2b17925..81273b6 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -6835,7 +6835,6 @@ cmdline_parse_inst_t cmd_vf_mac_addr_filter = { }, }; -#ifdef RTE_LIBRTE_IXGBE_PMD /* *** ADD/REMOVE A VLAN IDENTIFIER TO/FROM A PORT VLAN RX FILTER *** */ struct cmd_vf_rx_vlan_filter { cmdline_fixed_string_t rx_vlan; @@ -6853,11 +6852,39 @@ cmd_vf_rx_vlan_filter_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vf_rx_vlan_filter *res = parsed_result; + int ret = -ENOTSUP; + __rte_unused int is_add = (strcmp(res->what, "add") == 0) ? 1 : 0; + struct rte_eth_dev_info dev_info; - if (!strcmp(res->what, "add")) - set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 1); - else - set_vf_rx_vlan(res->port_id, res->vlan_id,res->vf_mask, 0); + rte_eth_dev_info_get(res->port_id, &dev_info); + +#ifdef RTE_LIBRTE_IXGBE_PMD + if (strstr(dev_info.driver_name, "ixgbe") != NULL) + ret = rte_pmd_ixgbe_set_vf_vlan_filter(res->port_id, + res->vlan_id, res->vf_mask, is_add); +#endif +#ifdef RTE_LIBRTE_I40E_PMD + if (strstr(dev_info.driver_name, "i40e") != NULL) + ret = rte_pmd_i40e_set_vf_vlan_filter(res->port_id, + res->vlan_id, res->vf_mask, is_add); +#endif + + switch (ret) { + case 0: + break; + case -EINVAL: + printf("invalid vlan_id %d or vf_mask %lu\n", + res->vlan_id, res->vf_mask); + break; + case -ENODEV: + printf("invalid port_id %d\n", res->port_id); + break; + case -ENOTSUP: + printf("function not implemented or supported\n"); + break; + default: + printf("programming error: (%s)\n", strerror(-ret)); + } } cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_rx_vlan = @@ -6898,7 +6925,6 @@ cmdline_parse_inst_t cmd_vf_rxvlan_filter = { NULL, }, }; -#endif /* *** SET RATE LIMIT FOR A QUEUE OF A PORT *** */ struct cmd_queue_rate_limit_result { @@ -12085,9 +12111,9 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_vf_split_drop_en, (cmdline_parse_inst_t *)&cmd_set_vf_rxmode, (cmdline_parse_inst_t *)&cmd_set_vf_traffic, - (cmdline_parse_inst_t *)&cmd_vf_rxvlan_filter, (cmdline_parse_inst_t *)&cmd_vf_rate_limit, #endif + (cmdline_parse_inst_t *)&cmd_vf_rxvlan_filter, (cmdline_parse_inst_t *)&cmd_set_vf_mac_addr, (cmdline_parse_inst_t *)&cmd_set_vf_promisc, (cmdline_parse_inst_t *)&cmd_set_vf_allmulti, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index fc0424a..38aa0b9 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2348,19 +2348,6 @@ set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on) "diag=%d\n", port_id, diag); } - -void -set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id, uint64_t vf_mask, uint8_t on) -{ - int diag; - - diag = rte_pmd_ixgbe_set_vf_vlan_filter(port_id, vlan_id, vf_mask, on); - - if (diag == 0) - return; - printf("rte_pmd_ixgbe_set_vf_vlan_filter for port_id=%d failed " - "diag=%d\n", port_id, diag); -} #endif int diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9c1e703..5d104bd 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -571,8 +571,6 @@ void port_rss_reta_info(portid_t port_id, uint16_t nb_entries); void set_vf_traffic(portid_t port_id, uint8_t is_rx, uint16_t vf, uint8_t on); -void set_vf_rx_vlan(portid_t port_id, uint16_t vlan_id, - uint64_t vf_mask, uint8_t on); int set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate); int set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, -- 2.9.3