]> git.droids-corp.org - dpdk.git/commitdiff
ethdev: remove legacy EtherType filter type support
authorAndrew Rybchenko <arybchenko@solarflare.com>
Thu, 22 Oct 2020 09:42:26 +0000 (10:42 +0100)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 3 Nov 2020 22:35:05 +0000 (23:35 +0100)
Instead of EtherType filter RTE flow API should be used.

Move corresponding definitions to ethdev internal driver API
since it is used by drivers internally.
Preserve RTE_ETH_FILTER_ETHERTYPE because of it as well.

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Acked-by: Haiyue Wang <haiyue.wang@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
13 files changed:
app/test-pmd/cmdline.c
doc/guides/nics/i40e.rst
doc/guides/rel_notes/deprecation.rst
doc/guides/testpmd_app_ug/testpmd_funcs.rst
drivers/net/bnxt/bnxt_ethdev.c
drivers/net/e1000/igb_ethdev.c
drivers/net/hinic/hinic_pmd_ethdev.h
drivers/net/i40e/i40e_ethdev.c
drivers/net/ixgbe/ixgbe_ethdev.c
drivers/net/qede/qede_filter.c
drivers/net/sfc/sfc_ethdev.c
lib/librte_ethdev/rte_eth_ctrl.h
lib/librte_ethdev/rte_ethdev_driver.h

index 2d7e8bf53c1b773f3aa66fe4088ba4cc0e49a7af..cae2444fdeef55cf885c7e4b7eba21c7474ffd01 100644 (file)
@@ -976,11 +976,6 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "filters:\n"
                        "--------\n\n"
 
-                       "ethertype_filter (port_id) (add|del)"
-                       " (mac_addr|mac_ignr) (mac_address) ethertype"
-                       " (ether_type) (drop|fwd) queue (queue_id)\n"
-                       "    Add/Del an ethertype filter.\n\n"
-
                        "2tuple_filter (port_id) (add|del)"
                        " dst_port (dst_port_value) protocol (protocol_value)"
                        " mask (mask_value) tcp_flags (tcp_flags_value)"
