diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 6f4ea91..e24cd90 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -1535,6 +1535,19 @@ index dee9ab344e..0f9f07f44b 100644 dp_packet_reset_packet(packet, hlen); return packet; +diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c +index 921d523177..3be1c08d24 100644 +--- a/lib/netdev-offload-tc.c ++++ b/lib/netdev-offload-tc.c +@@ -400,6 +400,8 @@ get_next_available_prio(ovs_be16 protocol) + return TC_RESERVED_PRIORITY_IPV4; + } else if (protocol == htons(ETH_P_IPV6)) { + return TC_RESERVED_PRIORITY_IPV6; ++ } else if (protocol == htons(ETH_P_8021Q)) { ++ return TC_RESERVED_PRIORITY_VLAN; + } + } + diff --git a/lib/netlink-protocol.h b/lib/netlink-protocol.h index 6eaa7035a4..e4bb28ac9f 100644 --- a/lib/netlink-protocol.h @@ -2056,6 +2069,18 @@ index e9bcae4e4b..e55ba3b1bb 100644 flower->csum_update_flags ? TC_ACT_PIPE : action_pc); return 0; +diff --git a/lib/tc.h b/lib/tc.h +index fdbcf4b7cb..8442c8d8b8 100644 +--- a/lib/tc.h ++++ b/lib/tc.h +@@ -51,6 +51,7 @@ enum tc_flower_reserved_prio { + TC_RESERVED_PRIORITY_POLICE, + TC_RESERVED_PRIORITY_IPV4, + TC_RESERVED_PRIORITY_IPV6, ++ TC_RESERVED_PRIORITY_VLAN, + __TC_RESERVED_PRIORITY_MAX + }; + #define TC_RESERVED_PRIORITY_MAX (__TC_RESERVED_PRIORITY_MAX -1) diff --git a/lib/vlog.c b/lib/vlog.c index b2653142f3..59b524b097 100644 --- a/lib/vlog.c diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 1b78fe1..1469139 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 34%{?dist} +Release: 35%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -767,6 +767,21 @@ exit 0 %endif %changelog +* Tue Jul 02 2024 Michael Santana - 3.3.0-35 +- netdev-offload-tc: Reserve lower tc prio for vlan ethertype. [RH git: c2202ea6e8] + The cited commit reserved lower tc priorities for IP ethertypes in order + to give IP traffic higher priority than other management traffic. + In case of of vlan encap traffic, IP traffic will still get lower + priority. + + Fix it by also reserving low priority tc prio for vlan. + + Fixes: c230c7579c14 ("netdev-offload-tc: Reserve lower tc prios for ip ethertypes") + Signed-off-by: Maor Dickman + Acked-by: Roi Dayan + Signed-off-by: Simon Horman + + * Tue Jul 02 2024 Open vSwitch CI - 3.3.0-34 - Merging upstream branch-3.3 [RH git: c09d2d60bb] Commit list: