From patchwork Thu Apr 16 03:55:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 4326 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id EBBD2C3CA; Thu, 16 Apr 2015 05:56:24 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 2D95BC3A2 for ; Thu, 16 Apr 2015 05:56:22 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 15 Apr 2015 20:56:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,585,1422950400"; d="scan'208";a="696060380" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 15 Apr 2015 20:56:20 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t3G3uJSL005217; Thu, 16 Apr 2015 11:56:19 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t3G3uFpd029103; Thu, 16 Apr 2015 11:56:17 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t3G3uFkn029096; Thu, 16 Apr 2015 11:56:15 +0800 From: Jijiang Liu To: dev@dpdk.org, walter.e.gilmore@intel.com, thomas.long@intel.com Date: Thu, 16 Apr 2015 11:55:55 +0800 Message-Id: <1429156558-28548-8-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1429156558-28548-1-git-send-email-jijiang.liu@intel.com> References: <1429156558-28548-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH RFC 07/10] examples/tep_termination:add tunnel filter type configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The follwoing filter types are supported for VXLAN, 1> Inner MAC&VLAN and tenent ID 2> Inner MAC and tenent ID, and Outer MAC 3> Inner MAC and tenent ID Signed-off-by: Jijiang Liu --- examples/tep_termination/main.c | 21 +++++++++++++ examples/tep_termination/vxlan_setup.c | 50 ++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index 68d1706..e8142e0 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -72,6 +72,9 @@ #define MAX_PKT_BURST 32 /* Max burst size for RX/TX */ #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */ +/* Defines how long we wait between retries on RX */ +#define BURST_RX_WAIT_US 15 + #define BURST_RX_RETRIES 4/* Number of retries on RX. */ #define JUMBO_FRAME_MAX_SIZE 0x2600 @@ -116,6 +119,9 @@ uint16_t num_devices; /* VXLAN UDP destination port */ uint16_t udp_port; +/* RX filter type for tunneling packet */ +uint8_t filter_idx; + /* overlay packet operation */ struct ol_switch_ops overlay_options = { .port_configure = vxlan_port_init, @@ -236,6 +242,10 @@ vep_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: number of virtIO device\n" + " --filter-type[1-3]: filter type for tunneling packet\n" + " 1: Inner MAC&VLAN and tenent ID\n" + " 2: Inner MAC and tenent ID\n" + " 3: Outer MAC, Inner MAC and tenent ID\n" " --dev-basename \n" " -p PORTMASK: Set mask for ports to be used by application\n" " --stats [0-N]: 0: Disable stats, N: Time in seconds to print stats\n" @@ -256,6 +266,7 @@ tep_parse_args(int argc, char **argv) static struct option long_option[] = { {"udp-port", required_argument, NULL, 0}, {"nb-devices", required_argument, NULL, 0}, + {"filter-type", required_argument, NULL, 0}, {"stats", required_argument, NULL, 0}, {"dev-basename", required_argument, NULL, 0}, {NULL, 0, 0, 0}, @@ -294,6 +305,16 @@ tep_parse_args(int argc, char **argv) return -1; } } + + if (!strncmp(long_option[option_index].name, "filter-type", MAX_LONG_OPT_SZ)) { + ret = parse_num_opt(optarg, 3); + if (ret == -1) { + RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for filter type [1-3]\n"); + vep_termination_usage(prgname); + return -1; + } else + filter_idx = ret - 1; + } /* Enable/disable stats. */ if (!strncmp(long_option[option_index].name, "stats", MAX_LONG_OPT_SZ)) { diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index fbffbc8..312a878 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -82,6 +82,7 @@ extern uint16_t num_devices; extern uint16_t udp_port; extern uint8_t ports[RTE_MAX_ETHPORTS]; +extern uint8_t filter_idx; /* ethernet addresses of ports */ extern struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; @@ -237,10 +238,12 @@ vxlan_rx_process(struct rte_mbuf *pkt) return -1; ret = decapsulation(pkt); + return ret; } -static int vxlan_tx_process(uint8_t vport_id, struct rte_mbuf *pkt) +static int +vxlan_tx_process(uint8_t vport_id, struct rte_mbuf *pkt) { int ret = 0; @@ -260,11 +263,12 @@ static int vxlan_tx_process(uint8_t vport_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_data_ll *dev_ll; struct virtio_net *dev = vdev->dev; uint64_t portid = dev->device_fh; + struct rte_eth_tunnel_filter_conf tunnel_filter_conf; dev_ll = ll_root_used; @@ -290,6 +294,28 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) vxdev.port[portid].peermac.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]; + 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", vdev->rx_q, @@ -341,8 +367,28 @@ vxlan_unlink(struct vhost_dev *vdev) int ret = 1; unsigned i = 0, rx_count; 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]; + + 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;