@@ -11069,115 +11064,6 @@ cmdline_parse_inst_t cmd_flex_filter = {
 
 /* *** Filters Control *** */
 
-/* *** deal with ethertype filter *** */
-struct cmd_ethertype_filter_result {
-       cmdline_fixed_string_t filter;
-       portid_t port_id;
-       cmdline_fixed_string_t ops;
-       cmdline_fixed_string_t mac;
-       struct rte_ether_addr mac_addr;
-       cmdline_fixed_string_t ethertype;
-       uint16_t ethertype_value;
-       cmdline_fixed_string_t drop;
-       cmdline_fixed_string_t queue;
-       uint16_t  queue_id;
-};
-
-cmdline_parse_token_string_t cmd_ethertype_filter_filter =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                filter, "ethertype_filter");
-cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-                             port_id, UINT16);
-cmdline_parse_token_string_t cmd_ethertype_filter_ops =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                ops, "add#del");
-cmdline_parse_token_string_t cmd_ethertype_filter_mac =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                mac, "mac_addr#mac_ignr");
-cmdline_parse_token_etheraddr_t cmd_ethertype_filter_mac_addr =
-       TOKEN_ETHERADDR_INITIALIZER(struct cmd_ethertype_filter_result,
-                                    mac_addr);
-cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                ethertype, "ethertype");
-cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-                             ethertype_value, UINT16);
-cmdline_parse_token_string_t cmd_ethertype_filter_drop =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                drop, "drop#fwd");
-cmdline_parse_token_string_t cmd_ethertype_filter_queue =
-       TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
-                                queue, "queue");
-cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-                             queue_id, UINT16);
-
-static void
-cmd_ethertype_filter_parsed(void *parsed_result,
-                         __rte_unused struct cmdline *cl,
-                         __rte_unused void *data)
-{
-       struct cmd_ethertype_filter_result *res = parsed_result;
-       struct rte_eth_ethertype_filter filter;
-       int ret = 0;
-
-       ret = rte_eth_dev_filter_supported(res->port_id,
-                       RTE_ETH_FILTER_ETHERTYPE);
-       if (ret < 0) {
-               printf("ethertype filter is not supported on port %u.\n",
-                       res->port_id);
-               return;
-       }
-
-       memset(&filter, 0, sizeof(filter));
-       if (!strcmp(res->mac, "mac_addr")) {
-               filter.flags |= RTE_ETHTYPE_FLAGS_MAC;
-               rte_memcpy(&filter.mac_addr, &res->mac_addr,
-                       sizeof(struct rte_ether_addr));
-       }
-       if (!strcmp(res->drop, "drop"))
-               filter.flags |= RTE_ETHTYPE_FLAGS_DROP;
-       filter.ether_type = res->ethertype_value;
-       filter.queue = res->queue_id;
-
-       if (!strcmp(res->ops, "add"))
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_ETHERTYPE,
-                               RTE_ETH_FILTER_ADD,
-                               &filter);
-       else
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_ETHERTYPE,
-                               RTE_ETH_FILTER_DELETE,
-                               &filter);
-       if (ret < 0)
-               printf("ethertype filter programming error: (%s)\n",
-                       strerror(-ret));
-}
-
-cmdline_parse_inst_t cmd_ethertype_filter = {
-       .f = cmd_ethertype_filter_parsed,
-       .data = NULL,
-       .help_str = "ethertype_filter <port_id> add|del mac_addr|mac_ignr "
-               "<mac_addr> ethertype <value> drop|fw queue <queue_id>: "
-               "Add or delete an ethertype filter entry",
-       .tokens = {
-               (void *)&cmd_ethertype_filter_filter,
-               (void *)&cmd_ethertype_filter_port_id,
-               (void *)&cmd_ethertype_filter_ops,
-               (void *)&cmd_ethertype_filter_mac,
-               (void *)&cmd_ethertype_filter_mac_addr,
-               (void *)&cmd_ethertype_filter_ethertype,
-               (void *)&cmd_ethertype_filter_ethertype_value,
-               (void *)&cmd_ethertype_filter_drop,
-               (void *)&cmd_ethertype_filter_queue,
-               (void *)&cmd_ethertype_filter_queue_id,
-               NULL,
-       },
-};
-
 /* *** deal with flow director filter *** */
 struct cmd_flow_director_result {
        cmdline_fixed_string_t flow_director_filter;
@@ -19944,7 +19830,6 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
        (cmdline_parse_inst_t *)&cmd_dump,
        (cmdline_parse_inst_t *)&cmd_dump_one,
-       (cmdline_parse_inst_t *)&cmd_ethertype_filter,
        (cmdline_parse_inst_t *)&cmd_syn_filter,
        (cmdline_parse_inst_t *)&cmd_2tuple_filter,
        (cmdline_parse_inst_t *)&cmd_5tuple_filter,
index b8ce2a652b5b1e39a6d75495eaded2c19935f939..a4793384d521d4ca611c574ac5d2774633f1cdff 100644 (file)
@@ -614,8 +614,8 @@ L2 Payload flow type in flow director cannot be used to classify MPLS packet
 as with previous firmware versions. Meanwhile, the Ethertype filter can be
 used to classify MPLS packet by using a command in testpmd like:
 
-   testpmd> ethertype_filter 0 add mac_ignr 00:00:00:00:00:00 ethertype \
-            0x8847 fwd queue <M>
+   testpmd> flow create 0 ingress pattern eth type is 0x8847 / end \
+            actions queue index <M> / end
 
 16 Byte RX Descriptor setting on DPDK VF
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
index d2350c1434663ac0e9ea4d655926254bf3145bc2..279fdf8e238fca6c3fda5a45df2da263932ad3ff 100644 (file)
@@ -91,7 +91,7 @@ Deprecation Notices
 
 * ethdev: the legacy filter API, including
   ``rte_eth_dev_filter_supported()``, ``rte_eth_dev_filter_ctrl()`` as well
-  as filter types ETHERTYPE, FLEXIBLE, SYN, NTUPLE, TUNNEL, FDIR,
+  as filter types FLEXIBLE, SYN, NTUPLE, TUNNEL, FDIR,
   HASH and L2_TUNNEL, is superseded by the generic flow API (rte_flow) in
   PMDs that implement the latter.
   The legacy API will be removed in DPDK 20.11.
index 8e7b20631d482f3b1e06d32dc726ffe55d80f41c..c31de65ca644498317c5ab34b84da6f76f36049a 100644 (file)
@@ -3271,38 +3271,6 @@ This section details the available filter functions that are available.
 Note these functions interface the deprecated legacy filtering framework,
 superseded by *rte_flow*. See `Flow rules management`_.
 
-ethertype_filter
-~~~~~~~~~~~~~~~~~~~~
-
-Add or delete a L2 Ethertype filter, which identify packets by their L2 Ethertype mainly assign them to a receive queue::
-
-   ethertype_filter (port_id) (add|del) (mac_addr|mac_ignr) (mac_address) \
-                    ethertype (ether_type) (drop|fwd) queue (queue_id)
-
-The available information parameters are:
-
-* ``port_id``: The port which the Ethertype filter assigned on.
-
-* ``mac_addr``: Compare destination mac address.
-
-* ``mac_ignr``: Ignore destination mac address match.
-
-* ``mac_address``: Destination mac address to match.
-
-* ``ether_type``: The EtherType value want to match,
-  for example 0x0806 for ARP packet. 0x0800 (IPv4) and 0x86DD (IPv6) are invalid.
-
-* ``queue_id``: The receive queue associated with this EtherType filter.
-  It is meaningless when deleting or dropping.
-
-Example, to add/remove an ethertype filter rule::
-
-   testpmd> ethertype_filter 0 add mac_ignr 00:11:22:33:44:55 \
-                             ethertype 0x0806 fwd queue 3
-
-   testpmd> ethertype_filter 0 del mac_ignr 00:11:22:33:44:55 \
-                             ethertype 0x0806 fwd queue 3
-
 2tuple_filter
 ~~~~~~~~~~~~~~~~~
 
index b4c1dae1e48aea85a976db6e2b1d1990bdc9240d..22077e526e6b85857f09298caa6426e513ed1b77 100644 (file)
@@ -2993,160 +2993,6 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
        return RTE_ETH_TX_DESC_FULL;
 }
 
