ethdev: remove versioning of filter control function

In 18.02 release the ABI of ethdev component was changed.
To keep compatibility with previous versions of the library
the versioning of rte_eth_dev_filter_ctrl function was implemented.

As soon as deprecation note was issued in 18.02 release, there is
no need to keep compatibility with previous versions.
Remove the versioning of rte_eth_dev_filter_ctrl function.

Signed-off-by: Kirill Rybalchenko <kirill.rybalchenko@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 74c18ed..6594585 100644 (file)
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -149,12 +149,6 @@ Deprecation Notices
   as parameter. For consistency functions adding callback will return
   ``struct rte_eth_rxtx_callback \*`` instead of ``void \*``.
 
-* ethdev: The size of variables ``flow_types_mask`` in
-  ``rte_eth_fdir_info structure``, ``sym_hash_enable_mask`` and
-  ``valid_bit_mask`` in ``rte_eth_hash_global_conf`` structure
-  will be increased from 32 to 64 bits to fulfill hardware requirements.
-  This change will break existing ABI as size of the structures will increase.
-
 * ethdev: ``rte_eth_dev_get_sec_ctx()`` fix port id storage
   ``rte_eth_dev_get_sec_ctx()`` is using ``uint8_t`` for ``port_id``,
   which should be ``uint16_t``.

diff --git a/doc/guides/rel_notes/release_18_05.rst b/doc/guides/rel_notes/release_18_05.rst
index 3923dc2..22da411 100644 (file)
--- a/doc/guides/rel_notes/release_18_05.rst
+++ b/doc/guides/rel_notes/release_18_05.rst
@@ -128,7 +128,7 @@ The libraries prepended with a plus sign were incremented in this version.
      librte_cryptodev.so.4
      librte_distributor.so.1
      librte_eal.so.6
-     librte_ethdev.so.8
+   + librte_ethdev.so.9
      librte_eventdev.so.3
      librte_flow_classify.so.1
      librte_gro.so.1

diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 3ca5782..c2f2f7d 100644 (file)
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -16,7 +16,7 @@ LDLIBS += -lrte_mbuf
 
 EXPORT_MAP := rte_ethdev_version.map
 
-LIBABIVER := 8
+LIBABIVER := 9
 
 SRCS-y += rte_ethdev.c
 SRCS-y += rte_flow.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 3b885a6..6d68749 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -34,7 +34,6 @@
 #include <rte_errno.h>
 #include <rte_spinlock.h>
 #include <rte_string_fns.h>
-#include <rte_compat.h>
 
 #include "rte_ether.h"
 #include "rte_ethdev.h"
@@ -3489,153 +3488,8 @@ rte_eth_dev_filter_supported(uint16_t port_id,
 }
 
 int
