feat: Add tunnel mode support for VPP TAP interfaces (#1671)

Signed-off-by: Ondrej Fabry <[email protected]>
ligato · Jun 25, 2020 · dfd2d53 · dfd2d53
1 parent a52954c
commit dfd2d53
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 154 deletions.
diff --git a/plugins/vpp/ifplugin/vppcalls/vpp1904/tap_vppcalls.go b/plugins/vpp/ifplugin/vppcalls/vpp1904/tap_vppcalls.go
@@ -40,6 +40,9 @@ func (h *InterfaceVppHandler) AddTapInterface(ifName string, tapIf *interfaces.T
 		if tapIf.EnableGso {
 			flags |= TapFlagGSO
 		}
+		if tapIf.EnableTunnel {
+			h.log.Warnf("tunnel mode not supported for VPP 19.04")
+		}
 
 		// Configure fast virtio-based TAP interface
 		req := &tapv2.TapCreateV2{

diff --git a/plugins/vpp/ifplugin/vppcalls/vpp1908/tap_vppcalls.go b/plugins/vpp/ifplugin/vppcalls/vpp1908/tap_vppcalls.go
@@ -40,6 +40,9 @@ func (h *InterfaceVppHandler) AddTapInterface(ifName string, tapIf *interfaces.T
 		if tapIf.EnableGso {
 			flags |= TapFlagGSO
 		}
+		if tapIf.EnableTunnel {
+			h.log.Warnf("tunnel mode not supported for VPP 19.08")
+		}
 
 		// Configure fast virtio-based TAP interface
 		req := &tapv2.TapCreateV2{

diff --git a/plugins/vpp/ifplugin/vppcalls/vpp2001/tap_vppcalls.go b/plugins/vpp/ifplugin/vppcalls/vpp2001/tap_vppcalls.go
@@ -40,6 +40,9 @@ func (h *InterfaceVppHandler) AddTapInterface(ifName string, tapIf *ifs.TapLink)
 		if tapIf.EnableGso {
 			flags |= vpp_tapv2.TAP_FLAG_GSO
 		}
+		if tapIf.EnableTunnel {
+			h.log.Warnf("tunnel mode not supported for VPP 20.01")
+		}
 
 		// Configure fast virtio-based TAP interface
 		req := &vpp_tapv2.TapCreateV2{

diff --git a/plugins/vpp/ifplugin/vppcalls/vpp2005/dump_interface_vppcalls.go b/plugins/vpp/ifplugin/vppcalls/vpp2005/dump_interface_vppcalls.go
@@ -520,11 +520,12 @@ func (h *InterfaceVppHandler) dumpTapDetails(interfaces map[uint32]*vppcalls.Int
 		}
 		interfaces[tapDetails.SwIfIndex].Interface.Link = &ifs.Interface_Tap{
 			Tap: &ifs.TapLink{
-				Version:    2,
-				HostIfName: cleanString(tapDetails.HostIfName),
-				RxRingSize: uint32(tapDetails.RxRingSz),
-				TxRingSize: uint32(tapDetails.TxRingSz),
-				EnableGso:  tapDetails.TapFlags&vpp_tapv2.TAP_API_FLAG_GSO == vpp_tapv2.TAP_API_FLAG_GSO,
+				Version:      2,
+				HostIfName:   cleanString(tapDetails.HostIfName),
+				RxRingSize:   uint32(tapDetails.RxRingSz),
+				TxRingSize:   uint32(tapDetails.TxRingSz),
+				EnableGso:    tapDetails.TapFlags&vpp_tapv2.TAP_API_FLAG_GSO == vpp_tapv2.TAP_API_FLAG_GSO,
+				EnableTunnel: tapDetails.TapFlags&vpp_tapv2.TAP_API_FLAG_TUN == vpp_tapv2.TAP_API_FLAG_TUN,
 			},
 		}
 		interfaces[tapDetails.SwIfIndex].Interface.Type = ifs.Interface_TAP

diff --git a/plugins/vpp/ifplugin/vppcalls/vpp2005/tap_vppcalls.go b/plugins/vpp/ifplugin/vppcalls/vpp2005/tap_vppcalls.go
@@ -23,11 +23,6 @@ import (
 	ifs "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/interfaces"
 )
 
-// TapFlags definitions from https://github.com/FDio/vpp/blob/stable/2001/src/vnet/devices/tap/tap.h#L33
-const (
-	TapFlagGSO uint32 = 1 << iota
-)
-
 func (h *InterfaceVppHandler) AddTapInterface(ifName string, tapIf *ifs.TapLink) (swIfIdx uint32, err error) {
 	if tapIf == nil || tapIf.HostIfName == "" {
 		return 0, errors.New("host interface name was not provided for the TAP interface")
@@ -40,6 +35,9 @@ func (h *InterfaceVppHandler) AddTapInterface(ifName string, tapIf *ifs.TapLink)
 		if tapIf.EnableGso {
 			flags |= vpp_tapv2.TAP_API_FLAG_GSO
 		}
+		if tapIf.EnableTunnel {
+			flags |= vpp_tapv2.TAP_API_FLAG_TUN
+		}
 
 		// Configure fast virtio-based TAP interface
 		req := &vpp_tapv2.TapCreateV2{

diff --git a/proto/ligato/vpp/interfaces/interface.pb.go b/proto/ligato/vpp/interfaces/interface.pb.go
diff --git a/proto/ligato/vpp/interfaces/interface.proto b/proto/ligato/vpp/interfaces/interface.proto
@@ -219,7 +219,10 @@ message TapLink {
     uint32 rx_ring_size = 4;
     // Tx ring buffer size; must be power of 2; default is 256; only for TAP v.2
     uint32 tx_ring_size = 5;
+    // EnableGso enables GSO mode for TAP interface.
     bool enable_gso = 6;
+    // EnableTunnel enables tunnel mode for TAP interface.
+    bool enable_tunnel = 7;
 }
 
 // IPSecLink defines configuration for interface type: IPSEC_TUNNEL