diff options
| -rw-r--r-- | vnet/Makefile.am | 10 | ||||
| -rw-r--r-- | vnet/vnet/devices/netmap/netmap.api | 74 | ||||
| -rw-r--r-- | vnet/vnet/devices/netmap/netmap_api.c | 137 | ||||
| -rw-r--r-- | vnet/vnet/vnet_all_api_h.h | 1 | ||||
| -rw-r--r-- | vpp-api/java/Makefile.am | 2 | ||||
| -rw-r--r-- | vpp/vpp-api/api.c | 41 | ||||
| -rw-r--r-- | vpp/vpp-api/vpe.api | 55 |
7 files changed, 222 insertions, 98 deletions
diff --git a/vnet/Makefile.am b/vnet/Makefile.am index f1ba40056eb..d0f4d9e7e90 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -18,6 +18,8 @@ AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@ BUILT_SOURCES = \ vnet/devices/af_packet/af_packet.api.h \ vnet/devices/af_packet/af_packet.api.json \ + vnet/devices/netmap/netmap.api.h \ + vnet/devices/netmap/netmap.api.json \ vnet/interface.api.h \ vnet/interface.api.json \ vnet/ip/ip.api.h \ @@ -787,11 +789,12 @@ libvnet_la_SOURCES += \ vnet/devices/netmap/netmap.c \ vnet/devices/netmap/device.c \ vnet/devices/netmap/node.c \ - vnet/devices/netmap/cli.c + vnet/devices/netmap/cli.c \ + vnet/devices/netmap/netmap_api.c nobase_include_HEADERS += \ - vnet/devices/netmap/netmap.h - + vnet/devices/netmap/netmap.h \ + vnet/devices/netmap/netmap.api.h ######################################## # Driver feature graph arc support @@ -943,6 +946,7 @@ apidir = $(prefix)/vnet api_DATA = \ vnet/devices/af_packet/af_packet.api.json \ + vnet/devices/netmap/netmap.api.json \ vnet/interface.api.json \ vnet/ip/ip.api.json \ vnet/l2/l2.api.json \ diff --git a/vnet/vnet/devices/netmap/netmap.api b/vnet/vnet/devices/netmap/netmap.api new file mode 100644 index 00000000000..377ccffda4c --- /dev/null +++ b/vnet/vnet/devices/netmap/netmap.api @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2015-2016 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** \brief Create netmap + @param client_index - opaque cookie to identify the sender + @param context - sender context, to match reply w/ request + @param netmap_if_name - interface name + @param hw_addr - interface MAC + @param use_random_hw_addr - use random generated MAC + @param is_pipe - is pipe + @param is_master - 0=slave, 1=master +*/ +define netmap_create +{ + u32 client_index; + u32 context; + + u8 netmap_if_name[64]; + u8 hw_addr[6]; + u8 use_random_hw_addr; + u8 is_pipe; + u8 is_master; +}; + +/** \brief Create netmap response + @param context - sender context, to match reply w/ request + @param retval - return value for request +*/ +define netmap_create_reply +{ + u32 context; + i32 retval; +}; + +/** \brief Delete netmap + @param client_index - opaque cookie to identify the sender + @param context - sender context, to match reply w/ request + @param netmap_if_name - interface name +*/ +define netmap_delete +{ + u32 client_index; + u32 context; + + u8 netmap_if_name[64]; +}; + +/** \brief Delete netmap response + @param context - sender context, to match reply w/ request + @param retval - return value for request +*/ +define netmap_delete_reply +{ + u32 context; + i32 retval; +}; + +/* + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/vnet/vnet/devices/netmap/netmap_api.c b/vnet/vnet/devices/netmap/netmap_api.c new file mode 100644 index 00000000000..9a393b1fda4 --- /dev/null +++ b/vnet/vnet/devices/netmap/netmap_api.c @@ -0,0 +1,137 @@ +/* + *------------------------------------------------------------------ + * netmap_api.c - netmap api + * + * Copyright (c) 2016 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------ + */ + +#include <vnet/vnet.h> +#include <vlibmemory/api.h> + +#include <vnet/interface.h> +#include <vnet/api_errno.h> +#include <vnet/devices/netmap/netmap.h> + +#include <vnet/vnet_msg_enum.h> + +#define vl_typedefs /* define message structures */ +#include <vnet/vnet_all_api_h.h> +#undef vl_typedefs + +#define vl_endianfun /* define message structures */ +#include <vnet/vnet_all_api_h.h> +#undef vl_endianfun + +/* instantiate all the print functions we know about */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#define vl_printfun +#include <vnet/vnet_all_api_h.h> +#undef vl_printfun + +#include <vlibapi/api_helper_macros.h> + +#define foreach_vpe_api_msg \ +_(NETMAP_CREATE, netmap_create) \ +_(NETMAP_DELETE, netmap_delete) \ + +static void +vl_api_netmap_create_t_handler (vl_api_netmap_create_t * mp) +{ + vlib_main_t *vm = vlib_get_main (); + vl_api_netmap_create_reply_t *rmp; + int rv = 0; + u8 *if_name = NULL; + + if_name = format (0, "%s", mp->netmap_if_name); + vec_add1 (if_name, 0); + + rv = + netmap_create_if (vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr, + mp->is_pipe, mp->is_master, 0); + + vec_free (if_name); + + REPLY_MACRO (VL_API_NETMAP_CREATE_REPLY); +} + +static void +vl_api_netmap_delete_t_handler (vl_api_netmap_delete_t * mp) +{ + vlib_main_t *vm = vlib_get_main (); + vl_api_netmap_delete_reply_t *rmp; + int rv = 0; + u8 *if_name = NULL; + + if_name = format (0, "%s", mp->netmap_if_name); + vec_add1 (if_name, 0); + + rv = netmap_delete_if (vm, if_name); + + vec_free (if_name); + + REPLY_MACRO (VL_API_NETMAP_DELETE_REPLY); +} + +/* + * netmap_api_hookup + * Add vpe's API message handlers to the table. + * vlib has alread mapped shared memory and + * added the client registration handlers. + * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() + */ +#define vl_msg_name_crc_list +#include <vnet/vnet_all_api_h.h> +#undef vl_msg_name_crc_list + +static void +setup_message_id_table (api_main_t * am) +{ +#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); + foreach_vl_msg_name_crc_netmap; +#undef _ +} + +static clib_error_t * +netmap_api_hookup (vlib_main_t * vm) +{ + api_main_t *am = &api_main; + +#define _(N,n) \ + vl_msg_api_set_handlers(VL_API_##N, #n, \ + vl_api_##n##_t_handler, \ + vl_noop_handler, \ + vl_api_##n##_t_endian, \ + vl_api_##n##_t_print, \ + sizeof(vl_api_##n##_t), 1); + foreach_vpe_api_msg; +#undef _ + + /* + * Set up the (msg_name, crc, message-id) table + */ + setup_message_id_table (am); + + return 0; +} + +VLIB_API_INIT_FUNCTION (netmap_api_hookup); + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/vnet/vnet/vnet_all_api_h.h b/vnet/vnet/vnet_all_api_h.h index b25ece71357..66975291552 100644 --- a/vnet/vnet/vnet_all_api_h.h +++ b/vnet/vnet/vnet_all_api_h.h @@ -30,6 +30,7 @@ #endif /* included_from_layer_3 */ #include <vnet/devices/af_packet/af_packet.api.h> +#include <vnet/devices/netmap/netmap.api.h> #include <vnet/interface.api.h> #include <vnet/map/map.api.h> #include <vnet/l2/l2.api.h> diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index b1c4aaff5f8..dc369d5edb6 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -86,6 +86,7 @@ BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \ jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h \ $(prefix)/../vnet/vnet/af_packet.api.json \ + $(prefix)/../vnet/vnet/netmap.api.json \ $(prefix)/../vpp/vpp-api/vpe.api.json \ $(prefix)/../vnet/vnet/ip.api.json \ $(prefix)/../vnet/vnet/tap.api.json \ @@ -97,6 +98,7 @@ jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \ && @srcdir@/jvpp/gen/jvpp_gen.py --plugin_name core \ -i $(prefix)/../vpp/vpp-api/vpe.api.json \ $(prefix)/../vnet/vnet/af_packet.api.json \ + $(prefix)/../vnet/vnet/netmap.api.json \ $(prefix)/../vnet/vnet/interface.api.json \ $(prefix)/../vnet/vnet/l2.api.json \ $(prefix)/../vnet/vnet/map.api.json \ diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index 496c577e9db..2a38cb3cf02 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -83,7 +83,6 @@ #include <vnet/ip/ip6_hop_by_hop.h> #include <vnet/ip/ip_source_and_port_range_check.h> #include <vnet/policer/policer.h> -#include <vnet/devices/netmap/netmap.h> #include <vnet/flow/flow_report.h> #include <vnet/ipsec-gre/ipsec_gre.h> #include <vnet/flow/flow_report_classify.h> @@ -268,8 +267,6 @@ _(POLICER_ADD_DEL, policer_add_del) \ _(POLICER_DUMP, policer_dump) \ _(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface) \ _(POLICER_CLASSIFY_DUMP, policer_classify_dump) \ -_(NETMAP_CREATE, netmap_create) \ -_(NETMAP_DELETE, netmap_delete) \ _(MPLS_TUNNEL_DUMP, mpls_tunnel_dump) \ _(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \ _(MPLS_FIB_DUMP, mpls_fib_dump) \ @@ -5666,44 +5663,6 @@ vl_api_policer_classify_dump_t_handler (vl_api_policer_classify_dump_t * mp) } static void -vl_api_netmap_create_t_handler (vl_api_netmap_create_t * mp) -{ - vlib_main_t *vm = vlib_get_main (); - vl_api_netmap_create_reply_t *rmp; - int rv = 0; - u8 *if_name = NULL; - - if_name = format (0, "%s", mp->netmap_if_name); - vec_add1 (if_name, 0); - - rv = - netmap_create_if (vm, if_name, mp->use_random_hw_addr ? 0 : mp->hw_addr, - mp->is_pipe, mp->is_master, 0); - - vec_free (if_name); - - REPLY_MACRO (VL_API_NETMAP_CREATE_REPLY); -} - -static void -vl_api_netmap_delete_t_handler (vl_api_netmap_delete_t * mp) -{ - vlib_main_t *vm = vlib_get_main (); - vl_api_netmap_delete_reply_t *rmp; - int rv = 0; - u8 *if_name = NULL; - - if_name = format (0, "%s", mp->netmap_if_name); - vec_add1 (if_name, 0); - - rv = netmap_delete_if (vm, if_name); - - vec_free (if_name); - - REPLY_MACRO (VL_API_NETMAP_DELETE_REPLY); -} - -static void vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_fib_details_t * mp) { clib_warning ("BUG"); diff --git a/vpp/vpp-api/vpe.api b/vpp/vpp-api/vpe.api index 48171970906..38561b6742c 100644 --- a/vpp/vpp-api/vpe.api +++ b/vpp/vpp-api/vpe.api @@ -27,6 +27,7 @@ * TAP APIs: see .../vnet/vnet/unix/{tap.api, tap_api.c} * VXLAN APIs: see .../vnet/vnet/vxlan/{vxlan.api, vxlan_api.c} * AF-PACKET APIs: ... see /vnet/devices/af_packet/{af_packet.api, af_packet_api.c} + * NETMAP APIs: see ... /vnet/vnet/devices/netmap/{netmap.api, netmap_api.c} */ /** \brief Create a new subinterface with the given vlan id @@ -3686,60 +3687,6 @@ define policer_classify_details u32 table_index; }; -/** \brief Create netmap - @param client_index - opaque cookie to identify the sender - @param context - sender context, to match reply w/ request - @param netmap_if_name - interface name - @param hw_addr - interface MAC - @param use_random_hw_addr - use random generated MAC - @param is_pipe - is pipe - @param is_master - 0=slave, 1=master -*/ -define netmap_create -{ - u32 client_index; - u32 context; - - u8 netmap_if_name[64]; - u8 hw_addr[6]; - u8 use_random_hw_addr; - u8 is_pipe; - u8 is_master; -}; - -/** \brief Create netmap response - @param context - sender context, to match reply w/ request - @param retval - return value for request -*/ -define netmap_create_reply -{ - u32 context; - i32 retval; -}; - -/** \brief Delete netmap - @param client_index - opaque cookie to identify the sender - @param context - sender context, to match reply w/ request - @param netmap_if_name - interface name -*/ -define netmap_delete -{ - u32 client_index; - u32 context; - - u8 netmap_if_name[64]; -}; - -/** \brief Delete netmap response - @param context - sender context, to match reply w/ request - @param retval - return value for request -*/ -define netmap_delete_reply -{ - u32 context; - i32 retval; -}; - /** \brief Classify get table IDs request @param client_index - opaque cookie to identify the sender @param context - sender context, to match reply w/ request |