-static struct bnxt_filter_info *
-bnxt_match_and_validate_ether_filter(struct bnxt *bp,
-                               struct rte_eth_ethertype_filter *efilter,
-                               struct bnxt_vnic_info *vnic0,
-                               struct bnxt_vnic_info *vnic,
-                               int *ret)
-{
-       struct bnxt_filter_info *mfilter = NULL;
-       int match = 0;
-       *ret = 0;
-
-       if (efilter->ether_type == RTE_ETHER_TYPE_IPV4 ||
-               efilter->ether_type == RTE_ETHER_TYPE_IPV6) {
-               PMD_DRV_LOG(ERR, "invalid ether_type(0x%04x) in"
-                       " ethertype filter.", efilter->ether_type);
-               *ret = -EINVAL;
-               goto exit;
-       }
-       if (efilter->queue >= bp->rx_nr_rings) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-               *ret = -EINVAL;
-               goto exit;
-       }
-
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       vnic = &bp->vnic_info[efilter->queue];
-       if (vnic == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-               *ret = -EINVAL;
-               goto exit;
-       }
-
-       if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-               STAILQ_FOREACH(mfilter, &vnic0->filter, next) {
-                       if ((!memcmp(efilter->mac_addr.addr_bytes,
-                                    mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-                            mfilter->flags ==
-                            HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP &&
-                            mfilter->ethertype == efilter->ether_type)) {
-                               match = 1;
-                               break;
-                       }
-               }
-       } else {
-               STAILQ_FOREACH(mfilter, &vnic->filter, next)
-                       if ((!memcmp(efilter->mac_addr.addr_bytes,
-                                    mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-                            mfilter->ethertype == efilter->ether_type &&
-                            mfilter->flags ==
-                            HWRM_CFA_L2_FILTER_CFG_INPUT_FLAGS_PATH_RX)) {
-                               match = 1;
-                               break;
-                       }
-       }
-
-       if (match)
-               *ret = -EEXIST;
-
-exit:
-       return mfilter;
-}
-
-static int
-bnxt_ethertype_filter(struct rte_eth_dev *dev,
-                       enum rte_filter_op filter_op,
-                       void *arg)
-{
-       struct bnxt *bp = dev->data->dev_private;
-       struct rte_eth_ethertype_filter *efilter =
-                       (struct rte_eth_ethertype_filter *)arg;
-       struct bnxt_filter_info *bfilter, *filter1;
-       struct bnxt_vnic_info *vnic, *vnic0;
-       int ret;
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       vnic = &bp->vnic_info[efilter->queue];
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               bnxt_match_and_validate_ether_filter(bp, efilter,
-                                                       vnic0, vnic, &ret);
-               if (ret < 0)
-                       return ret;
-
-               bfilter = bnxt_get_unused_filter(bp);
-               if (bfilter == NULL) {
-                       PMD_DRV_LOG(ERR,
-                               "Not enough resources for a new filter.\n");
-                       return -ENOMEM;
-               }
-               bfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-               memcpy(bfilter->l2_addr, efilter->mac_addr.addr_bytes,
-                      RTE_ETHER_ADDR_LEN);
-               memcpy(bfilter->dst_macaddr, efilter->mac_addr.addr_bytes,
-                      RTE_ETHER_ADDR_LEN);
-               bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_MACADDR;
-               bfilter->ethertype = efilter->ether_type;
-               bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-
-               filter1 = bnxt_get_l2_filter(bp, bfilter, vnic0);
-               if (filter1 == NULL) {
-                       ret = -EINVAL;
-                       goto cleanup;
-               }
-               bfilter->enables |=
-                       HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-               bfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-
-               bfilter->dst_id = vnic->fw_vnic_id;
-
-               if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-                       bfilter->flags =
-                               HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP;
-               }
-
-               ret = bnxt_hwrm_set_ntuple_filter(bp, bfilter->dst_id, bfilter);
-               if (ret)
-                       goto cleanup;
-               STAILQ_INSERT_TAIL(&vnic->filter, bfilter, next);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               filter1 = bnxt_match_and_validate_ether_filter(bp, efilter,
-                                                       vnic0, vnic, &ret);
-               if (ret == -EEXIST) {
-                       ret = bnxt_hwrm_clear_ntuple_filter(bp, filter1);
-
-                       STAILQ_REMOVE(&vnic->filter, filter1, bnxt_filter_info,
-                                     next);
-                       bnxt_free_filter(bp, filter1);
-               } else if (ret == 0) {
-                       PMD_DRV_LOG(ERR, "No matching filter found\n");
-               }
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-               ret = -EINVAL;
-               goto error;
-       }
-       return ret;
-cleanup:
-       bnxt_free_filter(bp, bfilter);
-error:
-       return ret;
-}
-
 static inline int
 parse_ntuple_filter(struct bnxt *bp,
                    struct rte_eth_ntuple_filter *nfilter,
@@ -3821,9 +3667,6 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
        case RTE_ETH_FILTER_NTUPLE:
                ret = bnxt_ntuple_filter(dev, filter_op, arg);
                break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               ret = bnxt_ethertype_filter(dev, filter_op, arg);
-               break;
        case RTE_ETH_FILTER_GENERIC:
                if (filter_op != RTE_ETH_FILTER_GET)
                        return -EINVAL;
index ac4b8f1123f8e14402a5bff3010f0dea8d8a90be..8b18f1cb28f791fad68d64f19b38a28fba692118 100644 (file)
@@ -209,11 +209,6 @@ static int igb_get_ntuple_filter(struct rte_eth_dev *dev,
 static int igb_ntuple_filter_handle(struct rte_eth_dev *dev,
                                enum rte_filter_op filter_op,
                                void *arg);
-static int igb_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg);
-static int igb_get_ethertype_filter(struct rte_eth_dev *dev,
-                       struct rte_eth_ethertype_filter *filter);
 static int eth_igb_filter_ctrl(struct rte_eth_dev *dev,
                     enum rte_filter_type filter_type,
                     enum rte_filter_op filter_op,
@@ -4842,83 +4837,6 @@ igb_add_del_ethertype_filter(struct rte_eth_dev *dev,
        return 0;
 }
 
-static int
-igb_get_ethertype_filter(struct rte_eth_dev *dev,
-                       struct rte_eth_ethertype_filter *filter)
-{
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct e1000_filter_info *filter_info =
-               E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
-       uint32_t etqf;
-       int ret;
-
-       ret = igb_ethertype_filter_lookup(filter_info, filter->ether_type);
-       if (ret < 0) {
-               PMD_DRV_LOG(ERR, "ethertype (0x%04x) filter doesn't exist.",
-                           filter->ether_type);
-               return -ENOENT;
-       }
-
-       etqf = E1000_READ_REG(hw, E1000_ETQF(ret));
-       if (etqf & E1000_ETQF_FILTER_ENABLE) {
-               filter->ether_type = etqf & E1000_ETQF_ETHERTYPE;
-               filter->flags = 0;
-               filter->queue = (etqf & E1000_ETQF_QUEUE) >>
-                               E1000_ETQF_QUEUE_SHIFT;
-               return 0;
-       }
-
-       return -ENOENT;
-}
-
-/*
- * igb_ethertype_filter_handle - Handle operations for ethertype filter.
- * @dev: pointer to rte_eth_dev structure
- * @filter_op:operation will be taken.
- * @arg: a pointer to specific structure corresponding to the filter_op
- */
-static int
-igb_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg)
-{
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       int ret;
-
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               ret = igb_add_del_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       TRUE);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               ret = igb_add_del_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       FALSE);
-               break;
-       case RTE_ETH_FILTER_GET:
-               ret = igb_get_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg);
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-               ret = -EINVAL;
-               break;
-       }
-       return ret;
-}
-
 static int
 eth_igb_filter_ctrl(struct rte_eth_dev *dev,
                     enum rte_filter_type filter_type,
@@ -4931,9 +4849,6 @@ eth_igb_filter_ctrl(struct rte_eth_dev *dev,
        case RTE_ETH_FILTER_NTUPLE:
                ret = igb_ntuple_filter_handle(dev, filter_op, arg);
                break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               ret = igb_ethertype_filter_handle(dev, filter_op, arg);
-               break;
        case RTE_ETH_FILTER_SYN:
                ret = eth_igb_syn_filter_handle(dev, filter_op, arg);
                break;
index 3f2d51d7522d29af1b7bb0516fe147d847bd0843..c7338d83be31d18a78099d2804ec0d8a5ef8856b 100644 (file)
@@ -7,6 +7,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
+#include <rte_ethdev_driver.h>
 
 #include "base/hinic_compat.h"
 #include "base/hinic_pmd_cfg.h"
index e298d7aee6dfb156fc63c22d48596a72ac8efdc9..aa87ad8dd5bed34915360be767d22675aad58ad2 100644 (file)
@@ -319,9 +319,6 @@ static int i40e_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
 static int i40e_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
                                        struct rte_eth_udp_tunnel *udp_tunnel);
 static void i40e_filter_input_set_init(struct i40e_pf *pf);
-static int i40e_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg);
 static int i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
                                enum rte_filter_type filter_type,
                                enum rte_filter_op filter_op,