-rte_eth_dev_filter_ctrl_v22(uint16_t port_id,
-                           enum rte_filter_type filter_type,
-                           enum rte_filter_op filter_op, void *arg);
-
-int
-rte_eth_dev_filter_ctrl_v22(uint16_t port_id,
-                           enum rte_filter_type filter_type,
-                           enum rte_filter_op filter_op, void *arg)
-{
-       struct rte_eth_fdir_info_v22 {
-               enum rte_fdir_mode mode;
-               struct rte_eth_fdir_masks mask;
-               struct rte_eth_fdir_flex_conf flex_conf;
-               uint32_t guarant_spc;
-               uint32_t best_spc;
-               uint32_t flow_types_mask[1];
-               uint32_t max_flexpayload;
-               uint32_t flex_payload_unit;
-               uint32_t max_flex_payload_segment_num;
-               uint16_t flex_payload_limit;
-               uint32_t flex_bitmask_unit;
-               uint32_t max_flex_bitmask_num;
-       };
-
-       struct rte_eth_hash_global_conf_v22 {
-               enum rte_eth_hash_function hash_func;
-               uint32_t sym_hash_enable_mask[1];
-               uint32_t valid_bit_mask[1];
-       };
-
-       struct rte_eth_hash_filter_info_v22 {
-               enum rte_eth_hash_filter_info_type info_type;
-               union {
-                       uint8_t enable;
-                       struct rte_eth_hash_global_conf_v22 global_conf;
-                       struct rte_eth_input_set_conf input_set_conf;
-               } info;
-       };
-
-       struct rte_eth_dev *dev;
-
-       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
-
-       dev = &rte_eth_devices[port_id];
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
-       if (filter_op == RTE_ETH_FILTER_INFO) {
-               int retval;
-               struct rte_eth_fdir_info_v22 *fdir_info_v22;
-               struct rte_eth_fdir_info fdir_info;
-
-               fdir_info_v22 = (struct rte_eth_fdir_info_v22 *)arg;
-
-               retval = (*dev->dev_ops->filter_ctrl)(dev, filter_type,
-                         filter_op, (void *)&fdir_info);
-               fdir_info_v22->mode = fdir_info.mode;
-               fdir_info_v22->mask = fdir_info.mask;
-               fdir_info_v22->flex_conf = fdir_info.flex_conf;
-               fdir_info_v22->guarant_spc = fdir_info.guarant_spc;
-               fdir_info_v22->best_spc = fdir_info.best_spc;
-               fdir_info_v22->flow_types_mask[0] =
-                       (uint32_t)fdir_info.flow_types_mask[0];
-               fdir_info_v22->max_flexpayload = fdir_info.max_flexpayload;
-               fdir_info_v22->flex_payload_unit = fdir_info.flex_payload_unit;
-               fdir_info_v22->max_flex_payload_segment_num =
-                       fdir_info.max_flex_payload_segment_num;
-               fdir_info_v22->flex_payload_limit =
-                       fdir_info.flex_payload_limit;
-               fdir_info_v22->flex_bitmask_unit = fdir_info.flex_bitmask_unit;
-               fdir_info_v22->max_flex_bitmask_num =
-                       fdir_info.max_flex_bitmask_num;
-               return retval;
-       } else if (filter_op == RTE_ETH_FILTER_GET) {
-               int retval;
-               struct rte_eth_hash_filter_info f_info;
-               struct rte_eth_hash_filter_info_v22 *f_info_v22 =
-                       (struct rte_eth_hash_filter_info_v22 *)arg;
-
-               f_info.info_type = f_info_v22->info_type;
-               retval = (*dev->dev_ops->filter_ctrl)(dev, filter_type,
-                         filter_op, (void *)&f_info);
-
-               switch (f_info_v22->info_type) {
-               case RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT:
-                       f_info_v22->info.enable = f_info.info.enable;
-                       break;
-               case RTE_ETH_HASH_FILTER_GLOBAL_CONFIG:
-                       f_info_v22->info.global_conf.hash_func =
-                               f_info.info.global_conf.hash_func;
-                       f_info_v22->info.global_conf.sym_hash_enable_mask[0] =
-                               (uint32_t)
-                               f_info.info.global_conf.sym_hash_enable_mask[0];
-                       f_info_v22->info.global_conf.valid_bit_mask[0] =
-                               (uint32_t)
-                               f_info.info.global_conf.valid_bit_mask[0];
-                       break;
-               case RTE_ETH_HASH_FILTER_INPUT_SET_SELECT:
-                       f_info_v22->info.input_set_conf =
-                               f_info.info.input_set_conf;
-                       break;
-               default:
-                       break;
-               }
-               return retval;
-       } else if (filter_op == RTE_ETH_FILTER_SET) {
-               struct rte_eth_hash_filter_info f_info;
-               struct rte_eth_hash_filter_info_v22 *f_v22 =
-                       (struct rte_eth_hash_filter_info_v22 *)arg;
-
-               f_info.info_type = f_v22->info_type;
-               switch (f_v22->info_type) {
-               case RTE_ETH_HASH_FILTER_SYM_HASH_ENA_PER_PORT:
-                       f_info.info.enable = f_v22->info.enable;
-                       break;
-               case RTE_ETH_HASH_FILTER_GLOBAL_CONFIG:
-                       f_info.info.global_conf.hash_func =
-                               f_v22->info.global_conf.hash_func;
-                       f_info.info.global_conf.sym_hash_enable_mask[0] =
-                               (uint32_t)
-                               f_v22->info.global_conf.sym_hash_enable_mask[0];
-                       f_info.info.global_conf.valid_bit_mask[0] =
-                               (uint32_t)
-                               f_v22->info.global_conf.valid_bit_mask[0];
-                       break;
-               case RTE_ETH_HASH_FILTER_INPUT_SET_SELECT:
-                       f_info.info.input_set_conf =
-                               f_v22->info.input_set_conf;
-                       break;
-               default:
-                       break;
-               }
-               return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op,
-                                                   (void *)&f_info);
-       } else
-               return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op,
-                                                   arg);
-}
-VERSION_SYMBOL(rte_eth_dev_filter_ctrl, _v22, 2.2);
-
-int
-rte_eth_dev_filter_ctrl_v1802(uint16_t port_id,
-                             enum rte_filter_type filter_type,
-                             enum rte_filter_op filter_op, void *arg);
-
-int
-rte_eth_dev_filter_ctrl_v1802(uint16_t port_id,
-                             enum rte_filter_type filter_type,
-                             enum rte_filter_op filter_op, void *arg)
+rte_eth_dev_filter_ctrl(uint16_t port_id, enum rte_filter_type filter_type,
+                       enum rte_filter_op filter_op, void *arg)
 {
        struct rte_eth_dev *dev;
 
@@ -3646,11 +3500,6 @@ rte_eth_dev_filter_ctrl_v1802(uint16_t port_id,
        return eth_err(port_id, (*dev->dev_ops->filter_ctrl)(dev, filter_type,
                                                             filter_op, arg));
 }
-BIND_DEFAULT_SYMBOL(rte_eth_dev_filter_ctrl, _v1802, 18.02);
-MAP_STATIC_SYMBOL(int rte_eth_dev_filter_ctrl(uint16_t port_id,
-                 enum rte_filter_type filter_type,
-                 enum rte_filter_op filter_op, void *arg),
-                 rte_eth_dev_filter_ctrl_v1802);
 
 void *
 rte_eth_add_rx_callback(uint16_t port_id, uint16_t queue_id,

diff --git a/lib/librte_ether/rte_ethdev_version.map b/lib/librte_ether/rte_ethdev_version.map
index 87f02fb..34df6c8 100644 (file)
--- a/lib/librte_ether/rte_ethdev_version.map
+++ b/lib/librte_ether/rte_ethdev_version.map
@@ -16,7 +16,6 @@ DPDK_2.2 {
        rte_eth_dev_count;
        rte_eth_dev_default_mac_addr_set;
        rte_eth_dev_detach;
-       rte_eth_dev_filter_ctrl;
        rte_eth_dev_filter_supported;
        rte_eth_dev_flow_ctrl_get;
        rte_eth_dev_flow_ctrl_set;