d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethdev: add IP in GRE tunnel

Browse Source 
Signed-off-by: Xutao Sun <xutao.sun@intel.com>
Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
This commit is contained in:
Xutao Sun 2016-03-10 11:06:00 +08:00 committed by Thomas Monjalon
parent dd76f93c2d
commit 7b1312891b
3 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/test-pmd/cmdline.c
View File

@ -298,11 +298,13 @@ static void cmd_help_long_parsed(void *parsed_result,
"filtered for VF(s) from port_id.\n\n"
"tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) "
"(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n"
"(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|"
"imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)\n"
" add a tunnel filter of a port.\n\n"
"tunnel_filter rm (port_id) (outer_mac) (inner_mac) (ip_addr) "
"(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n"
"(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|"
"imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)\n"
" remove a tunnel filter of a port.\n\n"
"rx_vxlan_port add (udp_port) (port_id)\n"
@ -6669,18 +6671,22 @@ cmd_tunnel_filter_parsed(void *parsed_result,
struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
int ret = 0;
memset(&tunnel_filter_conf, 0, sizeof(tunnel_filter_conf));
ether_addr_copy(&res->outer_mac, &tunnel_filter_conf.outer_mac);
ether_addr_copy(&res->inner_mac, &tunnel_filter_conf.inner_mac);
tunnel_filter_conf.inner_vlan = res->inner_vlan;
if (res->ip_value.family == AF_INET) {
tunnel_filter_conf.ip_addr.ipv4_addr =
res->ip_value.addr.ipv4.s_addr;
rte_be_to_cpu_32(res->ip_value.addr.ipv4.s_addr);
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV4;
} else {
memcpy(&(tunnel_filter_conf.ip_addr.ipv6_addr),
&(res->ip_value.addr.ipv6),
sizeof(struct in6_addr));
int i;
for (i = 0; i < 4; i++) {
tunnel_filter_conf.ip_addr.ipv6_addr[i] =
rte_be_to_cpu_32(res->ip_value.addr.ipv6.s6_addr32[i]);
}
tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV6;
}
@ -6696,6 +6702,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
else if (!strcmp(res->filter_type, "omac-imac-tenid"))
tunnel_filter_conf.filter_type =
RTE_TUNNEL_FILTER_OMAC_TENID_IMAC;
else if (!strcmp(res->filter_type, "oip"))
tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_OIP;
else if (!strcmp(res->filter_type, "iip"))
tunnel_filter_conf.filter_type = ETH_TUNNEL_FILTER_IIP;
else {
printf("The filter type is not supported");
return;
@ -6705,6 +6715,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN;
else if (!strcmp(res->tunnel_type, "nvgre"))
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_NVGRE;
else if (!strcmp(res->tunnel_type, "ipingre"))
tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_IP_IN_GRE;
else {
printf("The tunnel type %s not supported.\n", res->tunnel_type);
return;
@ -6750,11 +6762,11 @@ cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
ip_value);
cmdline_parse_token_string_t cmd_tunnel_filter_tunnel_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
tunnel_type, "vxlan#nvgre");
tunnel_type, "vxlan#nvgre#ipingre");
cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
TOKEN_STRING_INITIALIZER(struct cmd_tunnel_filter_result,
filter_type, "imac-ivlan#imac-ivlan-tenid#imac-tenid#"
filter_type, "oip#iip#imac-ivlan#imac-ivlan-tenid#imac-tenid#"
"imac#omac-imac-tenid");
cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
@ -6768,8 +6780,8 @@ cmdline_parse_inst_t cmd_tunnel_filter = {
.data = (void *)0,
.help_str = "add/rm tunnel filter of a port: "
"tunnel_filter add port_id outer_mac inner_mac ip "
"inner_vlan tunnel_type(vxlan|nvgre) filter_type "
"(imac-ivlan|imac-ivlan-tenid|imac-tenid|"
"inner_vlan tunnel_type(vxlan|nvgre|ipingre) filter_type "
"(oip|iip|imac-ivlan|imac-ivlan-tenid|imac-tenid|"
"imac|omac-imac-tenid) "
"tenant_id queue_num",
.tokens = {

35
doc/guides/testpmd_app_ug/testpmd_funcs.rst
View File

@ -546,7 +546,37 @@ tunnel_filter add
Add a tunnel filter on a port::
testpmd> tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) \
(inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)
(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|\
imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)
The available information categories are:
* ``vxlan``: Set tunnel type as VXLAN.
* ``nvgre``: Set tunnel type as NVGRE.
* ``ipingre``: Set tunnel type as IP-in-GRE.
* ``imac-ivlan``: Set filter type as Inner MAC and VLAN.
* ``imac-ivlan-tenid``: Set filter type as Inner MAC, VLAN and tenant ID.
* ``imac-tenid``: Set filter type as Inner MAC and tenant ID.
* ``imac``: Set filter type as Inner MAC.
* ``omac-imac-tenid``: Set filter type as Outer MAC, Inner MAC and tenant ID.
* ``oip``: Set filter type as Outer IP.
* ``iip``: Set filter type as Inner IP.
Example::
testpmd> tunnel_filter add 0 68:05:CA:28:09:82 00:00:00:00:00:00 \
192.168.2.2 0 ipingre oip 1 1
Set an IP-in-GRE tunnel on port 0, and the filter type is Outer IP.
tunnel_filter remove
~~~~~~~~~~~~~~~~~~~~
@ -554,7 +584,8 @@ tunnel_filter remove
Remove a tunnel filter on a port::
testpmd> tunnel_filter rm (port_id) (outer_mac) (inner_mac) (ip_addr) \
(inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)
(inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|\
imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id) (queue_id)
rx_vxlan_port add
~~~~~~~~~~~~~~~~~

1
lib/librte_ether/rte_eth_ctrl.h
View File

@ -245,6 +245,7 @@ enum rte_eth_tunnel_type {
RTE_TUNNEL_TYPE_GENEVE,
RTE_TUNNEL_TYPE_TEREDO,
RTE_TUNNEL_TYPE_NVGRE,
RTE_TUNNEL_TYPE_IP_IN_GRE,
RTE_L2_TUNNEL_TYPE_E_TAG,
RTE_TUNNEL_TYPE_MAX,
};