Skip to content

Commit 19b8941

Browse files
igsilyaigsilya
committed
tunnels: Remove support for deprecated STT and LISP.
STT and LISP tunnel types were deprecated and marked for removal in the following commits in the OVS 3.5 release: 3b37a61 ("netdev-vport: Deprecate STT tunnel port type.") 8d7ac03 ("netdev-vport: Deprecate LISP tunnel port type.") Main reasons were that STT was rejected in upstream kernel and the LISP was never upstreamed as well and doesn't really have a supported implementation. Both protocols also appear to have lost their former relevance. Removing both now. While at it, also fixing some small documentation issues and comments. Acked-by: Eelco Chaudron <[email protected]> Acked-by: Alin Serdean <[email protected]> Acked-by: Kevin Traynor <[email protected]> Signed-off-by: Ilya Maximets <[email protected]>
1 parent 410e0f5 commit 19b8941

38 files changed

+65
-1681
lines changed

‎Documentation/automake.mk

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ DOC_SOURCE = \
6969
Documentation/howto/libvirt.rst \
7070
Documentation/howto/selinux.rst \
7171
Documentation/howto/ssl.rst \
72-
Documentation/howto/lisp.rst \
7372
Documentation/howto/qos.png \
7473
Documentation/howto/qos.rst \
7574
Documentation/howto/sflow.png \

‎Documentation/faq/releases.rst

-5
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ Q: Are all features available with all datapaths?
141141
Conntrack NAT 4.6 2.6 2.8 YES
142142
Conntrack NAT6 4.6 2.6 2.8 3.0
143143
Conntrack Helper Persist. YES YES 3.3 NO
144-
Tunnel - LISP (deprecated) NO 2.11 NO NO
145-
Tunnel - STT (deprecated) NO 2.4 NO YES
146144
Tunnel - GRE 3.11 1.0 2.4 YES
147145
Tunnel - VXLAN 3.12 1.10 2.4 YES
148146
Tunnel - Geneve 3.18 2.4 2.4 YES
@@ -190,7 +188,6 @@ Q: Are all features available with all datapaths?
190188
TCP flags matching 3.13 YES YES NO
191189
Validate flow actions YES YES N/A NO
192190
Multiple datapaths YES YES YES NO
193-
Tunnel TSO - STT N/A YES NO YES
194191
===================== ============== ============== ========= =======
195192

196193
Q: What DPDK version does each Open vSwitch release work with?
@@ -294,8 +291,6 @@ packaged with Open vSwitch?
294291
VXLAN 3.12
295292
Geneve 3.18
296293
ERSPAN 4.18
297-
LISP not upstream
298-
STT not upstream
299294
======== ============
300295

301296
If you are using a version of the kernel that is older than the one listed

‎Documentation/howto/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ OVS
4141
selinux
4242
libvirt
4343
ssl
44-
lisp
4544
tunneling
4645
userspace-tunneling
4746
vlan

‎Documentation/howto/ipsec.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ OVS IPsec
4545
~~~~~~~~~
4646

4747
OVS IPsec aims to provide a simple interface for user to add encryption on OVS
48-
tunnels. It supports GRE, GENEVE, VXLAN, and STT tunnel. The IPsec
49-
configuration is done by setting options of the tunnel interface and
50-
other_config of Open_vSwitch. You can choose different authentication methods
51-
and plaintext tunnel policies based on your requirements.
48+
tunnels. It supports GRE, GENEVE, and VXLAN tunnels. The IPsec configuration is
49+
done by setting options of the tunnel interface and other_config of
50+
Open_vSwitch. You can choose different authentication methods and plaintext
51+
tunnel policies based on your requirements.
5252

5353
OVS does not currently provide any support for IPsec encryption for traffic not
5454
encapsulated in a tunnel.

‎Documentation/howto/lisp.rst

-117
This file was deleted.

‎Documentation/intro/install/rhel.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Red Hat Network Scripts Integration
199199

200200
A RHEL host has default firewall rules that prevent any Open vSwitch tunnel
201201
traffic from passing through. If a user configures Open vSwitch tunnels like
202-
Geneve, GRE, VXLAN, LISP etc., they will either have to manually add iptables
202+
Geneve, GRE, VXLAN, etc., they will either have to manually add iptables
203203
firewall rules to allow the tunnel traffic or add it through a startup script
204204
Refer to the "enable-protocol" command in the ovs-ctl(8) manpage for more
205205
information.

‎Documentation/intro/install/windows.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@ Add tunnels
703703

704704
#. IPv4 tunnel, e.g.:
705705

706-
The Windows Open vSwitch implementation support VXLAN and STT tunnels
707-
(STT tunnel ports are deprecated).
706+
The Windows Open vSwitch implementation supports VXLAN and Geneve tunnels.
708707
To add tunnels. For example, first add the tunnel port between
709708
172.168.201.101 <->172.168.201.102:
710709

@@ -728,7 +727,7 @@ Add tunnels
728727
> ovs-vsctl set Interface tun-2 options:in_key=flow
729728
> ovs-vsctl set Interface tun-2 options:out_key=flow
730729

731-
Where ``<port-type>`` is one of: ``stt`` or ``vxlan``
730+
Where ``<port-type>`` is one of: ``geneve`` or ``vxlan``
732731

733732
.. note::
734733

‎NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Post-v3.5.0
55
- ovs-ctl:
66
* Added a new option, --oom-score=<score>, to set the daemons' Linux
77
Out-Of-Memory (OOM) killer score.
8+
- Tunnels:
9+
* Support for previously deprecated LISP and STT tunnel port types
10+
is now removed.
811

912

