net/i40e: configure packet type mapping
authorQi Zhang <qi.z.zhang@intel.com>
Wed, 12 Apr 2017 13:55:33 +0000 (09:55 -0400)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 19 Apr 2017 13:37:37 +0000 (15:37 +0200)
The patch adds 4 APIs to support configurable
PTYPE mapping for i40e device.
rte_pmd_i40e_ptype_mapping_get.
rte_pmd_i40e_ptype_mapping_replace.
rte_pmd_i40e_ptype_mapping_reset.
rte_pmd_i40e_ptype_mapping_update.
The mapping from hardware defined packet type to software defined packet
type can be updated/reset/read out with these APIs.
Also a software ptype with the most significent bit set will be regarded
as a user defined ptype (RTE_PMD_I40E_PTYPE_USER_DEFINE_MASK) so
application can use it to defined its own PTYPE naming system.

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Jianbo Liu <jianbo.liu@linaro.org>
Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com>
drivers/net/i40e/rte_pmd_i40e.c
drivers/net/i40e/rte_pmd_i40e.h
drivers/net/i40e/rte_pmd_i40e_version.map

index cee067b..f7ce62b 100644 (file)
@@ -37,6 +37,7 @@
 #include "base/i40e_prototype.h"
 #include "i40e_ethdev.h"
 #include "i40e_pf.h"
+#include "i40e_rxtx.h"
 #include "rte_pmd_i40e.h"
 
 /* The max bandwidth of i40e is 40Gbps. */
@@ -1705,3 +1706,232 @@ rte_pmd_i40e_get_ddp_list(uint8_t port, uint8_t *buff, uint32_t size)
 
        return status;
 }
