examples/tep_term: add tunnel filter type configuration

Add the filter types for VXLAN packet.

The following filter type are added here.

  - Inner MAC&VLAN and tenant ID

  - Inner MAC and tenent ID, and Outer MAC

  - Inner MAC and tenant ID

Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>

diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c
index df40e1e..69d73d6 100644 (file)
--- a/examples/tep_termination/main.c
+++ b/examples/tep_termination/main.c
@@ -113,6 +113,7 @@
 
 #define CMD_LINE_OPT_NB_DEVICES "nb-devices"
 #define CMD_LINE_OPT_UDP_PORT "udp-port"
+#define CMD_LINE_OPT_FILTER_TYPE "filter-type"
 #define CMD_LINE_OPT_RX_RETRY "rx-retry"
 #define CMD_LINE_OPT_RX_RETRY_DELAY "rx-retry-delay"
 #define CMD_LINE_OPT_RX_RETRY_NUM "rx-retry-num"
@@ -140,6 +141,9 @@ struct vpool {
 /* UDP tunneling port */
 uint16_t udp_port = 4789;
 
+/* RX filter type for tunneling packet */
+uint8_t filter_idx = 1;
+
 /* overlay packet operation */
 struct ol_switch_ops overlay_options = {
        .port_configure = vxlan_port_init,
@@ -256,6 +260,10 @@ tep_termination_usage(const char *prgname)
        RTE_LOG(INFO, VHOST_CONFIG, "%s [EAL options] -- -p PORTMASK\n"
        "               --udp-port: UDP destination port for VXLAN packet\n"
        "               --nb-devices[1-64]: The number of virtIO device\n"
+       "               --filter-type[1-3]: filter type for tunneling packet\n"
+       "                   1: Inner MAC and tenent ID\n"
+       "                   2: Inner MAC and VLAN, and tenent ID\n"
+       "                   3: Outer MAC, Inner MAC and tenent ID\n"
        "               -p PORTMASK: Set mask for ports to be used by application\n"
        "               --rx-retry [0|1]: disable/enable(default) retries on rx."
        "                Enable retry if destintation queue is full\n"
@@ -281,6 +289,7 @@ tep_termination_parse_args(int argc, char **argv)
        static struct option long_option[] = {
                {CMD_LINE_OPT_NB_DEVICES, required_argument, NULL, 0},
                {CMD_LINE_OPT_UDP_PORT, required_argument, NULL, 0},
+               {CMD_LINE_OPT_FILTER_TYPE, required_argument, NULL, 0},
                {CMD_LINE_OPT_RX_RETRY, required_argument, NULL, 0},
                {CMD_LINE_OPT_RX_RETRY_DELAY, required_argument, NULL, 0},
                {CMD_LINE_OPT_RX_RETRY_NUM, required_argument, NULL, 0},
@@ -373,6 +382,19 @@ tep_termination_parse_args(int argc, char **argv)
                                        burst_rx_retry_num = ret;
                        }
 
+                       if (!strncmp(long_option[option_index].name,
+                                       CMD_LINE_OPT_FILTER_TYPE,
+                                       sizeof(CMD_LINE_OPT_FILTER_TYPE))) {
+                               ret = parse_num_opt(optarg, 3);
+                               if ((ret == -1) || (ret == 0)) {
+                                       RTE_LOG(INFO, VHOST_CONFIG,
+                                               "Invalid argument for filter type [1-3]\n");
+                                       tep_termination_usage(prgname);
+                                       return -1;
+                               } else
+                                       filter_idx = ret - 1;
+                       }
+
                        /* Enable/disable stats. */
                        if (!strncmp(long_option[option_index].name,
                                CMD_LINE_OPT_STATS,

diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c
index 54d7984..942fc06 100644 (file)
--- a/examples/tep_termination/vxlan_setup.c
+++ b/examples/tep_termination/vxlan_setup.c
@@ -71,6 +71,9 @@
 #define RTE_TEST_RX_DESC_DEFAULT 1024
 #define RTE_TEST_TX_DESC_DEFAULT 512
 
+/* Default inner VLAN ID */
+#define INNER_VLAN_ID 100
+
 /* VXLAN device */
 struct vxlan_conf vxdev;
 
@@ -86,6 +89,11 @@ uint8_t vxlan_overlay_ips[2][4] = { {192, 168, 10, 1}, {192, 168, 30, 1} };
 /* Remote VTEP MAC address */
 uint8_t peer_mac[6] = {0x00, 0x11, 0x01, 0x00, 0x00, 0x01};
 
+/* VXLAN RX filter type */
+uint8_t tep_filter_type[] = {RTE_TUNNEL_FILTER_IMAC_TENID,
+                       RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID,
+                       RTE_TUNNEL_FILTER_OMAC_TENID_IMAC,};
+
 /* Options for configuring ethernet port */
 static const struct rte_eth_conf port_conf = {
        .rxmode = {
@@ -220,12 +228,14 @@ vxlan_tx_process(uint8_t queue_id, struct rte_mbuf *pkt)
 int
 vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 {
-       int i;
+       int i, ret;
        struct ether_hdr *pkt_hdr;
        struct virtio_net *dev = vdev->dev;
        uint64_t portid = dev->device_fh;
        struct ipv4_hdr *ip;
 
+       struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
+
        if (unlikely(portid > VXLAN_N_PORTS)) {
                RTE_LOG(INFO, VHOST_DATA,
                        "(%"PRIu64") WARNING: Not configuring device,"
@@ -251,6 +261,34 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
                vxdev.port[portid].peer_mac.addr_bytes[i] = peer_mac[i];
        }
 
+       memset(&tunnel_filter_conf, 0,
+               sizeof(struct rte_eth_tunnel_filter_conf));
+
+       tunnel_filter_conf.outer_mac = &ports_eth_addr[0];
+       tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
+
+       /* inner MAC */
+       tunnel_filter_conf.inner_mac = &vdev->mac_address;
+
+       tunnel_filter_conf.queue_id = vdev->rx_q;
+       tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
+
+       if (tep_filter_type[filter_idx] == RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID)
+               tunnel_filter_conf.inner_vlan = INNER_VLAN_ID;
+
+       tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+
+       ret = rte_eth_dev_filter_ctrl(ports[0],
+               RTE_ETH_FILTER_TUNNEL,
+               RTE_ETH_FILTER_ADD,
+               &tunnel_filter_conf);
+       if (ret) {
+               RTE_LOG(ERR, VHOST_DATA,
+                       "%d Failed to add device MAC address to cloud filter\n",
+               vdev->rx_q);
+               return -1;
+       }
+
        /* Print out inner MAC and VNI info. */
        RTE_LOG(INFO, VHOST_DATA,
                "(%d) MAC_ADDRESS %02x:%02x:%02x:%02x:%02x:%02x and VNI %d registered\n",
@@ -306,9 +344,36 @@ void
 vxlan_unlink(struct vhost_dev *vdev)
 {
        unsigned i = 0, rx_count;
+       int ret;
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
+       struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
 
        if (vdev->ready == DEVICE_RX) {
+               memset(&tunnel_filter_conf, 0,
+                       sizeof(struct rte_eth_tunnel_filter_conf));
+
+               tunnel_filter_conf.outer_mac = &ports_eth_addr[0];
+               tunnel_filter_conf.inner_mac = &vdev->mac_address;
+               tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
+               tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
+
+               if (tep_filter_type[filter_idx] ==
+                       RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID)
+                       tunnel_filter_conf.inner_vlan = INNER_VLAN_ID;
+
+               tunnel_filter_conf.queue_id = vdev->rx_q;
+               tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
+
+               ret = rte_eth_dev_filter_ctrl(ports[0],
+                               RTE_ETH_FILTER_TUNNEL,
+                               RTE_ETH_FILTER_DELETE,
+                               &tunnel_filter_conf);
+               if (ret) {
+                       RTE_LOG(ERR, VHOST_DATA,
+                               "%d Failed to add device MAC address to cloud filter\n",
+                               vdev->rx_q);
+                       return;
+               }
                for (i = 0; i < ETHER_ADDR_LEN; i++)
                        vdev->mac_address.addr_bytes[i] = 0;
 

diff --git a/examples/tep_termination/vxlan_setup.h b/examples/tep_termination/vxlan_setup.h
index d5d1b9d..96442e2 100644 (file)
--- a/examples/tep_termination/vxlan_setup.h
+++ b/examples/tep_termination/vxlan_setup.h
@@ -36,6 +36,7 @@
 
 extern uint16_t nb_devices;
 extern uint16_t udp_port;
+extern uint8_t filter_idx;
 extern uint8_t ports[RTE_MAX_ETHPORTS];
 extern struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];