1013
v3.5.0 - 17 Feb 2025

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ following features:
3737
- NIC bonding with or without LACP on upstream switch
3838
- NetFlow, sFlow(R), and mirroring for increased visibility
3939
- QoS (Quality of Service) configuration, plus policing
40-
- Geneve, GRE, VXLAN, STT, ERSPAN, GTP-U, SRv6, Bareudp, and LISP tunneling
40+
- Geneve, GRE, VXLAN, ERSPAN, GTP-U, SRv6, and Bareudp tunneling
4141
- 802.1ag connectivity fault management
4242
- OpenFlow 1.0 plus numerous extensions
4343
- Transactional configuration database with C and Python bindings

‎datapath-windows/automake.mk

-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ EXTRA_DIST += \
6363
datapath-windows/ovsext/PacketParser.h \
6464
datapath-windows/ovsext/Recirc.c \
6565
datapath-windows/ovsext/Recirc.h \
66-
datapath-windows/ovsext/Stt.c \
67-
datapath-windows/ovsext/Stt.h \
6866
datapath-windows/ovsext/Switch.c \
6967
datapath-windows/ovsext/Switch.h \
7068
datapath-windows/ovsext/Tunnel.c \

‎datapath-windows/ovsext/Actions.c

-22
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "Offload.h"
3030
#include "PacketIO.h"
3131
#include "Recirc.h"
32-
#include "Stt.h"
3332
#include "Switch.h"
3433
#include "User.h"
3534
#include "Vport.h"
@@ -49,8 +48,6 @@ typedef struct _OVS_ACTION_STATS {
4948
UINT64 txGre;
5049
UINT64 rxVxlan;
5150
UINT64 txVxlan;
52-
UINT64 rxStt;
53-
UINT64 txStt;
5451
UINT64 rxGeneve;
5552
UINT64 txGeneve;
5653
UINT64 flowMiss;
@@ -212,9 +209,6 @@ OvsDetectTunnelRxPkt(OvsForwardingContext *ovsFwdCtx,
212209
dstPort, nwProto);
213210
if (tunnelVport) {
214211
switch(tunnelVport->ovsType) {
215-
case OVS_VPORT_TYPE_STT:
216-
ovsActionStats.rxStt++;
217-
break;
218212
case OVS_VPORT_TYPE_VXLAN:
219213
ovsActionStats.rxVxlan++;
220214
break;
@@ -314,9 +308,6 @@ OvsDetectTunnelPkt(OvsForwardingContext *ovsFwdCtx,
314308
case OVS_VPORT_TYPE_VXLAN:
315309
ovsActionStats.txVxlan++;
316310
break;
317-
case OVS_VPORT_TYPE_STT:
318-
ovsActionStats.txStt++;
319-
break;
320311
case OVS_VPORT_TYPE_GENEVE:
321312
ovsActionStats.txGeneve++;
322313
break;
@@ -671,11 +662,6 @@ OvsTunnelPortTx(OvsForwardingContext *ovsFwdCtx)
671662
&ovsFwdCtx->tunKey, ovsFwdCtx->switchContext,
672663
&ovsFwdCtx->layers, &newNbl, &switchFwdInfo);
673664
break;
674-
case OVS_VPORT_TYPE_STT:
675-
status = OvsEncapStt(ovsFwdCtx->tunnelTxNic, ovsFwdCtx->curNbl,
676-
&ovsFwdCtx->tunKey, ovsFwdCtx->switchContext,
677-
&ovsFwdCtx->layers, &newNbl, &switchFwdInfo);
678-
break;
679665
case OVS_VPORT_TYPE_GENEVE:
680666
status = OvsEncapGeneve(ovsFwdCtx->tunnelTxNic, ovsFwdCtx->curNbl,
681667
&ovsFwdCtx->tunKey, ovsFwdCtx->switchContext,
@@ -767,14 +753,6 @@ OvsTunnelPortRx(OvsForwardingContext *ovsFwdCtx)
767753
status = OvsDecapVxlan(ovsFwdCtx->switchContext, ovsFwdCtx->curNbl,
768754
&ovsFwdCtx->tunKey, &newNbl);
769755
break;
770-
case OVS_VPORT_TYPE_STT:
771-
status = OvsDecapStt(ovsFwdCtx->switchContext, ovsFwdCtx->curNbl,
772-
&ovsFwdCtx->tunKey, &newNbl);
773-
if (status == NDIS_STATUS_SUCCESS && newNbl == NULL) {
774-
/* This was an STT-LSO Fragment */
775-
dropReason = L"OVS-STT segment is cached";
776-
}
777-
break;
778756
case OVS_VPORT_TYPE_GENEVE:
779757
status = OvsDecapGeneve(ovsFwdCtx->switchContext, ovsFwdCtx->curNbl,
780758
&ovsFwdCtx->tunKey, &newNbl);

‎datapath-windows/ovsext/Debug.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@
3939
#define OVS_DBG_OTHERS BIT32(19)
4040
#define OVS_DBG_NETLINK BIT32(20)
4141
#define OVS_DBG_TUNFLT BIT32(21)
42-
#define OVS_DBG_STT BIT32(22)
43-
#define OVS_DBG_CONTRK BIT32(23)
44-
#define OVS_DBG_GENEVE BIT32(24)
45-
#define OVS_DBG_IPFRAG BIT32(25)
42+
#define OVS_DBG_CONTRK BIT32(22)
43+
#define OVS_DBG_GENEVE BIT32(23)
44+
#define OVS_DBG_IPFRAG BIT32(24)
4645

47-
#define OVS_DBG_LAST 25 /* Set this to the last defined module number. */
46+
#define OVS_DBG_LAST 24 /* Set this to the last defined module number. */
4847
/* Please add above OVS_DBG_LAST. */
4948

5049
#define OVS_DBG_ERROR DPFLTR_ERROR_LEVEL

0 commit comments

Comments
 (0)