+
+static int check_invalid_pkt_type(uint32_t pkt_type)
+{
+       uint32_t l2, l3, l4, tnl, il2, il3, il4;
+
+       l2 = pkt_type & RTE_PTYPE_L2_MASK;
+       l3 = pkt_type & RTE_PTYPE_L3_MASK;
+       l4 = pkt_type & RTE_PTYPE_L4_MASK;
+       tnl = pkt_type & RTE_PTYPE_TUNNEL_MASK;
+       il2 = pkt_type & RTE_PTYPE_INNER_L2_MASK;
+       il3 = pkt_type & RTE_PTYPE_INNER_L3_MASK;
+       il4 = pkt_type & RTE_PTYPE_INNER_L4_MASK;
+
+       if (l2 &&
+           l2 != RTE_PTYPE_L2_ETHER &&
+           l2 != RTE_PTYPE_L2_ETHER_TIMESYNC &&
+           l2 != RTE_PTYPE_L2_ETHER_ARP &&
+           l2 != RTE_PTYPE_L2_ETHER_LLDP &&
+           l2 != RTE_PTYPE_L2_ETHER_NSH &&
+           l2 != RTE_PTYPE_L2_ETHER_VLAN &&
+           l2 != RTE_PTYPE_L2_ETHER_QINQ)
+               return -1;
+
+       if (l3 &&
+           l3 != RTE_PTYPE_L3_IPV4 &&
+           l3 != RTE_PTYPE_L3_IPV4_EXT &&
+           l3 != RTE_PTYPE_L3_IPV6 &&
+           l3 != RTE_PTYPE_L3_IPV4_EXT_UNKNOWN &&
+           l3 != RTE_PTYPE_L3_IPV6_EXT &&
+           l3 != RTE_PTYPE_L3_IPV6_EXT_UNKNOWN)
+               return -1;
+
+       if (l4 &&
+           l4 != RTE_PTYPE_L4_TCP &&
+           l4 != RTE_PTYPE_L4_UDP &&
+           l4 != RTE_PTYPE_L4_FRAG &&
+           l4 != RTE_PTYPE_L4_SCTP &&
+           l4 != RTE_PTYPE_L4_ICMP &&
+           l4 != RTE_PTYPE_L4_NONFRAG)
+               return -1;
+
+       if (tnl &&
+           tnl != RTE_PTYPE_TUNNEL_IP &&
+           tnl != RTE_PTYPE_TUNNEL_GRENAT &&
+           tnl != RTE_PTYPE_TUNNEL_VXLAN &&
+           tnl != RTE_PTYPE_TUNNEL_NVGRE &&
+           tnl != RTE_PTYPE_TUNNEL_GENEVE &&
+           tnl != RTE_PTYPE_TUNNEL_GRENAT)
+               return -1;
+
+       if (il2 &&
+           il2 != RTE_PTYPE_INNER_L2_ETHER &&
+           il2 != RTE_PTYPE_INNER_L2_ETHER_VLAN &&
+           il2 != RTE_PTYPE_INNER_L2_ETHER_QINQ)
+               return -1;
+
+       if (il3 &&
+           il3 != RTE_PTYPE_INNER_L3_IPV4 &&
+           il3 != RTE_PTYPE_INNER_L3_IPV4_EXT &&
+           il3 != RTE_PTYPE_INNER_L3_IPV6 &&
+           il3 != RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN &&
+           il3 != RTE_PTYPE_INNER_L3_IPV6_EXT &&
+           il3 != RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN)
+               return -1;
+
+       if (il4 &&
+           il4 != RTE_PTYPE_INNER_L4_TCP &&
+           il4 != RTE_PTYPE_INNER_L4_UDP &&
+           il4 != RTE_PTYPE_INNER_L4_FRAG &&
+           il4 != RTE_PTYPE_INNER_L4_SCTP &&
+           il4 != RTE_PTYPE_INNER_L4_ICMP &&
+           il4 != RTE_PTYPE_INNER_L4_NONFRAG)
+               return -1;
+
+       return 0;
+}
+
+static int check_invalid_ptype_mapping(
+               struct rte_pmd_i40e_ptype_mapping *mapping_table,
+               uint16_t count)
+{
+       int i;
+
+       for (i = 0; i < count; i++) {
+               uint16_t ptype = mapping_table[i].hw_ptype;
+               uint32_t pkt_type = mapping_table[i].sw_ptype;
+
+               if (ptype >= I40E_MAX_PKT_TYPE)
+                       return -1;
+
+               if (pkt_type == RTE_PTYPE_UNKNOWN)
+                       continue;
+
+               if (pkt_type & RTE_PMD_I40E_PTYPE_USER_DEFINE_MASK)
+                       continue;
+
+               if (check_invalid_pkt_type(pkt_type))
+                       return -1;
+       }
+
+       return 0;
+}
+
+int
+rte_pmd_i40e_ptype_mapping_update(
+                       uint8_t port,
+                       struct rte_pmd_i40e_ptype_mapping *mapping_items,
+                       uint16_t count,
+                       uint8_t exclusive)
+{
+       struct rte_eth_dev *dev;
+       struct i40e_adapter *ad;
+       int i;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+       dev = &rte_eth_devices[port];
+
+       if (!is_i40e_supported(dev))
+               return -ENOTSUP;
+
+       if (count > I40E_MAX_PKT_TYPE)
+               return -EINVAL;
+
+       if (check_invalid_ptype_mapping(mapping_items, count))
+               return -EINVAL;
+
+       ad = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+       if (exclusive) {
+               for (i = 0; i < I40E_MAX_PKT_TYPE; i++)
+                       ad->ptype_tbl[i] = RTE_PTYPE_UNKNOWN;
+       }
+
+       for (i = 0; i < count; i++)
+               ad->ptype_tbl[mapping_items[i].hw_ptype]
+                       = mapping_items[i].sw_ptype;
+
+       return 0;
+}
+
+int rte_pmd_i40e_ptype_mapping_reset(uint8_t port)
+{
+       struct rte_eth_dev *dev;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+       dev = &rte_eth_devices[port];
+
+       if (!is_i40e_supported(dev))
+               return -ENOTSUP;
+
+       i40e_set_default_ptype_table(dev);
+
+       return 0;
+}
+
+int rte_pmd_i40e_ptype_mapping_get(
+                       uint8_t port,
+                       struct rte_pmd_i40e_ptype_mapping *mapping_items,
+                       uint16_t size,
+                       uint16_t *count,
+                       uint8_t valid_only)
+{
+       struct rte_eth_dev *dev;
+       struct i40e_adapter *ad;
+       int n = 0;
+       uint16_t i;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+       dev = &rte_eth_devices[port];
+
+       if (!is_i40e_supported(dev))
+               return -ENOTSUP;
+
+       ad = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+       for (i = 0; i < I40E_MAX_PKT_TYPE; i++) {
+               if (n >= size)
+                       break;
+               if (valid_only && ad->ptype_tbl[i] == RTE_PTYPE_UNKNOWN)
+                       continue;
+               mapping_items[n].hw_ptype = i;
+               mapping_items[n].sw_ptype = ad->ptype_tbl[i];
+               n++;
+       }
+
+       *count = n;
+       return 0;
+}
+
+int rte_pmd_i40e_ptype_mapping_replace(uint8_t port,
+                                      uint32_t target,
+                                      uint8_t mask,
+                                      uint32_t pkt_type)
+{
+       struct rte_eth_dev *dev;
+       struct i40e_adapter *ad;
+       uint16_t i;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+       dev = &rte_eth_devices[port];
+
+       if (!is_i40e_supported(dev))
+               return -ENOTSUP;
+
+       if (!mask && check_invalid_pkt_type(target))
+               return -EINVAL;
+
+       if (check_invalid_pkt_type(pkt_type))
+               return -EINVAL;
+
+       ad = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+       for (i = 0; i < I40E_MAX_PKT_TYPE; i++) {
+               if (mask) {
+                       if ((target | ad->ptype_tbl[i]) == target &&
+                           (target & ad->ptype_tbl[i]))
+                               ad->ptype_tbl[i] = pkt_type;
+               } else {
+                       if (ad->ptype_tbl[i] == target)
+                               ad->ptype_tbl[i] = pkt_type;
+               }
+       }
+
+       return 0;
+}
index 22a5c64..1efb2c4 100644 (file)
@@ -106,6 +106,18 @@ struct rte_pmd_i40e_profile_list {
        struct rte_pmd_i40e_profile_info p_info[1];
 };
 
