[v2,2/5] net/ixgbe: add private APIs
Checks
Commit Message
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 <chenxux.di@intel.com>
---
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 ++
5 files changed, 74 insertions(+), 6 deletions(-)
Comments
hi, chenxu
On 6/15/2020 10:18 AM, Chenxu Di wrote:
> 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 <chenxux.di@intel.com>
> ---
> 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 ++
> 5 files changed, 74 insertions(+), 6 deletions(-)
>
> 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)
Please check the alignment and other places.
> +{
> + 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;
Same comments as the first one
> -----Original Message-----
> From: Di, ChenxuX <chenxux.di@intel.com>
> Sent: Monday, June 15, 2020 10:19
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Di, ChenxuX <chenxux.di@intel.com>
> Subject: [PATCH v2 2/5] net/ixgbe: add private APIs
>
> 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 <chenxux.di@intel.com>
> ---
> 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 ++
> 5 files changed, 74 insertions(+), 6 deletions(-)
>
> 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
@@ -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);
@@ -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);
@@ -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;
+}
@@ -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_ */
@@ -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;