examples/l3fwd-power: add --parse-ptype option

To support those devices that do not provide packet type info when
receiving packets, add a new option, --parse-ptype, to analyze
packet type in the Rx callback.

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
Tested-by: Lei Yao <lei.a.yao@intel.com>

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index b65d683..e741434 100644 (file)
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -164,6 +164,8 @@ static uint32_t enabled_port_mask = 0;
 static int promiscuous_on = 0;
 /* NUMA is enabled by default. */
 static int numa_on = 1;
+static int parse_ptype; /**< Parse packet type using rx callback, and */
+                       /**< disabled by default */
 
 enum freq_scale_hint_t
 {
@@ -606,6 +608,48 @@ get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint8_t portid,
 }
 #endif
 
+static inline void
+parse_ptype_one(struct rte_mbuf *m)
+{
+       struct ether_hdr *eth_hdr;
+       uint32_t packet_type = RTE_PTYPE_UNKNOWN;
+       uint16_t ether_type;
+
+       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       ether_type = eth_hdr->ether_type;
+       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+               packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+       else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv6))
+               packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+
+       m->packet_type = packet_type;
+}
+
+static uint16_t
+cb_parse_ptype(uint8_t port __rte_unused, uint16_t queue __rte_unused,
+              struct rte_mbuf *pkts[], uint16_t nb_pkts,
+              uint16_t max_pkts __rte_unused,
+              void *user_param __rte_unused)
+{
+       unsigned int i;
+
+       for (i = 0; i < nb_pkts; ++i)
+               parse_ptype_one(pkts[i]);
+
+       return nb_pkts;
+}
+
+static int
+add_cb_parse_ptype(uint8_t portid, uint16_t queueid)
+{
+       printf("Port %d: softly parse packet type info\n", portid);
+       if (rte_eth_add_rx_callback(portid, queueid, cb_parse_ptype, NULL))
+               return 0;
+
+       printf("Failed to add rx callback: port=%d\n", portid);
+       return -1;
+}
+
 static inline void
 l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,
                                struct lcore_conf *qconf)
@@ -1108,7 +1152,8 @@ print_usage(const char *prgname)
                "  --config (port,queue,lcore): rx queues configuration\n"
                "  --no-numa: optional, disable numa awareness\n"
                "  --enable-jumbo: enable jumbo frame"
-               " which max packet len is PKTLEN in decimal (64-9600)\n",
+               " which max packet len is PKTLEN in decimal (64-9600)\n"
+               "  --parse-ptype: parse packet type by software\n",
                prgname);
 }
 
@@ -1202,6 +1247,8 @@ parse_config(const char *q_arg)
        return 0;
 }
 
+#define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+
 /* Parse the argument given in the command line of the application */
 static int
 parse_args(int argc, char **argv)
@@ -1214,6 +1261,7 @@ parse_args(int argc, char **argv)
                {"config", 1, 0, 0},
                {"no-numa", 0, 0, 0},
                {"enable-jumbo", 0, 0, 0},
+               {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0},
                {NULL, 0, 0, 0}
        };
 
@@ -1284,6 +1332,13 @@ parse_args(int argc, char **argv)
                                (unsigned int)port_conf.rxmode.max_rx_pkt_len);
                        }
 
+                       if (!strncmp(lgopts[option_index].name,
+                                    CMD_LINE_OPT_PARSE_PTYPE,
+                                    sizeof(CMD_LINE_OPT_PARSE_PTYPE))) {
+                               printf("soft parse-ptype is enabled\n");
+                               parse_ptype = 1;
+                       }
+
                        break;
 
                default:
@@ -1531,6 +1586,50 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
        }
 }
 
+static int check_ptype(uint8_t portid)
+{
+       int i, ret;
+       int ptype_l3_ipv4 = 0;
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
+       int ptype_l3_ipv6 = 0;
+#endif
+       uint32_t ptype_mask = RTE_PTYPE_L3_MASK;
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, NULL, 0);
+       if (ret <= 0)
+               return 0;
+
+       uint32_t ptypes[ret];
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, ptypes, ret);
+       for (i = 0; i < ret; ++i) {
+               if (ptypes[i] & RTE_PTYPE_L3_IPV4)
+                       ptype_l3_ipv4 = 1;
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
+               if (ptypes[i] & RTE_PTYPE_L3_IPV6)
+                       ptype_l3_ipv6 = 1;
+#endif
+       }
+
+       if (ptype_l3_ipv4 == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid);
+
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
+       if (ptype_l3_ipv6 == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid);
+#endif
+
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
+       if (ptype_l3_ipv4)
+#else /* APP_LOOKUP_EXACT_MATCH */
+       if (ptype_l3_ipv4 && ptype_l3_ipv6)
+#endif
+               return 1;
+
+       return 0;
+
+}
+
 int
 main(int argc, char **argv)
 {
@@ -1716,6 +1815,14 @@ main(int argc, char **argv)
                                rte_exit(EXIT_FAILURE,
                                        "rte_eth_rx_queue_setup: err=%d, "
                                                "port=%d\n", ret, portid);
+
+                       if (parse_ptype) {
+                               if (add_cb_parse_ptype(portid, queueid) < 0)
+                                       rte_exit(EXIT_FAILURE,
+                                                "Fail to add ptype cb\n");
+                       } else if (!check_ptype(portid))
+                               rte_exit(EXIT_FAILURE,
+                                        "PMD can not provide needed ptypes\n");
                }
        }