@@ -10449,45 +10446,6 @@ i40e_ethertype_filter_set(struct i40e_pf *pf,
        return ret;
 }
 
-/*
- * Handle operations for ethertype filter.
- */
-static int
-i40e_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg)
-{
-       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-       int ret = 0;
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return ret;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               ret = i40e_ethertype_filter_set(pf,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       TRUE);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               ret = i40e_ethertype_filter_set(pf,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       FALSE);
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u", filter_op);
-               ret = -ENOSYS;
-               break;
-       }
-       return ret;
-}
-
 static int
 i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
                     enum rte_filter_type filter_type,
@@ -10507,9 +10465,6 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
        case RTE_ETH_FILTER_HASH:
                ret = i40e_hash_filter_ctrl(dev, filter_op, arg);
                break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               ret = i40e_ethertype_filter_handle(dev, filter_op, arg);
-               break;
        case RTE_ETH_FILTER_TUNNEL:
                ret = i40e_tunnel_filter_handle(dev, filter_op, arg);
                break;
index 913c45366a44b43cd7d65deea31471e382618f67..f955e965dd8e4b8352b0f285eeec672708fbc0b4 100644 (file)
@@ -314,11 +314,6 @@ static int ixgbe_ntuple_filter_handle(struct rte_eth_dev *dev,
                                void *arg);
 static int ixgbe_get_ntuple_filter(struct rte_eth_dev *dev,
                        struct rte_eth_ntuple_filter *filter);
