From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 116C8A0350; Wed, 1 Jul 2020 10:47:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F0BD1C2F8; Wed, 1 Jul 2020 10:47:30 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id C17E21C2AA for ; Wed, 1 Jul 2020 10:47:27 +0200 (CEST) IronPort-SDR: bnLZGstpWJbmws6/v2sUkiLTrLvYCF83AUors8BhwJfAlFAr7SLPLEjKoJ2KB3yxmE9ANOkNaP du/1XrZxB6/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9668"; a="208021323" X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="208021323" 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:27 -0700 IronPort-SDR: d/aTSgL/AA0aA6GP51aR6jtNClsrsBGCBlWBWmapPjRtGaE4ZIuaC2rNq+9MichHG1IbjdCCmk P0T2IgUcODBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="295495811" Received: from intel.sh.intel.com ([10.239.255.20]) by orsmga002.jf.intel.com with ESMTP; 01 Jul 2020 01:47:25 -0700 From: Chenxu Di To: dev@dpdk.org Cc: Yang Qiming , jia.guo@intel.com, Chenxu Di Date: Wed, 1 Jul 2020 08:24:48 +0000 Message-Id: <20200701082451.34511-3-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 2/5] net/ixgbe: add private APIs 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 by rte_flow. There are also several small features which can not be implemented in rte_flow. This patch re-implemented these features as private API. Two APIs are added: rte_pmd_ixgbe_get_fdir_info. rte_pmd_ixgbe_get_fdir_stats. Signed-off-by: Chenxu Di --- doc/guides/rel_notes/release_20_08.rst | 6 ++++ drivers/net/ixgbe/ixgbe_ethdev.h | 4 +++ drivers/net/ixgbe/ixgbe_fdir.c | 8 ++--- drivers/net/ixgbe/rte_pmd_ixgbe.c | 33 +++++++++++++++++++++ drivers/net/ixgbe/rte_pmd_ixgbe.h | 33 +++++++++++++++++++++ drivers/net/ixgbe/rte_pmd_ixgbe_version.map | 2 ++ 6 files changed, 80 insertions(+), 6 deletions(-) diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index 54bfd4322..1252a337a 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -91,6 +91,12 @@ New Features * Re-implemented get_fdir_info and get_fdir_stat in private API. * Re-implemented set_gre_key_len in private API. +* **Updated the Intel ixgbe driver.** + + Updated the Intel ixgbe driver with new features and improvements, including: + + * Re-implemented get_fdir_info and get_fdir_stat in private API. + Removed Items ------------- diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 3d78b2ee2..9bdef87fb 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -697,6 +697,10 @@ int ixgbe_fdir_set_flexbytes_offset(struct rte_eth_dev *dev, int ixgbe_fdir_filter_program(struct rte_eth_dev *dev, struct ixgbe_fdir_rule *rule, bool del, bool update); +void ixgbe_fdir_info_get(struct rte_eth_dev *dev, + struct rte_eth_fdir_info *fdir_info); +void ixgbe_fdir_stats_get(struct rte_eth_dev *dev, + struct rte_eth_fdir_stats *fdir_stats); void ixgbe_configure_dcb(struct rte_eth_dev *dev); diff --git a/drivers/net/ixgbe/ixgbe_fdir.c b/drivers/net/ixgbe/ixgbe_fdir.c index 166dae1e0..6faaa8f06 100644 --- a/drivers/net/ixgbe/ixgbe_fdir.c +++ b/drivers/net/ixgbe/ixgbe_fdir.c @@ -109,10 +109,6 @@ static int ixgbe_add_del_fdir_filter(struct rte_eth_dev *dev, bool del, bool update); static int ixgbe_fdir_flush(struct rte_eth_dev *dev); -static void ixgbe_fdir_info_get(struct rte_eth_dev *dev, - struct rte_eth_fdir_info *fdir_info); -static void ixgbe_fdir_stats_get(struct rte_eth_dev *dev, - struct rte_eth_fdir_stats *fdir_stats); /** * This function is based on ixgbe_fdir_enable_82599() in base/ixgbe_82599.c. @@ -1414,7 +1410,7 @@ ixgbe_fdir_flush(struct rte_eth_dev *dev) } #define FDIRENTRIES_NUM_SHIFT 10 -static void +void ixgbe_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir_info *fdir_info) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -1473,7 +1469,7 @@ ixgbe_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir_info *fdir_info (uint8_t)((info->mask.flex_bytes_mask & 0xFF00) >> 8); } -static void +void ixgbe_fdir_stats_get(struct rte_eth_dev *dev, struct rte_eth_fdir_stats *fdir_stats) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c index 9bff557f9..d2f708242 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.c +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c @@ -1139,3 +1139,36 @@ rte_pmd_ixgbe_mdio_unlocked_write(uint16_t port, uint32_t reg_addr, } return 0; } + +int +rte_pmd_ixgbe_get_fdir_info(uint16_t port, struct rte_eth_fdir_info *fdir_info) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); + + dev = &rte_eth_devices[port]; + if (!is_ixgbe_supported(dev)) + return -ENOTSUP; + + ixgbe_fdir_info_get(dev, fdir_info); + + return 0; +} + +int +rte_pmd_ixgbe_get_fdir_stats(uint16_t port, + struct rte_eth_fdir_stats *fdir_stats) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); + + dev = &rte_eth_devices[port]; + if (!is_ixgbe_supported(dev)) + return -ENOTSUP; + + ixgbe_fdir_stats_get(dev, fdir_stats); + + return 0; +} diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h index f62fd761d..8b6bb99a5 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.h +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h @@ -726,4 +726,37 @@ enum { __rte_experimental int rte_pmd_ixgbe_upd_fctrl_sbp(uint16_t port, int enable); + +/** + * Get port fdir info + * + * @param port + * The port identifier of the Ethernet device. + * @param fdir_info + * The fdir info of the port + * @return + * - (0) if successful. + * - (-ENODEV) if *port* invalid. + * - (-ENOTSUP) if operation not supported. + */ +__rte_experimental +int +rte_pmd_ixgbe_get_fdir_info(uint16_t port, struct rte_eth_fdir_info *fdir_info); + +/** + * Get port fdir status + * + * @param port + * The port identifier of the Ethernet device. + * @param fdir_stats + * The fdir status of the port + * @return + * - (0) if successful. + * - (-ENODEV) if *port* invalid. + * - (-ENOTSUP) if operation not supported. + */ +__rte_experimental +int +rte_pmd_ixgbe_get_fdir_stats(uint16_t port, + struct rte_eth_fdir_stats *fdir_stats); #endif /* _PMD_IXGBE_H_ */ diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map index 21534dbc3..911f8083f 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map +++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map @@ -38,6 +38,8 @@ DPDK_20.0 { EXPERIMENTAL { global: + rte_pmd_ixgbe_get_fdir_info; + rte_pmd_ixgbe_get_fdir_stats; rte_pmd_ixgbe_mdio_lock; rte_pmd_ixgbe_mdio_unlock; rte_pmd_ixgbe_mdio_unlocked_read; -- 2.17.1