From patchwork Wed Jul 1 08:24:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chenxu Di X-Patchwork-Id: 72581 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 274D7A0350; Wed, 1 Jul 2020 10:47:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 199311C438; Wed, 1 Jul 2020 10:47:31 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 9F9051C2F5 for ; Wed, 1 Jul 2020 10:47:29 +0200 (CEST) IronPort-SDR: RzC1PgZGr+KTN5bD2AqaXSWjNxw0I7Y8/c/6Gw4G1VGpuM5q5amu6AicjpjzLeo6EzaCfD723x KHFj974vEDEA== X-IronPort-AV: E=McAfee;i="6000,8403,9668"; a="208021326" X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="208021326" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2020 01:47:29 -0700 IronPort-SDR: +80Gi8SH5YLuuwYYG66XGAxtVP2S9VqQx3VqhcFFJSJ+v9coACY3DlUUUq2+SfJalcVQ+Uupbb 0BB7hyqaZBjQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="295495820" Received: from intel.sh.intel.com ([10.239.255.20]) by orsmga002.jf.intel.com with ESMTP; 01 Jul 2020 01:47:27 -0700 From: Chenxu Di To: dev@dpdk.org Cc: Yang Qiming , jia.guo@intel.com, Chenxu Di Date: Wed, 1 Jul 2020 08:24:49 +0000 Message-Id: <20200701082451.34511-4-chenxux.di@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200701082451.34511-1-chenxux.di@intel.com> References: <20200611060142.75465-1-chenxux.di@intel.com> <20200701082451.34511-1-chenxux.di@intel.com> Subject: [dpdk-dev] [PATCH v3 3/5] app/testpmd: re-implement commands by using private API 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" The legacy filter API will be superseded. This patch use private api to change the implementation of commands global_config gre-key-len and show port fdir Signed-off-by: Chenxu Di --- app/test-pmd/cmdline.c | 6 ++++ app/test-pmd/config.c | 65 +++++++++++++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 996a49876..466c54aa9 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -9287,6 +9287,12 @@ cmd_global_config_parsed(void *parsed_result, conf.cfg.gre_key_len = res->len; ret = rte_eth_dev_filter_ctrl(res->port_id, RTE_ETH_FILTER_NONE, RTE_ETH_FILTER_SET, &conf); + +#ifdef RTE_LIBRTE_I40E_PMD + if (ret == -ENOTSUP) + ret = rte_pmd_i40e_set_gre_key_len(res->port_id, res->len); +#endif + if (ret != 0) printf("Global config error\n"); } diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a7112c998..ed341c715 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3727,6 +3727,50 @@ print_fdir_flow_type(uint32_t flow_types_mask) printf("\n"); } +static int +get_fdir_info(portid_t port_id, struct rte_eth_fdir_info *fdir_info) +{ + int ret; + + ret = rte_eth_dev_filter_supported(port_id, + RTE_ETH_FILTER_FDIR); + if (!ret) + rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR, + RTE_ETH_FILTER_INFO, fdir_info); + +#ifdef RTE_LIBRTE_I40E_PMD + if (ret == -ENOTSUP) + ret = rte_pmd_i40e_get_fdir_info(port_id, fdir_info); +#endif +#ifdef RTE_LIBRTE_IXGBE_PMD + if (ret == -ENOTSUP) + ret = rte_pmd_ixgbe_get_fdir_info(port_id, fdir_info); +#endif + return ret; +} + +static int +get_fdir_stat(portid_t port_id, struct rte_eth_fdir_stats *fdir_stat) +{ + int ret; + + ret = rte_eth_dev_filter_supported(port_id, + RTE_ETH_FILTER_FDIR); + if (!ret) + rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR, + RTE_ETH_FILTER_STATS, fdir_stat); + +#ifdef RTE_LIBRTE_I40E_PMD + if (ret == -ENOTSUP) + ret = rte_pmd_i40e_get_fdir_stats(port_id, fdir_stat); +#endif +#ifdef RTE_LIBRTE_IXGBE_PMD + if (ret == -ENOTSUP) + ret = rte_pmd_ixgbe_get_fdir_stats(port_id, fdir_stat); +#endif + return ret; +} + void fdir_get_infos(portid_t port_id) { @@ -3738,19 +3782,20 @@ fdir_get_infos(portid_t port_id) if (port_id_is_invalid(port_id, ENABLED_WARN)) return; - ret = rte_eth_dev_filter_supported(port_id, RTE_ETH_FILTER_FDIR); - if (ret < 0) { - printf("\n FDIR is not supported on port %-2d\n", - port_id); - return; - } memset(&fdir_info, 0, sizeof(fdir_info)); - rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR, - RTE_ETH_FILTER_INFO, &fdir_info); + ret = get_fdir_info(port_id, &fdir_info); + if (ret) { + printf("Get fdir infos error: (%s)\n", strerror(-ret)); + return; + } memset(&fdir_stat, 0, sizeof(fdir_stat)); - rte_eth_dev_filter_ctrl(port_id, RTE_ETH_FILTER_FDIR, - RTE_ETH_FILTER_STATS, &fdir_stat); + ret = get_fdir_stat(port_id, &fdir_stat); + if (ret) { + printf("Get fdir status error: (%s)\n", strerror(-ret)); + return; + } + printf("\n %s FDIR infos for port %-2d %s\n", fdir_stats_border, port_id, fdir_stats_border); printf(" MODE: ");