-static int ixgbe_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg);
-static int ixgbe_get_ethertype_filter(struct rte_eth_dev *dev,
-                       struct rte_eth_ethertype_filter *filter);
 static int ixgbe_dev_filter_ctrl(struct rte_eth_dev *dev,
                     enum rte_filter_type filter_type,
                     enum rte_filter_op filter_op,
@@ -6974,83 +6969,6 @@ ixgbe_add_del_ethertype_filter(struct rte_eth_dev *dev,
        return 0;
 }
 
-static int
-ixgbe_get_ethertype_filter(struct rte_eth_dev *dev,
-                       struct rte_eth_ethertype_filter *filter)
-{
-       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct ixgbe_filter_info *filter_info =
-               IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
-       uint32_t etqf, etqs;
-       int ret;
-
-       ret = ixgbe_ethertype_filter_lookup(filter_info, filter->ether_type);
-       if (ret < 0) {
-               PMD_DRV_LOG(ERR, "ethertype (0x%04x) filter doesn't exist.",
-                           filter->ether_type);
-               return -ENOENT;
-       }
-
-       etqf = IXGBE_READ_REG(hw, IXGBE_ETQF(ret));
-       if (etqf & IXGBE_ETQF_FILTER_EN) {
-               etqs = IXGBE_READ_REG(hw, IXGBE_ETQS(ret));
-               filter->ether_type = etqf & IXGBE_ETQF_ETHERTYPE;
-               filter->flags = 0;
-               filter->queue = (etqs & IXGBE_ETQS_RX_QUEUE) >>
-                              IXGBE_ETQS_RX_QUEUE_SHIFT;
-               return 0;
-       }
-       return -ENOENT;
-}
-
-/*
- * ixgbe_ethertype_filter_handle - Handle operations for ethertype filter.
- * @dev: pointer to rte_eth_dev structure
- * @filter_op:operation will be taken.
- * @arg: a pointer to specific structure corresponding to the filter_op
- */
-static int
-ixgbe_ethertype_filter_handle(struct rte_eth_dev *dev,
-                               enum rte_filter_op filter_op,
-                               void *arg)
-{
-       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       int ret;
-
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               ret = ixgbe_add_del_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       TRUE);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               ret = ixgbe_add_del_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg,
-                       FALSE);
-               break;
-       case RTE_ETH_FILTER_GET:
-               ret = ixgbe_get_ethertype_filter(dev,
-                       (struct rte_eth_ethertype_filter *)arg);
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-               ret = -EINVAL;
-               break;
-       }
-       return ret;
-}
-
 static int
 ixgbe_dev_filter_ctrl(struct rte_eth_dev *dev,
                     enum rte_filter_type filter_type,
@@ -7063,9 +6981,6 @@ ixgbe_dev_filter_ctrl(struct rte_eth_dev *dev,
        case RTE_ETH_FILTER_NTUPLE:
                ret = ixgbe_ntuple_filter_handle(dev, filter_op, arg);
                break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               ret = ixgbe_ethertype_filter_handle(dev, filter_op, arg);
-               break;
        case RTE_ETH_FILTER_SYN:
                ret = ixgbe_syn_filter_handle(dev, filter_op, arg);
                break;
index 2e1646fe89da71afc82a926fabee4f0dd84dec44..4d31db09fd5103aed4c9c37ea8749034f1a280ca 100644 (file)
@@ -1561,7 +1561,6 @@ int qede_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
 
                *(const void **)arg = &qede_flow_ops;
                return 0;
-       case RTE_ETH_FILTER_ETHERTYPE:
        case RTE_ETH_FILTER_FLEXIBLE:
        case RTE_ETH_FILTER_SYN:
        case RTE_ETH_FILTER_HASH:
index a0059a8975b8c302a1ef08160bb41f7c2b006f51..b9ed075c6424afff0812c25e9cfe8ecfd7074717 100644 (file)
@@ -1755,9 +1755,6 @@ sfc_dev_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type,
        case RTE_ETH_FILTER_NONE:
                sfc_err(sa, "Global filters configuration not supported");
                break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               sfc_err(sa, "EtherType filters not supported");
-               break;
        case RTE_ETH_FILTER_FLEXIBLE:
                sfc_err(sa, "Flexible filters not supported");
                break;
index a3d49e0913d8e630ac4dbe8a2d2101ddd9786397..5690f8111a0deeb5d001fc2186b5aac5c2222c91 100644 (file)
@@ -56,25 +56,6 @@ enum rte_filter_op {
        RTE_ETH_FILTER_OP_MAX
 };
 
-/**
- * Define all structures for Ethertype Filter type.
- */
-
-#define RTE_ETHTYPE_FLAGS_MAC    0x0001 /**< If set, compare mac */
-#define RTE_ETHTYPE_FLAGS_DROP   0x0002 /**< If set, drop packet when match */
-
-/**
- * A structure used to define the ethertype filter entry
- * to support RTE_ETH_FILTER_ETHERTYPE with RTE_ETH_FILTER_ADD,
- * RTE_ETH_FILTER_DELETE and RTE_ETH_FILTER_GET operations.
- */
-struct rte_eth_ethertype_filter {
-       struct rte_ether_addr mac_addr;   /**< Mac address to match. */
-       uint16_t ether_type;          /**< Ether type to match */
-       uint16_t flags;               /**< Flags from RTE_ETHTYPE_FLAGS_* */
-       uint16_t queue;               /**< Queue assigned to when match*/
-};
-
 #define RTE_FLEX_FILTER_MAXLEN 128     /**< bytes to use in flex filter. */
 #define RTE_FLEX_FILTER_MASK_SIZE      \
        (RTE_ALIGN(RTE_FLEX_FILTER_MAXLEN, CHAR_BIT) / CHAR_BIT)
index c63b9f7eb71b3c5dbf2b79888828c1bc2cf43f28..67a83dacc7a320e4c7d1ae967a1c87975293aad6 100644 (file)
@@ -1342,6 +1342,29 @@ int
 rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue,
                                  uint32_t direction);
 
+
+/*
+ * Legacy ethdev API used internally by drivers.
+ */
+
+/**
+ * Define all structures for Ethertype Filter type.
+ */
+
+#define RTE_ETHTYPE_FLAGS_MAC    0x0001 /**< If set, compare mac */
+#define RTE_ETHTYPE_FLAGS_DROP   0x0002 /**< If set, drop packet when match */
+
+/**
+ * A structure used to define the ethertype filter entry
+ * to support RTE_ETH_FILTER_ETHERTYPE data representation.
+ */
+struct rte_eth_ethertype_filter {
+       struct rte_ether_addr mac_addr;   /**< Mac address to match. */
+       uint16_t ether_type;          /**< Ether type to match */
+       uint16_t flags;               /**< Flags from RTE_ETHTYPE_FLAGS_* */
+       uint16_t queue;               /**< Queue assigned to when match*/
+};
+
 #ifdef __cplusplus
 }
 #endif