+/**
+ * ptype mapping table only accept RTE_PTYPE_XXX or "user defined" ptype.
+ * A ptype with MSB set will be regarded as a user defined ptype.
+ * Below macro help to create a user defined ptype.
+ */
+#define RTE_PMD_I40E_PTYPE_USER_DEFINE_MASK 0x80000000
+
+struct rte_pmd_i40e_ptype_mapping {
+       uint16_t hw_ptype; /**< hardware defined packet type*/
+       uint32_t sw_ptype; /**< software defined packet type */
+};
+
 /**
  * Notify VF when PF link status changes.
  *
@@ -501,4 +513,78 @@ int rte_pmd_i40e_process_ddp_package(uint8_t port, uint8_t *buff,
  */
 int rte_pmd_i40e_get_ddp_list(uint8_t port, uint8_t *buff, uint32_t size);
 
+/**
+ * Update hardware defined ptype to software defined packet type
+ * mapping table.
+ *
+ * @param port
+ *    pointer to port identifier of the device.
+ * @param mapping_items
+ *    the base address of the mapping items array.
+ * @param count
+ *    number of mapping items.
+ * @param exclusive
+ *    the flag indicate different ptype mapping update method.
+ *    -(0) only overwrite referred PTYPE mapping,
+ *     keep other PTYPEs mapping unchanged.
+ *    -(!0) overwrite referred PTYPE mapping,
+ *     set other PTYPEs maps to PTYPE_UNKNOWN.
+ */
+int rte_pmd_i40e_ptype_mapping_update(
+                       uint8_t port,
+                       struct rte_pmd_i40e_ptype_mapping *mapping_items,
+                       uint16_t count,
+                       uint8_t exclusive);
+
+/**
+ * Reset hardware defined ptype to software defined ptype
+ * mapping table to default.
+ *
+ * @param port
+ *    pointer to port identifier of the device
+ */
+int rte_pmd_i40e_ptype_mapping_reset(uint8_t port);
+
+/**
+ * Get hardware defined ptype to software defined ptype
+ * mapping items.
+ *
+ * @param port
+ *    pointer to port identifier of the device.
+ * @param mapping_items
+ *    the base address of the array to store returned items.
+ * @param size
+ *    the size of the input array.
+ * @param count
+ *    the place to store the number of returned items.
+ * @param valid_only
+ *    -(0) return full mapping table.
+ *    -(!0) only return mapping items which packet_type != RTE_PTYPE_UNKNOWN.
+ */
+int rte_pmd_i40e_ptype_mapping_get(
+                       uint8_t port,
+                       struct rte_pmd_i40e_ptype_mapping *mapping_items,
+                       uint16_t size,
+                       uint16_t *count,
+                       uint8_t valid_only);
+
+/**
+ * Replace a specific or a group of software defined ptypes
+ * with a new one
+ *
+ * @param port
+ *    pointer to port identifier of the device
+ * @param target
+ *    the packet type to be replaced
+ * @param mask
+ *    -(0) target represent a specific software defined ptype.
+ *    -(!0) target is a mask to represent a group of software defined ptypes.
+ * @param pkt_type
+ *    the new packet type to overwrite
+ */
+int rte_pmd_i40e_ptype_mapping_replace(uint8_t port,
+                                      uint32_t target,
+                                      uint8_t mask,
+                                      uint32_t pkt_type);
+
 #endif /* _PMD_I40E_H_ */
index dbb994e..3b0e805 100644 (file)
@@ -8,6 +8,10 @@ DPDK_17.02 {
 
        rte_pmd_i40e_get_vf_stats;
        rte_pmd_i40e_ping_vfs;
+       rte_pmd_i40e_ptype_mapping_get;
+       rte_pmd_i40e_ptype_mapping_replace;
+       rte_pmd_i40e_ptype_mapping_reset;
+       rte_pmd_i40e_ptype_mapping_update;
        rte_pmd_i40e_reset_vf_stats;
        rte_pmd_i40e_set_tx_loopback;
        rte_pmd_i40e_set_vf_broadcast;