From 4dd4cf4f9c02953f8ce7df0b2912e4da7c6786ed Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 27 Mar 2019 05:06:47 -0700 Subject: GBP: fixes for l3-out routing Change-Id: I4d73b712da911588d511a8401b73cdc3c66346fe Signed-off-by: Neale Ranns --- extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp | 4 ++ extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp | 2 + extras/vom/vom/vxlan_tunnel.cpp | 64 ++++++++++++++++++++++++++++---- extras/vom/vom/vxlan_tunnel.hpp | 18 ++++++++- 4 files changed, 79 insertions(+), 9 deletions(-) (limited to 'extras') diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp index 24d1883ed75..db4e7fc796c 100644 --- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp +++ b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp @@ -24,9 +24,11 @@ namespace vxlan_gbp_tunnel_cmds { create_cmd::create_cmd(HW::item& item, const std::string& name, const vxlan_tunnel::endpoint_t& ep, + bool is_l2, handle_t mcast_itf) : interface::create_cmd(item, name) , m_ep(ep) + , m_is_l2(is_l2) , m_mcast_itf(mcast_itf) { } @@ -52,6 +54,8 @@ create_cmd::issue(connection& con) payload.tunnel.encap_table_id = 0; payload.tunnel.vni = m_ep.vni; payload.tunnel.instance = ~0; + payload.tunnel.mode = + (m_is_l2 ? VXLAN_GBP_API_TUNNEL_MODE_L2 : VXLAN_GBP_API_TUNNEL_MODE_L3); VAPI_CALL(req.execute()); diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp b/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp index c7ec87245df..87bca98d302 100644 --- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp +++ b/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp @@ -38,6 +38,7 @@ public: create_cmd(HW::item& item, const std::string& name, const vxlan_tunnel::endpoint_t& ep, + bool is_l2, handle_t mcast_itf); /** @@ -59,6 +60,7 @@ private: * Enpoint values of the tunnel to be created */ const vxlan_tunnel::endpoint_t m_ep; + bool m_is_l2; handle_t m_mcast_itf; }; diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp index 248aadfeade..db2886321c5 100644 --- a/extras/vom/vom/vxlan_tunnel.cpp +++ b/extras/vom/vom/vxlan_tunnel.cpp @@ -15,6 +15,7 @@ #include "vom/vxlan_tunnel.hpp" #include "vom/api_types.hpp" +#include "vom/interface_cmds.hpp" #include "vom/logger.hpp" #include "vom/singular_db_funcs.hpp" #include "vom/vxlan_gbp_tunnel_cmds.hpp" @@ -26,8 +27,9 @@ const std::string VXLAN_TUNNEL_NAME = "vxlan-tunnel-itf"; vxlan_tunnel::event_handler vxlan_tunnel::m_evh; const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::STANDARD(0, "standard"); -const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP(1, "GBP"); -const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(2, "GPE"); +const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP_L2(1, "GBP-L2"); +const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP_L3(2, "GBP-L3"); +const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(3, "GPE"); vxlan_tunnel::mode_t::mode_t(int v, const std::string s) : enum_base(v, s) @@ -92,6 +94,8 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src, , m_tep(src, dst, vni) , m_mode(mode) , m_mcast_itf() + , m_rd() + , m_table_id(route::DEFAULT_TABLE) { } @@ -106,6 +110,24 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src, , m_tep(src, dst, vni) , m_mode(mode) , m_mcast_itf(mcast_itf.singular()) + , m_rd() + , m_table_id(route::DEFAULT_TABLE) +{ +} + +vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src, + const boost::asio::ip::address& dst, + uint32_t vni, + const route_domain& rd, + const mode_t& mode) + : interface(mk_name(src, dst, mode, vni), + interface::type_t::VXLAN, + interface::admin_state_t::UP) + , m_tep(src, dst, vni) + , m_mode(mode) + , m_mcast_itf() + , m_rd(rd.singular()) + , m_table_id(m_rd->table_id()) { } @@ -114,6 +136,8 @@ vxlan_tunnel::vxlan_tunnel(const vxlan_tunnel& o) , m_tep(o.m_tep) , m_mode(o.m_mode) , m_mcast_itf(o.m_mcast_itf) + , m_rd(o.m_rd) + , m_table_id(o.m_table_id) { } @@ -142,7 +166,7 @@ vxlan_tunnel::sweep() if (m_hdl) { if (mode_t::STANDARD == m_mode) HW::enqueue(new vxlan_tunnel_cmds::delete_cmd(m_hdl, m_tep)); - else if (mode_t::GBP == m_mode) + else if (mode_t::GBP_L2 == m_mode || mode_t::GBP_L3 == m_mode) HW::enqueue(new vxlan_gbp_tunnel_cmds::delete_cmd(m_hdl, m_tep)); } HW::write(); @@ -156,11 +180,21 @@ vxlan_tunnel::replay() HW::enqueue(new vxlan_tunnel_cmds::create_cmd( m_hdl, name(), m_tep, (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); - else if (mode_t::GBP == m_mode) + else if (mode_t::GBP_L2 == m_mode) HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( - m_hdl, name(), m_tep, + m_hdl, name(), m_tep, true, + (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); + else if (mode_t::GBP_L3 == m_mode) + HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( + m_hdl, name(), m_tep, false, (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); } + if (m_rd && (m_rd->table_id() != route::DEFAULT_TABLE)) { + HW::enqueue( + new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV4, m_hdl)); + HW::enqueue( + new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV6, m_hdl)); + } } vxlan_tunnel::~vxlan_tunnel() @@ -192,10 +226,20 @@ vxlan_tunnel::update(const vxlan_tunnel& desired) HW::enqueue(new vxlan_tunnel_cmds::create_cmd( m_hdl, name(), m_tep, (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); - else if (mode_t::GBP == m_mode) + else if (mode_t::GBP_L2 == m_mode) HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( - m_hdl, name(), m_tep, + m_hdl, name(), m_tep, true, (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); + else if (mode_t::GBP_L3 == m_mode) + HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( + m_hdl, name(), m_tep, false, + (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); + } + if (!m_table_id && m_rd) { + HW::enqueue( + new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV4, m_hdl)); + HW::enqueue( + new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV6, m_hdl)); } } @@ -255,7 +299,11 @@ vxlan_tunnel::event_handler::handle_populate(const client_db::key_t& key) boost::asio::ip::address dst = from_api(payload.tunnel.dst); std::shared_ptr vt = - vxlan_tunnel(src, dst, payload.tunnel.vni, mode_t::GBP).singular(); + vxlan_tunnel(src, dst, payload.tunnel.vni, + (payload.tunnel.mode == VXLAN_GBP_API_TUNNEL_MODE_L2 + ? mode_t::GBP_L2 + : mode_t::GBP_L3)) + .singular(); vt->set(hdl); VOM_LOG(log_level_t::DEBUG) << "dump: " << vt->to_string(); diff --git a/extras/vom/vom/vxlan_tunnel.hpp b/extras/vom/vom/vxlan_tunnel.hpp index c085ba0b629..4c46e75a700 100644 --- a/extras/vom/vom/vxlan_tunnel.hpp +++ b/extras/vom/vom/vxlan_tunnel.hpp @@ -82,7 +82,8 @@ public: { ~mode_t() = default; const static mode_t STANDARD; - const static mode_t GBP; + const static mode_t GBP_L2; + const static mode_t GBP_L3; const static mode_t GPE; private: @@ -102,6 +103,11 @@ public: uint32_t vni, const interface& mcast_itf, const mode_t& mode = mode_t::STANDARD); + vxlan_tunnel(const boost::asio::ip::address& src, + const boost::asio::ip::address& dst, + uint32_t vni, + const route_domain& rd, + const mode_t& mode = mode_t::STANDARD); /* * Destructor @@ -226,6 +232,16 @@ private: */ std::shared_ptr m_mcast_itf; + /** + * The RD an L3 interface is bound to + */ + std::shared_ptr m_rd; + + /** + * HW state of the VPP table mapping + */ + HW::item m_table_id; + /** * Construct a unique name for the tunnel */ -- cgit 1.2.3-korg