Blob Blame History Raw
# Copyright (C) 2009, 2010, 2013, 2014 Nicira Networks, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved.  This file is offered as-is,
# without warranty of any kind.
#
# If tests have to be skipped while building, specify the '--without check'
# option. For example:
# rpmbuild -bb --without check rhel/openvswitch-fedora.spec

# This defines the base package name's version.

%define pkgname openvswitch2.13

#%%global commit0 2a4f006c79c06628634490627ac72d8c76477e56
#%%global date 20200121
#%%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# DPDK commit
#%%global commit1 ef8b7c505f10897621c0801d8ef3e961385246f8
#%%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})

# Enable PIE, bz#955181
%global _hardened_build 1

# RHEL-7 doesn't define _rundir macro yet
# Fedora 15 onwards uses /run as _rundir
%if 0%{!?_rundir:1}
%define _rundir /run
%endif

# FIXME Test "STP - flush the fdb and mdb when topology changed" fails on s390x
# FIXME 2 tests fails on ppc64le. They will be hopefully fixed before official 2.11
%ifarch %{ix86} x86_64 aarch64
%bcond_without check
%else
%bcond_with check
%endif
# option to run kernel datapath tests, requires building as root!
%bcond_with check_datapath_kernel
# option to build with libcap-ng, needed for running OVS as regular user
%bcond_without libcapng
# option to build with ipsec support
%bcond_without ipsec

# Build python2 (that provides python) and python3 subpackages on Fedora
# Build only python3 (that provides python) subpackage on RHEL8
# Build only python subpackage on RHEL7
%if 0%{?rhel} > 7 || 0%{?fedora}
# On RHEL8 Sphinx is included in buildroot
%global external_sphinx 1
%else
# Don't use external sphinx (RHV doesn't have optional repositories enabled)
%global external_sphinx 0
%endif

Name: %{pkgname}
Summary: Open vSwitch
Group: System Environment/Daemons daemon/database/utilities
URL: http://www.openvswitch.org/
Version: 2.13.0
Release: 169%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}

# Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
# datapath/ is GPLv2 (although not built into any of the binary packages)
License: ASL 2.0 and LGPLv2+ and SISSL

%define dpdkver %{?commit1}%{!?commit1:19.11}
%define dpdkdir dpdk
%define dpdksver %(echo %{dpdkver} | cut -d. -f-2)
# NOTE: DPDK does not currently build for s390x
# DPDK on aarch64 is not stable enough to be enabled in FDP
%define dpdkarches x86_64 ppc64le

%if 0%{?commit0:1}
Source: https://github.com/openvswitch/ovs/archive/%{commit0}.tar.gz#/openvswitch-%{shortcommit0}.tar.gz
%else
Source: https://github.com/openvswitch/ovs/archive/v%{version}.tar.gz#/openvswitch-%{version}.tar.gz
%endif
%if 0%{?commit1:1}
Source10: https://git.dpdk.org/dpdk/snapshot/dpdk-%{dpdkver}.tar.xz
%else
Source10: https://fast.dpdk.org/rel/dpdk-%{dpdkver}.tar.xz
%endif

%define docutilsver 0.12
%define pygmentsver 1.4
%define sphinxver   1.1.3
Source100: https://pypi.io/packages/source/d/docutils/docutils-%{docutilsver}.tar.gz
Source101: https://pypi.io/packages/source/P/Pygments/Pygments-%{pygmentsver}.tar.gz
Source102: https://pypi.io/packages/source/S/Sphinx/Sphinx-%{sphinxver}.tar.gz

Source500: configlib.sh
Source502: set_config.sh

# Important: source503 is used as the actual copy file
# @TODO: this causes a warning - fix it?
Source504: arm64-armv8a-linuxapp-gcc-config
Source505: ppc_64-power8-linuxapp-gcc-config
Source506: x86_64-native-linuxapp-gcc-config

Patch:     openvswitch-%{version}.patch

# The DPDK is designed to optimize througput of network traffic using, among
# other techniques, carefully crafted assembly instructions.  As such it
# needs extensive work to port it to other architectures.
ExclusiveArch: x86_64 aarch64 ppc64le s390x

# Do not enable this otherwise YUM will break on any upgrade.
# Provides: openvswitch
Conflicts: openvswitch < 2.13
Conflicts: openvswitch-dpdk < 2.13
Conflicts: openvswitch2.10
Conflicts: openvswitch2.11
Conflicts: openvswitch2.12

# dpdk_mach_arch maps between rpm and dpdk arch name, often same as _target_cpu
# dpdk_mach_tmpl is the config template dpdk_mach name, often "native"
# dpdk_mach is the actual dpdk_mach name used in the dpdk make system
%ifarch x86_64
%define dpdk_mach_arch x86_64
%define dpdk_mach_tmpl native
%define dpdk_mach default
%endif
%ifarch aarch64
%define dpdk_mach_arch arm64
%define dpdk_mach_tmpl armv8a
%define dpdk_mach armv8a
%endif
%ifarch ppc64le
%define dpdk_mach_arch ppc_64
%define dpdk_mach_tmpl power8
%define dpdk_mach power8
%endif

%define dpdktarget %{dpdk_mach_arch}-%{dpdk_mach_tmpl}-linuxapp-gcc

# FIXME Sphinx is used to generate some manpages, unfortunately, on RHEL, it's
# in the -optional repository and so we can't require it directly since RHV
# doesn't have the -optional repository enabled and so TPS fails
%if %{external_sphinx}
BuildRequires: python3-sphinx
%else
# Sphinx dependencies
BuildRequires: python-devel
BuildRequires: python-setuptools
#BuildRequires: python2-docutils
BuildRequires: python-jinja2
BuildRequires: python-nose
#BuildRequires: python2-pygments
# docutils dependencies
BuildRequires: python-imaging
# pygments dependencies
BuildRequires: python-nose
%endif

BuildRequires: gcc gcc-c++ make
BuildRequires: autoconf automake libtool
BuildRequires: systemd-units openssl openssl-devel
BuildRequires: python3-devel python3-setuptools
BuildRequires: desktop-file-utils
BuildRequires: groff-base graphviz
BuildRequires: unbound-devel
BuildRequires: systemtap-sdt-devel
# make check dependencies
BuildRequires: procps-ng
%if 0%{?rhel} > 7 || 0%{?fedora}
BuildRequires: python3-pyOpenSSL
%endif
%if %{with check_datapath_kernel}
BuildRequires: nmap-ncat
# would be useful but not available in RHEL or EPEL
#BuildRequires: pyftpdlib
%endif

%if %{with libcapng}
BuildRequires: libcap-ng libcap-ng-devel
%endif

%ifarch %{dpdkarches}
# DPDK driver dependencies
BuildRequires: zlib-devel numactl-devel
%ifarch x86_64
BuildRequires: rdma-core-devel >= 15 libmnl-devel
%endif

# Required by packaging policy for the bundled DPDK
Provides: bundled(dpdk) = %{dpdkver}
%endif

Requires: openssl iproute module-init-tools
#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
#Requires: kernel >= 3.15.0-0
Requires: openvswitch-selinux-extra-policy

Requires(pre): shadow-utils
Requires(post): /bin/sed
Requires(post): /usr/sbin/usermod
Requires(post): /usr/sbin/groupadd
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Obsoletes: openvswitch-controller <= 0:2.1.0-1

%description
Open vSwitch provides standard network bridging functions and
support for the OpenFlow protocol for remote per-flow control of
traffic.

%package -n python3-%{pkgname}
Summary: Open vSwitch python3 bindings
License: ASL 2.0
Requires: %{pkgname} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-%{pkgname} = %{?epoch:%{epoch}:}%{version}-%{release}

%description -n python3-%{pkgname}
Python bindings for the Open vSwitch database

%package test
Summary: Open vSwitch testing utilities
License: ASL 2.0
BuildArch: noarch
Requires: python3-%{pkgname} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: tcpdump

%description test
Utilities that are useful to diagnose performance and connectivity
issues in Open vSwitch setup.

%package devel
Summary: Open vSwitch OpenFlow development package (library, headers)
License: ASL 2.0
Requires: %{pkgname} = %{?epoch:%{epoch}:}%{version}-%{release}

%description devel
This provides shared library, libopenswitch.so and the openvswitch header
files needed to build an external application.

%if 0%{?rhel} > 7 || 0%{?fedora} > 28
%package -n network-scripts-%{name}
Summary: Open vSwitch legacy network service support
License: ASL 2.0
Requires: network-scripts
Supplements: (%{name} and network-scripts)

%description -n network-scripts-%{name}
This provides the ifup and ifdown scripts for use with the legacy network
service.
%endif

%if %{with ipsec}
%package ipsec
Summary: Open vSwitch IPsec tunneling support
License: ASL 2.0
Requires: python3-%{pkgname} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libreswan

%description ipsec
This package provides IPsec tunneling support for OVS tunnels.
%endif

%prep
%if 0%{?commit0:1}
%setup -q -n ovs-%{commit0} -a 10
%else
%setup -q -n ovs-%{version} -a 10
%endif
%if ! %{external_sphinx}
%if 0%{?commit0:1}
%setup -n ovs-%{commit0} -q -D -T -a 100 -a 101 -a 102
%else
%setup -n ovs-%{version} -q -D -T -a 100 -a 101 -a 102
%endif
%endif

mv dpdk-*/ %{dpdkdir}/

%patch -p1

%build
# Build Sphinx on RHEL
%if ! %{external_sphinx}
export PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}%{_builddir}/pytmp/lib/python"
for x in docutils-%{docutilsver} Pygments-%{pygmentsver} Sphinx-%{sphinxver}; do
    pushd "$x"
    python2 setup.py install --home %{_builddir}/pytmp
    popd
done

export PATH="$PATH:%{_builddir}/pytmp/bin"
%endif

%if 0%{?commit0:1}
# fix the snapshot unreleased version to be the released one.
sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" configure.ac
%endif
./boot.sh

%ifarch %{dpdkarches}    # build dpdk
# Lets build DPDK first
cd %{dpdkdir}

# In case dpdk-devel is installed
unset RTE_SDK RTE_INCLUDE RTE_TARGET

# Avoid appending second -Wall to everything, it breaks upstream warning
# disablers in makefiles. Strip explicit -march= from optflags since they
# will only guarantee build failures, DPDK is picky with that.
# Note: _hardening_ldflags has to go on the extra cflags line because dpdk is
# astoundingly convoluted in how it processes its linker flags.  Fixing it in
# dpdk is the preferred solution, but adjusting to allow a gcc option in the
# ldflags, even when gcc is used as the linker, requires large tree-wide changes
touch obj.o
gcc -### obj.o 2>&1 | awk '/.*collect2.*/ { print $0}' | sed -e 's/\S*\.res\S*//g' -e 's/-z \S*//g' -e 's/[^ ]*\.o//g' -e 's/ /\n/g' | sort -u > ./noopts.txt
gcc -### $RPM_LD_FLAGS obj.o 2>&1 | awk '/.*collect2.*/ {print $0}' | sed -e 's/\S*\.res\S*//g' -e 's/-z \S*//g' -e 's/[^ ]*\.o//g' -e 's/ /\n/g' | sort -u > ./opts.txt
EXTRA_RPM_LDFLAGS=$(comm -13 ./noopts.txt ./opts.txt)
rm -f obj.o

export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC -fcommon %{_hardening_ldflags}"
export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
export HOST_EXTRA_CFLAGS="$EXTRA_CFLAGS $EXTRA_RPM_LDFLAGS"
export EXTRA_HOST_LDFLAGS="$EXTRA_RPM_LDFLAGS $(echo %{__global_ldflags} | sed -e's/-spec.*//')"

# DPDK defaults to using builder-specific compiler flags.  However,
# the config has been changed by specifying CONFIG_RTE_MACHINE=default
# in order to build for a more generic host.  NOTE: It is possible that
# the compiler flags used still won't work for all Fedora-supported
# dpdk_machs, but runtime checks in DPDK will catch those situations.

make V=1 O=%{dpdktarget} T=%{dpdktarget} %{?_smp_mflags} config

cp -f %{SOURCE500} %{SOURCE502} "%{_sourcedir}/%{dpdktarget}-config" .
%{SOURCE502} %{dpdktarget}-config "%{dpdktarget}/.config"

# Currently RHEL8.3+ includes binutils 2.30 with the patch to fix AVX512 support backported (#1870039),
# but DPDK 19.11 blindly disables AVX512 support if ld version < 2.32
binutils_version=$(rpm -q --qf '%%{version}-%%{release}' binutils)
if [ "$binutils_version" "<" "2.30-79.el8" ]; then
    make V=1 O=%{dpdktarget} %{?_smp_mflags}
else
    make LD_VERSION=2.32 V=1 O=%{dpdktarget} %{?_smp_mflags}
fi

# Generate a list of supported drivers, its hard to tell otherwise.
cat << EOF > README.DPDK-PMDS
DPDK drivers included in this package:

EOF

for f in $(ls %{dpdk_mach_arch}-%{dpdk_mach_tmpl}-linuxapp-gcc/lib/lib*_pmd_*); do
    basename ${f} | cut -c12- | cut -d. -f1 | tr [:lower:] [:upper:]
done >> README.DPDK-PMDS

cat << EOF >> README.DPDK-PMDS

For further information about the drivers, see
http://dpdk.org/doc/guides-%{dpdksver}/nics/index.html
EOF

cd -
%endif    # build dpdk

# And now for OVS...
mkdir build-shared build-static
pushd build-shared
ln -s ../configure
%configure \
%if %{with libcapng}
        --enable-libcapng \
%else
        --disable-libcapng \
%endif
        --disable-static \
        --enable-shared \
        --enable-ssl \
        --with-pkidir=%{_sharedstatedir}/openvswitch/pki \
        --enable-usdt-probes
make %{?_smp_mflags}
popd
pushd build-static
ln -s ../configure
%configure \
%if %{with libcapng}
        --enable-libcapng \
%else
        --disable-libcapng \
%endif
        --enable-ssl \
%ifarch %{dpdkarches}
        --with-dpdk=$(pwd)/../%{dpdkdir}/%{dpdktarget} \
%endif
        --with-pkidir=%{_sharedstatedir}/openvswitch/pki \
        --enable-usdt-probes \
        ac_cv_search_mlx5dv_create_wq=-lmlx5
        # mlx5dv_create_wq was added in rdma-core 16 since it's the first
        # officially released release that adds support for mlx offloading,
        # but currently on RHEL 7.7 we still have rdma-core 15 (with the
        # offloading commits backported) and so configure is not able to detect
        # it.
make %{?_smp_mflags}
popd

/usr/bin/python3 build-aux/dpdkstrip.py \
        --dpdk \
        < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
        > rhel/usr_lib_systemd_system_ovs-vswitchd.service

%install
rm -rf $RPM_BUILD_ROOT
make -C build-shared install-libLTLIBRARIES DESTDIR=$RPM_BUILD_ROOT
make -C build-static install DESTDIR=$RPM_BUILD_ROOT

install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch
install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch

install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \
        $RPM_BUILD_ROOT%{_udevrulesdir}/91-vfio.rules

install -p -D -m 0644 \
        rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch

for service in openvswitch ovsdb-server ovs-vswitchd \
               ovs-delete-transient-ports; do
        install -p -D -m 0644 \
                        rhel/usr_lib_systemd_system_${service}.service \
                        $RPM_BUILD_ROOT%{_unitdir}/${service}.service
done

%if %{with ipsec}
install -p -D -m 0644 rhel/usr_lib_systemd_system_openvswitch-ipsec.service \
                      $RPM_BUILD_ROOT%{_unitdir}/openvswitch-ipsec.service
%endif

install -m 0755 rhel/etc_init.d_openvswitch \
        $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init

install -p -D -m 0644 rhel/etc_openvswitch_default.conf \
        $RPM_BUILD_ROOT/%{_sysconfdir}/openvswitch/default.conf

install -p -D -m 0644 rhel/etc_logrotate.d_openvswitch \
        $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/openvswitch

install -m 0644 vswitchd/vswitch.ovsschema \
        $RPM_BUILD_ROOT/%{_datadir}/openvswitch/vswitch.ovsschema

install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/
install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs

install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib}
cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ovstest \
        $RPM_BUILD_ROOT%{python3_sitelib}

# Build the JSON C extension for the Python lib (#1417738)
pushd python
(
export CPPFLAGS="-I ../include -I ../build-shared/include"
export LDFLAGS="%{__global_ldflags} -L $RPM_BUILD_ROOT%{_libdir}"
%py3_build
%py3_install
[ -f "$RPM_BUILD_ROOT/%{python3_sitearch}/ovs/_json$(python3-config --extension-suffix)" ]
)
popd

rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/

install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch

install -d -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/

install -p -D -m 0755 \
        rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \
        $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-systemd-reload

touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db
# The db needs special permission as IPsec Pre-shared keys are stored in it.
chmod 0640 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db

touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf

# remove unpackaged files
rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \
        $RPM_BUILD_ROOT/%{_bindir}/ovs-docker \
        $RPM_BUILD_ROOT/%{_bindir}/ovs-parse-backtrace \
        $RPM_BUILD_ROOT/%{_bindir}/ovs-testcontroller \
        $RPM_BUILD_ROOT/%{_sbindir}/ovs-vlan-bug-workaround \
        $RPM_BUILD_ROOT/%{_mandir}/man1/ovs-benchmark.1* \
        $RPM_BUILD_ROOT/%{_mandir}/man8/ovs-testcontroller.* \
        $RPM_BUILD_ROOT/%{_mandir}/man8/ovs-vlan-bug-workaround.8*

%if ! %{with ipsec}
rm -f $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts/ovs-monitor-ipsec
%endif

# remove ovn unpackages files
rm -f $RPM_BUILD_ROOT%{_bindir}/ovn*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ovn*
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/ovn*
rm -f $RPM_BUILD_ROOT%{_mandir}/man7/ovn*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/ovn*
rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/ovn*
rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovn*
rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/*

%check
%if %{with check}
    pushd build-static
    touch resolv.conf
    export OVS_RESOLV_CONF=$(pwd)/resolv.conf
    if make check TESTSUITEFLAGS='%{_smp_mflags}' ||
       make check TESTSUITEFLAGS='--recheck'; then :;
    else
        cat tests/testsuite.log
        exit 1
    fi
    popd
%endif
%if %{with check_datapath_kernel}
    pushd build-static
    if make check-kernel RECHECK=yes; then :;
    else
        cat tests/system-kmod-testsuite.log
        exit 1
    fi
    popd
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%preun
%if 0%{?systemd_preun:1}
    %systemd_preun openvswitch.service
%else
    if [ $1 -eq 0 ] ; then
    # Package removal, not upgrade
        /bin/systemctl --no-reload disable openvswitch.service >/dev/null 2>&1 || :
        /bin/systemctl stop openvswitch.service >/dev/null 2>&1 || :
    fi
%endif

%pre
getent group openvswitch >/dev/null || groupadd -r openvswitch
getent passwd openvswitch >/dev/null || \
    useradd -r -g openvswitch -d / -s /sbin/nologin \
    -c "Open vSwitch Daemons" openvswitch

%ifarch %{dpdkarches}
    getent group hugetlbfs >/dev/null || groupadd hugetlbfs
    usermod -a -G hugetlbfs openvswitch
%endif
exit 0

%post
if [ $1 -eq 1 ]; then
    sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch

%ifarch %{dpdkarches}
    sed -i \
        's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\
        /etc/sysconfig/openvswitch
%endif
fi
chown -R openvswitch:openvswitch /etc/openvswitch

%if 0%{?systemd_post:1}
    %systemd_post openvswitch.service
%else
    # Package install, not upgrade
    if [ $1 -eq 1 ]; then
        /bin/systemctl daemon-reload >dev/null || :
    fi
%endif

%postun
%if 0%{?systemd_postun:1}
    %systemd_postun openvswitch.service
%else
    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
%endif

%triggerun -- openvswitch < 2.5.0-22.git20160727%{?dist}
# old rpm versions restart the service in postun, but
# due to systemd some preparation is needed.
if systemctl is-active openvswitch >/dev/null 2>&1 ; then
    /usr/share/openvswitch/scripts/ovs-ctl stop >/dev/null 2>&1 || :
    systemctl daemon-reload >/dev/null 2>&1 || :
    systemctl stop openvswitch ovsdb-server ovs-vswitchd >/dev/null 2>&1 || :
    systemctl start openvswitch >/dev/null 2>&1 || :
fi
exit 0

%files -n python3-%{pkgname}
%{python3_sitearch}/ovs
%{python3_sitearch}/ovs-*.egg-info
%doc LICENSE

%files test
%{_bindir}/ovs-pcap
%{_bindir}/ovs-tcpdump
%{_bindir}/ovs-tcpundump
%{_mandir}/man1/ovs-pcap.1*
%{_mandir}/man8/ovs-tcpdump.8*
%{_mandir}/man1/ovs-tcpundump.1*
%{_bindir}/ovs-test
%{_bindir}/ovs-vlan-test
%{_bindir}/ovs-l3ping
%{_mandir}/man8/ovs-test.8*
%{_mandir}/man8/ovs-vlan-test.8*
%{_mandir}/man8/ovs-l3ping.8*
%{python3_sitelib}/ovstest

%files devel
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/openvswitch/*
%{_includedir}/openflow/*
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la

%if 0%{?rhel} > 7 || 0%{?fedora} > 28
%files -n network-scripts-%{name}
%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
%endif

%files
%defattr(-,openvswitch,openvswitch)
%dir %{_sysconfdir}/openvswitch
%{_sysconfdir}/openvswitch/default.conf
%config %ghost %verify(not owner group md5 size mtime) %{_sysconfdir}/openvswitch/conf.db
%ghost %attr(0600,-,-) %verify(not owner group md5 size mtime) %{_sysconfdir}/openvswitch/.conf.db.~lock~
%config %ghost %{_sysconfdir}/openvswitch/system-id.conf
%defattr(-,root,root)
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/openvswitch
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
%{_unitdir}/openvswitch.service
%{_unitdir}/ovsdb-server.service
%{_unitdir}/ovs-vswitchd.service
%{_unitdir}/ovs-delete-transient-ports.service
%{_datadir}/openvswitch/scripts/openvswitch.init
%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
%{_datadir}/openvswitch/scripts/ovs-lib
%{_datadir}/openvswitch/scripts/ovs-save
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/scripts/ovs-ctl
%{_datadir}/openvswitch/scripts/ovs-kmod-ctl
%{_datadir}/openvswitch/scripts/ovs-systemd-reload
%config %{_datadir}/openvswitch/vswitch.ovsschema
%config %{_datadir}/openvswitch/vtep.ovsschema
%{_bindir}/ovs-appctl
%{_bindir}/ovs-dpctl
%{_bindir}/ovs-ofctl
%{_bindir}/ovs-vsctl
%{_bindir}/ovsdb-client
%{_bindir}/ovsdb-tool
%{_bindir}/ovs-pki
%{_bindir}/vtep-ctl
%{_libdir}/*.so.*
%{_sbindir}/ovs-vswitchd
%{_sbindir}/ovsdb-server
%{_mandir}/man1/ovsdb-client.1*
%{_mandir}/man1/ovsdb-server.1*
%{_mandir}/man1/ovsdb-tool.1*
%{_mandir}/man5/ovsdb.5*
%{_mandir}/man5/ovsdb-server.5.*
%{_mandir}/man5/ovs-vswitchd.conf.db.5*
%{_mandir}/man5/vtep.5*
%{_mandir}/man7/ovsdb-server.7*
%{_mandir}/man7/ovsdb.7*
%{_mandir}/man7/ovs-actions.7*
%{_mandir}/man7/ovs-fields.7*
%{_mandir}/man8/vtep-ctl.8*
%{_mandir}/man8/ovs-appctl.8*
%{_mandir}/man8/ovs-ctl.8*
%{_mandir}/man8/ovs-dpctl.8*
%{_mandir}/man8/ovs-kmod-ctl.8.*
%{_mandir}/man8/ovs-ofctl.8*
%{_mandir}/man8/ovs-pki.8*
%{_mandir}/man8/ovs-vsctl.8*
%{_mandir}/man8/ovs-vswitchd.8*
%{_mandir}/man8/ovs-parse-backtrace.8*
%{_udevrulesdir}/91-vfio.rules
%doc LICENSE NOTICE README.rst NEWS rhel/README.RHEL.rst
%ifarch %{dpdkarches}
%doc %{dpdkdir}/README.DPDK-PMDS
%attr(750,openvswitch,hugetlbfs) %verify(not owner group) /var/log/openvswitch
%else
%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch
%endif
/var/lib/openvswitch
%ghost %attr(755,root,root) %verify(not owner group) %{_rundir}/openvswitch
%{_datadir}/openvswitch/bugtool-plugins/
%{_datadir}/openvswitch/scripts/ovs-bugtool-*
%{_bindir}/ovs-dpctl-top
%{_sbindir}/ovs-bugtool
%{_mandir}/man8/ovs-dpctl-top.8*
%{_mandir}/man8/ovs-bugtool.8*
%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} < 29)
%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
%endif

%if %{with ipsec}
%files ipsec
%{_datadir}/openvswitch/scripts/ovs-monitor-ipsec
%{_unitdir}/openvswitch-ipsec.service
%endif

%changelog
* Fri Mar 25 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-169
- Merging upstream branch-2.13 [RH git: 81f1610a56]
    Commit list:
    5d8e080115 system-traffic.at: Fix flaky DNAT load balancing test.


* Mon Mar 21 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-168
- Merging upstream branch-2.13 [RH git: a43ac9e3c0]
    Commit list:
    67baf6c5ad odp-util: Fix output for tc to be equal to kernel.
    d5a2b05e31 netdev-offload-tc: Fix IP and port ranges in flower returns.
    c0b51d66cb netdev-offload-tc: Always include conntrack information to tc.
    abd06ed63b netdev-offload-tc: Check for valid netdev ifindex in flow_put.
    36fe91237c netdev-offload-tc: Set the correct VLAN_VID and VLAN_PCP masks.
    b69970b879 netdev-offload-tc: Add debug logs on tc rule verify failures.
    9f77633c66 tc: Keep header rewrite actions order.


* Fri Mar 18 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-167
- Merging upstream branch-2.13 [RH git: 98b4b38f08]
    Commit list:
    69645206b8 ofproto-dpif-xlate: Avoid successive ct_clear datapath actions.


* Fri Mar 11 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-166
- Merging upstream branch-2.13 [RH git: 0fb64d739c]
    Commit list:
    9fa59d4569 ofp-prop: Silence the 'may be uninitialized' warning.
    f105fbc310 ovsdb-cluster.at: Avoid test failures due to different hashing.


* Mon Mar 07 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-165
- Merging upstream branch-2.13 [RH git: 2b7b5c6551]
    Commit list:
    c9069aa183 ofproto: Use xlate map for uuid lookups.
    43e943141e ofproto: Add refcount to ofproto to fix ofproto use-after-free.


* Sat Mar 05 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-164
- Merging upstream branch-2.13 [RH git: e6b652172d]
    Commit list:
    f501126850 ofproto-dpif: Trigger revalidation when ipfix config set.


* Fri Mar 04 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-163
- Merging upstream branch-2.13 [RH git: 352f0456cb]
    Commit list:
    1a5b8b7c4c tc: Fix stats byte count on fragmented packets.
    d66f391591 compat: Add gen_stats include to define tc hw stats.


* Fri Feb 25 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-162
- Merging upstream branch-2.13 [RH git: 02895de52e]
    Commit list:
    226485590d ovsdb: raft: Fix inability to join the cluster after interrupted attempt. (#2033514)


* Wed Feb 23 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-161
- Merging upstream branch-2.13 [RH git: b782265f2e]
    Commit list:
    c0ee8f841b datapath-windows: Fix NXM_OF_IP_TOS issue


* Thu Feb 17 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-160
- Merging upstream branch-2.13 [RH git: e141303891]
    Commit list:
    cdac9619af ovsdb-idl: Fix use-after-free when destroying an IDL loop.


* Tue Feb 15 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-159
- Merging upstream branch-2.13 [RH git: df7530e646]
    Commit list:
    0f46251323 dp-packet: Ensure packet base is always non-NULL.
    e02a4c1028 bfd: lldp: stp: Fix misaligned packet field access.
    5eb8f56e22 ovsdb-idlc: Avoid accessing member within NULL idl index cursors.
    80263672ad stopwatch: Fix buffer underflow when computing percentiles.


* Wed Feb 09 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-158
- Merging upstream branch-2.13 [RH git: fe171fdd17]
    Commit list:
    ba8cc78271 ofproto: Fix ipfix not always sampling on egress. (#2016346)


* Wed Feb 09 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-157
- Merging upstream branch-2.13 [RH git: 3975fea486]
    Commit list:
    a7d4cd54bb tc: Fix incorrect TC rule for decap+encap datapath flow.


* Tue Feb 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-156
- Merging upstream branch-2.13 [RH git: 8935857122]
    Commit list:
    1760916f1a ovsdb-idl: Clear last_id on reconnect if condition changes in-flight.


* Wed Feb 02 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-155
- Merging upstream branch-2.13 [RH git: 4d9e93b316]
    Commit list:
    62ebef0816 ofproto-dpif-upcall: Fix n_revalidators on upcall show.


* Mon Jan 31 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-154
- Merging upstream branch-2.13 [RH git: 7c20278b9e]
    Commit list:
    feffcbf2b0 ovsdb-idl: ovsdb_idl_loop_destroy must also destroy the committing txn.
    813ddb8a2e ofp-flow: Skip flow reply if it exceeds the maximum message size.


* Wed Jan 26 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-153
- Merging upstream branch-2.13 [RH git: 607e493104]
    Commit list:
    348cdae4b4 ofproto-dpif: Fix issue with non-reversible actions on a patch ports.


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-152
- downstream: Enable usdt probes in build [RH git: 30f6bfcfca]
    Fixes: BZ1840877


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-151
- utilities: Add netlink flow operation USDT probes and upcall_cost script. [RH git: bb307de169]
    This patch adds a series of NetLink flow operation USDT probes.
    These probes are in turn used in the upcall_cost Python script,
    which in addition of some kernel tracepoints, give an insight into
    the time spent on processing upcall.
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Paolo Valerio <pvalerio@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-150
- utilities: Add upcall USDT probe and associated script. [RH git: 2c68e0b4c2]
    Added the dpif_recv:recv_upcall USDT probe, which is used by the
    included upcall_monitor.py script. This script receives all upcall
    packets sent by the kernel to ovs-vswitchd. By default, it will
    show all  upcall events, which looks something like this:
    
     TIME               CPU  COMM      PID      DPIF_NAME          TYPE PKT_LEN FLOW_KEY_LEN
     5952147.003848809  2    handler4  1381158  system@ovs-system  0    98      132
     5952147.003879643  2    handler4  1381158  system@ovs-system  0    70      160
     5952147.003914924  2    handler4  1381158  system@ovs-system  0    98      152
    
    It can also dump the packet and NetLink content, and if required,
    the packets can also be written to a pcap file.
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Paolo Valerio <pvalerio@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-149
- Documentation: Add USDT documentation and bpftrace example. [RH git: 714f513833]
    Add the USDT documentation and a bpftrace example using the
    bridge run USDT probes.
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Paolo Valerio <pvalerio@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-148
- openvswitch: Define the OVS_STATIC_TRACE() macro. [RH git: c47c990c6b]
    This patch defines the OVS_STATIC_TRACE() macro, and as an
    example, adds two of them in the bridge run loop.
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Paolo Valerio <pvalerio@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Tue Jan 25 2022 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-147
- configure: Add --enable-usdt-probes option to enable USDT probes. [RH git: 6bad1cd13d]
    Allow inclusion of User Statically Defined Trace (USDT) probes
    in the OVS binaries using the --enable-usdt-probes option to the
    ./configure script.
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Paolo Valerio <pvalerio@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Fri Jan 21 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-146
- Merging upstream branch-2.13 [RH git: 0b2dac74a2]
    Commit list:
    0df41e29b2 ovs-monitor-ipsec: Fix generated strongSwan ipsec.conf for IPv6.


* Thu Jan 20 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-145
- Merging upstream branch-2.13 [RH git: 035f2095f9]
    Commit list:
    9572c60bfc datapath-windows: Pickup Ct tuple as CT lookup key in function OvsCtSetupLookupCtx


* Tue Jan 18 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-144
- Merging upstream branch-2.13 [RH git: df42b314bc]
    Commit list:
    77750b1b19 Documentation: Fix Rx/Tx queue configuration section.


* Mon Jan 17 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-143
- Merging upstream branch-2.13 [RH git: 52b03eee18]
    Commit list:
    d30d561bd9 ofproto-dpif: Fix memory leak in dpif/show-dp-features appctl.


* Sat Dec 18 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-142
- Merging upstream branch-2.13 [RH git: e2ae994435]
    Commit list:
    025ec93bc5 Prepare for 2.13.7.
    723e0727f3 Set release date for 2.13.6.
    d6d2dead72 ofproto-dpif-xlate: Snoop ingress packets and update neigh cache if needed.
    dc8b79ccf1 tnl-neigh-cache: Do not refresh the entry while revalidating.
    7e1c6034b5 tnl-neigh-cache: Include expected array sizes in prototypes.
    9c98116ac7 tnl-neigh-cache: Read/write expires atomically.


* Thu Dec 09 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-141
- Merging upstream branch-2.13 [RH git: 035911bcc8]
    Commit list:
    0263845fde compat: handle NF_REPEAT error on nf_conntrack_in.


* Mon Dec 06 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-140
- Merging upstream branch-2.13 [RH git: 6a59db52e8]
    Commit list:
    9fa66631c2 flow: Consider dataofs when parsing TCP packets.
    cabeb5d056 tests/flowgen: Fix packet data endianness.
    0b8586fbeb ofproto: Fix resource usage explosion due to removal of large number of flows.
    34801d50e2 ofproto: Fix resource usage explosion while processing bundled FLOW_MOD.
    1910814e5e tests/flowgen: Fix length field of 802.2 data link header.
    6aac7758c0 ovs-lib: Backup and remove existing DB when joining cluster.
    a5e1af7b99 docs/dpdk: Fix install doc.
    6fb9d7ab08 ovs-save: Save igmp flows in ofp_parse syntax.
    0c93c71f8c dpdk: Use DPDK 19.11.10 release.


* Thu Nov 18 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-139
- Merging upstream branch-2.13 [RH git: 37c2767bbd]
    Commit list:
    057a5b0708 ofproto-dpif-xlate: Fix check_pkt_larger incomplete translation.


* Mon Nov 15 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-138
- Merging upstream branch-2.13 [RH git: 424b25f9ca]
    Commit list:
    85358e0a9f datapath-windows: Reset flow key after Ipv4 fragments are reassembled


* Thu Oct 28 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-137
- Merging upstream branch-2.13 [RH git: f86ccc67c2]
    Commit list:
    da5b115580 datapath-windows:Reset PseudoChecksum value only for TX direction offload case


* Wed Oct 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-136
- Merging upstream branch-2.13 [RH git: 25cc09c60a]
    Commit list:
    2c1369aa6d netdev-offload-tc: Verify the flower rule installed.


* Wed Oct 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-135
- Merging upstream branch-2.13 [RH git: 1b6734e549]
    Commit list:
    b73ad3bcf7 ci: Make linux-prepare trust system installs.


* Fri Oct 22 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-134
- Merging upstream branch-2.13 [RH git: c72ff28f03]
    Commit list:
    4d5470a450 Prepare for 2.13.6.
    6771b9c9d7 Set release date for 2.13.5.


* Thu Oct 21 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-133
- Merging upstream branch-2.13 [RH git: d37b008459]
    Commit list:
    70f6efa41c python: idl: Avoid sending transactions when the DB is not synced up.


* Tue Oct 19 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-132
- Merging upstream branch-2.13 [RH git: 60a72ee3f6]
    Commit list:
    5c33e4db80 datapath-windows: add layers when adding the deferred actions


* Thu Oct 14 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-131
- Merging upstream branch-2.13 [RH git: 31c65d3e94]
    Commit list:
    6e2e180851 ofproto-dpif-xlate: Fix zone set from non-frozen-metadata fields.


* Wed Oct 13 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-130
- Merging upstream branch-2.13 [RH git: beb8cdaec6]
    Commit list:
    ceb395773d dpif-netdev: Fix use-after-free on PACKET_OUT of IP fragments.
    fed4df9bb7 tunnel-push-pop.at: Mask source port in tunnel header.


* Tue Oct 12 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-129
- Merging upstream branch-2.13 [RH git: fc819dabd3]
    Commit list:
    ec44c50cf0 ipf: release unhandled packets from the batch


* Thu Sep 30 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-128
- Merging upstream branch-2.13 [RH git: 9d83aff7e3]
    Commit list:
    695d25f507 datapath-windows:adjust Offset when processing packet in POP_VLAN action


* Mon Sep 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-127
- Merging upstream branch-2.13 [RH git: a117849d24]
    Commit list:
    e33aaf8bda cirrus: Reduce memory requirements for FreeBSD VMs.


* Thu Sep 23 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-126
- redhat: use hugetlbfs group for /var/log/openvswitch when dpdk is enabled [RH git: a32eb508f7] (#2007292)
    Resolves: #2007292


* Thu Sep 16 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-125
- Merging upstream branch-2.13 [RH git: 215f08bbd8]
    Commit list:
    a56a8008eb netdev-linux: Fix a null pointer dereference in netdev_linux_notify_sock().
    186ff2a5b2 pcap-file: Fix memory leak in ovs_pcap_open().
    b9b144b8d8 odp-util: Fix a null pointer dereference in odp_flow_format().
    fea883d3bd odp-util: Fix a null pointer dereference in odp_nsh_key_from_attr__().
    ef6d151b04 ipf: Fix only nat the first fragment in the reass process.


* Wed Sep 08 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-124
- Merging upstream branch-2.13 [RH git: b3c7c50935]
    Commit list:
    38efd803dd dpif-netdev: Fix crash when PACKET_OUT is metered.


* Tue Aug 17 2021 Michael Santana <msantana@redhat.com> - 2.13.0-123
- Migrate openvswitch to gitlab [RH git: 081bad43fc]
    Signed-off-by: Michael Santana <msantana@redhat.com>


* Mon Aug 16 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-122
- Merging upstream branch-2.13 [RH git: 775922244f]
    Commit list:
    f61f810fb3 tc: Set action flags for tunnel_key release.
    0dc609a260 netlink-socket: Replace error with txn->error when logging nacked transactions.
    d3776e354c dynamic-string: Fix a crash in ds_clone().


* Mon Aug 16 2021 Michael Santana <msantana@redhat.com> - 2.13.0-121
- pkgtool: Make changelog in spec file more informative [RH git: 42174a9bc1]
    This is done by adding the body of the commit message to the changelong.
    The body is indented and has extra spacing separating each entry in the
    changelog to make each one more discernible since now they could be
    longer.
    
    Also, make sure the bugzilla ID is at the end of the line
    
    Signed-off-by: Michael Santana <msantana@redhat.com>


* Mon Aug 02 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-120
- Merging upstream branch-2.13 [RH git: eda2f50cf9]
    Commit list:
    f7e3b47e09 dpif-netdev: Fix offloads of modified flows.
    350507b163 dpif-netdev: Fix flow modification after failure.


* Mon Jul 26 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-119
- Merging upstream branch-2.13 [RH git: c2e53c3150]
    Commit list:
    f92ce92e53 daemon-unix: Fix leak of a fork error message.


* Wed Jul 21 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-118
- Merging upstream branch-2.13 [RH git: d613ce404a]
    Commit list:
    d794934d01 datapath-windows:Correct checksum for DNAT action


* Sat Jul 17 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-117
- Merging upstream branch-2.13 [RH git: 1dbd295283]
    Commit list:
    9b1c0df6ad dpif-netlink: Fix report_loss() message.
    17e98772cb conntrack: Document all-zero IP SNAT behavior and add a test case.
    305b944a2e ovsdb-server: Fix memleak when failing to read storage.
    1aa1f59142 netdev-linux: Ignore TSO packets when TSO is not enabled for userspace.
    d127fa6d2b conntrack: Handle already natted packets.
    c8ebe4434c python: Fix Idl.run change_seqno update.
    2762bf6895 Prepare for 2.13.5.
    d72ccdfbda Set release date for 2.13.4.
    76fdda2b34 netlink: removed incorrect optimization
    9c386761f9 ovs-actions.xml: Add missing bracket.
    be8c4af1ce netdev-offload-tc: Use nl_msg_put_flag for OVS_TUNNEL_KEY_ATTR_CSUM.


* Wed Jun 30 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-116
- Merging 15251f0e1d datapath-windows: Specify external include .. [RH git: f9d10a495b]
    Commit list:
    15251f0e1d datapath-windows: Specify external include paths
    9f05167b21 Remove Python 2 leftovers.
    64c3133c01 ipf: Fix a use-after-free error, and remove the 'do_not_steal' flag.
    fe7bd42d6c ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy().
    fc23134227 ofproto: Fix potential NULL dereference in ofproto_get_datapath_cap().


* Thu May 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-115
- Merging upstream branch-2.13 [RH git: 190762bf5c]
    Commit list:
    8be19f789b dpif-netlink: Fix send of uninitialized memory in ct limit requests.
    25dd08492d ofproto-dpif: Fix use of uninitialized attributes of timeout policy.
    95570b23c8 netdev-linux: Fix use of uninitialized LAG master name.


* Fri May 21 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-114
- Merging upstream branch-2.13 [RH git: 63656e47fb]
    Commit list:
    160bb80a32 ofp_actions: Fix set_mpls_tc formatting.


* Wed May 19 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-113
- Merging upstream branch-2.13 [RH git: 43b0d45790]
    Commit list:
    32a197f845 dpif-netdev: Remove meter rate from the bucket size calculation.
    1b4d8fe1d9 ovsdb-idl: Consider all tables when computing expected cond seqno.


* Sat May 15 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-112
- Merging upstream branch-2.13 [RH git: 3f4fc768f0]
    Commit list:
    9acbf2cff7 ovs-ofctl: Fix coredump when using "add-groups" command.


* Fri May 14 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-111
- Merging upstream branch-2.13 [RH git: 5eca61ee5e]
    Commit list:
    058702e3dc raft: Transfer leadership before creating snapshots.


* Wed May 12 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-110
- Merging upstream branch-2.13 [RH git: 6022570f3f]
    Commit list:
    3bc41e2b6a dpdk: Use DPDK 19.11.8 release.


* Tue May 11 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-109
- Merging upstream branch-2.13 [RH git: 132c26ba20]
    Commit list:
    fbebe7377d github: Fix up malformed /etc/hosts.
    2a3d1f4971 doc: automake: Add support for sphinx 4.0.
    4ab5524dbb cirrus: Look up existing versions of python dependencies.


* Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-108
- Merging upstream branch-2.13 [RH git: d2edacdddd]
    Commit list:
    ea98fe0743 ofp-group: Use big-enough buffer in ofputil_format_group().


* Wed Apr 21 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-107
- Merging upstream branch-2.13 [RH git: 9a8a649301]
    Commit list:
    798a40ffb6 ofproto/ofproto-dpif-sflow: Check sflow agent in case of race
    9984d61124 dpif: Fix use of uninitialized execute hash.
    43c2a10922 odp-util: Fix use of uninitialized erspan metadata.
    4f68040a5c dpif-netlink: Fix using uninitialized info.tc_modify_flow_deleted in out label.
    1c2a5f170f netdev-offload-tc: Probe for support for any of the ct_state flags.
    a4730043a4 compat: Add ct_state flags definitions.
    bbd62d7a44 tc: Use skip_hw flag when probing tc features.


* Tue Apr 20 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-106
- Fix typo in rh-mock-srpm [RH git: 5641bf9d72]
    Thanks fbl for reporting


* Wed Apr 14 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-105
- Merging upstream branch-2.13 [RH git: 0aaf7c02b7]
    Commit list:
    759da53f07 Add test cases for ingress_policing parameters
    c901a563f4 netdev-linux: correct unit of burst parameter


* Fri Apr 09 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-104
- Merging upstream branch-2.13 [RH git: 1334a398c9]
    Commit list:
    d47800bd66 ovsdb-idl: Mark arc sources as updated when destination is deleted.
    6cf6f9d0d3 ovsdb-idl: Preserve references for deleted rows.
    e7d451ab8a ovsdb-idl.at: Make test outputs more predictable.
    7fca8a3c94 test-ovsdb: Log steps in idl test.
    4ca9dd87f6 test-stream: Silence memory leak report.


* Tue Apr 06 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-103
- Align DPDK config to 19.11.7 [RH git: 62cff1abf5]


* Tue Apr 06 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-102
- Merge tag 'c765f42e31c1baa8f4e7a9e01080f5474596ea98' into fast-datapath-rhel-8 [RH git: 4ef8ee2e1a]
    dpdk-19.11.7


* Fri Apr 02 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-101
- Merging upstream branch-2.13 [RH git: 02b662f992]
    Commit list:
    68086371c8 ipsec: Fix IPv6 default route support for Libreswan.


* Thu Apr 01 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-100
- Merging upstream branch-2.13 [RH git: 7323d4b8e4]
    Commit list:
    2cb952326e ovs-ofctl: Fix segfault due to bad meter n_bands.


* Tue Mar 30 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-99
- Merging upstream branch-2.13 [RH git: 8e7dc3319c]
    Commit list:
    a112239ff5 dpif-netdev: Refactor and fix the buckets calculation.
    d9d8ebfa00 dpif-netdev: Fix the meter buckets overflow.


* Mon Mar 22 2021 Kevin Traynor <ktraynor@redhat.com> - 2.13.0-98
- dpif-netdev: Allow PMD auto load balance with cross-numa. [RH git: edeaca020b] (#1938162)
    commit ec68a877db5bbfba49ddeb9929479c033420ea6b
    Author: Kevin Traynor <ktraynor@redhat.com>
    Date:   Thu Mar 18 11:34:04 2021 +0000
    
        dpif-netdev: Allow PMD auto load balance with cross-numa.
    
        Previously auto load balance did not trigger a reassignment when
        there was any cross-numa polling as an rxq could be polled from a
        different numa after reassign and it could impact estimates.
    
        In the case where there is only one numa with pmds available, the
        same numa will always poll before and after reassignment, so estimates
        are valid. Allow PMD auto load balance to trigger a reassignment in
        this case.
    
        Acked-by: Eelco Chaudron <echaudro@redhat.com>
        Acked-by: David Marchand <david.marchand@redhat.com>
        Tested-by: Sunil Pai G <sunil.pai.g@intel.com>
        Acked-by: Flavio Leitner <fbl@sysclose.org>
        Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
        Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    
    Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1938162
    Conflicts: Commit backported from upstream master branch. Commit not
    present on upstream branch-2.13. Removed NEWS file update as could cause
    future merge conflicts.


* Fri Mar 19 2021 Kevin Traynor <ktraynor@redhat.com> - 2.13.0-97
- redhat: Update docs for test builds [RH git: 0322f225d3]


* Tue Mar 16 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-96
- Merging upstream branch-2.13 [RH git: bb107a7f7f]
    Commit list:
    fc8444fb1d python: Send notifications after the transaction ends.
    712193ff1c ovs-ctl: Allow recording hostname separately.
    3665d7f805 dpif-netdev: Fix crash when add dp flow without in_port field.
    732e17d6b6 Documentation: Fix DPDK qos example.
    1dee0a67e5 raft: Report disconnected in cluster/status if candidate retries election.
    e78d6ffba7 raft: Reintroduce jsonrpc inactivity probes.
    aea5fefdac connmgr: Check nullptr inside ofmonitor_report().
    26fa38c332 ovsdb-client: Fix needs-conversion when SERVER is explicitly specified.
    65582c0bad dpdk: Use DPDK 19.11.6 release.
    967d4055e7 windows, tests: Modify service test.
    ccdfc67b74 netdev-linux: Fix indentation.
    81e759618c ci: Use parallel build for distcheck.
    6d67310f4d ofp-actions: Fix use-after-free while decoding RAW_ENCAP.


* Mon Feb 15 2021 Eelco Chaudron <echaudro@redhat.com> - 2.13.0-95
- conntrack: add generic IP protocol support [RH git: 6b3ca4b028]
    Currently, userspace conntrack only tracks TCP, UDP, and ICMP, and all
    other IP protocols are discarded, and the +inv state is returned. This
    is not in line with the kernel conntrack. Where if no L4 information can
    be extracted it's treated as generic L3. The change below mimics the
    behavior of the kernel.
    
    Resolves: BZ1876459
    
    Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
    Acked-by: Flavio Leitner <fbl@sysclose.org>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit a27d70a8984879bc0a66afc2d7c35149659be24d)


* Wed Feb 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-94
- Merging upstream branch-2.13 [RH git: 8655a639ac]
    Commit list:
    2be25e3b00 Prepare for 2.13.4.
    f25820bf55 Set release date for 2.13.3.
    9a5e78b5c7 cirrus: Use FreeBSD 12.2.
    3512fb512c flow: Support extra padding length.


* Fri Feb 05 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-93
- Merging upstream branch-2.13 [RH git: 2100324b58]
    Commit list:
    a6efca9628 netdev-offload-tc: Reject rules with unsupported ct_state flags.


* Thu Feb 04 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-92
- Merging upstream branch-2.13 [RH git: 92b77d1489]
    Commit list:
    9985c46501 dist-docs: Include manpages generated from rST.


* Wed Feb 03 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-91
- Merging upstream branch-2.13 [RH git: ea87c21ff2]
    Commit list:
    fcae3177d4 tc: Fix mpls bottom of stack bit mask reporting.


* Tue Feb 02 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-90
- dpif-netdev: Add PMD auto load balance status log. [RH git: 4fd540d8ef]
    When any PMD auto load balance parameters change, it is useful
    to also log if the feature is enabled or disabled.
    
    |dpif_netdev|INFO|PMD auto load balance load threshold changed to 70%
    |dpif_netdev|INFO|PMD auto load balance is disabled
    
    Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
    Acked-by: David Marchand <david.marchand@redhat.com>
    Acked-by: Ian Stokes <ian.stokes@intel.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit 30de75520277a39ac775d15d4fa1c9cc886ad5d2)


* Tue Feb 02 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-89
- dpif-netdev: Add parameters to configure PMD auto load balance. [RH git: 5935f7a9d8]
    Two important parts of how PMD auto load balance operates are how
    loaded a core needs to be and how much improvement is estimated
    before a PMD auto load balance can trigger.
    
    Previously they were hardcoded to 95% loaded and 25% variance
    improvement.
    
    These default values may not be suitable for all use cases and
    we may want to use a more (or less) aggressive rebalance, either
    on the pmd load threshold or on the minimum variance improvement
    threshold.
    
    The defaults are not changed, but "pmd-auto-lb-load-threshold" and
    "pmd-auto-lb-improvement-threshold" parameters are added to override
    the defaults.
    
    $ ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-load-threshold="70"
    $ ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-improvement-threshold="20"
    
    Signed-off-by: Christophe Fontaine <cfontain@redhat.com>
    Co-Authored-by: Kevin Traynor <ktraynor@redhat.com>
    Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
    Acked-by: David Marchand <david.marchand@redhat.com>
    Acked-by: Ian Stokes <ian.stokes@intel.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit 62ab5594c20cc815592562af69abb5b8ebe85d55)


* Tue Feb 02 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-88
- dpif-netdev: Add log for PMD auto load balance interval parameter. [RH git: a8f4696c20]
    Previously if the parameter for the PMD auto load balance minimum
    interval was changed at runtime, it was not logged unless the
    PMD auto load balance feature was also changed to enabled.
    
    Log the parameter anytime it changes, and use minutes when it is
    logged as that is the user input format.
    
    Fixes: 5bf84282482a ("Adding support for PMD auto load balancing")
    Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
    Acked-by: David Marchand <david.marchand@redhat.com>
    Acked-by: Ian Stokes <ian.stokes@intel.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit e4db0b69e2d81d8d5ca1265fbfbd08a9b30a1a02)


* Mon Feb 01 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-87
- Merging upstream branch-2.13 [RH git: d303f53850]
    Commit list:
    a5e068f24b netdev-dpdk: Fix incorrect shinfo initialization.
    522d828ae6 github: Don't fail the job if 'apt update' failed.
    81026f0bad vswitchd.xml: Fix supported IPsec tunnels.


* Fri Jan 29 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-86
- Merging upstream branch-2.13 [RH git: 2986e0866e]
    Commit list:
    98723e351f ovsdb-doc: Add build dependency on dirs.py.


* Thu Jan 28 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-85
- Merging upstream branch-2.13 [RH git: f2f6b58dd9]
    Commit list:
    484068b741 dpctl: Fix dpctl process command parameter error.


* Thu Jan 28 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-84
- redhat: Use a mock config based on the buildsystem target [RH git: b820a7b894]


* Thu Jan 28 2021 Flavio Leitner <fbl@redhat.com> - 2.13.0-83
- Merging b37528cef7 conntrack: Fix the icmp conntrack new state. [RH git: dc913c7d4c]
    Commit list:
    b37528cef7 conntrack: Fix the icmp conntrack new state.
    c06328ae57 conntrack: Fix icmp conntrack state.
    8e0a1527d7 odp-util: Fix abort while formatting nsh actions.


* Thu Jan 28 2021 Flavio Leitner <fbl@redhat.com> - 2.13.0-82
- Merging f383000ca6 acinclude: Strip out -mno-avx512f provided .. [RH git: 304ba372e4]
    Commit list:
    f383000ca6 acinclude: Strip out -mno-avx512f provided by DPDK.
    63f2aa2b7d acinclude: Strip out -march provided by DPDK.


* Wed Jan 20 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-81
- Enable AVX512 support on binutils >= 2.30-79.el8 [RH git: 8b3f992902]


* Thu Jan 14 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-80
- Merging upstream branch-2.13 [RH git: b7a6e48410]
    Commit list:
    66fc41bfb2 Prepare for 2.13.3.
    e8ca014102 Set release date for 2.13.2.
    9b00c9c047 lldp: do not leak memory on multiple instances of TLVs
    02e48ecf29 ipf: Avoid accessing to a freed rp.
    999bec82e1 rhel: Fix libunwind dev package.


* Wed Jan 06 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-79
- Merging upstream branch-2.13 [RH git: 86c9f9af77]
    Commit list:
    6c3d1c9f6f ovs-monitor-ipsec: Add option to not restart IKE daemon.
    d9edf71d17 ovs-monitor-ipsec: Allow exit of ipsec daemon maintaining state.
    7286dc4412 ovs-ctl: Use 'stop_daemon' to stop ovs-monitor-ipsec.
    60c6013b7b ovs-monitor-ipsec: Fix active connection regex.
    d59ec5359d ovs-monitor-ipsec: set correct 'leftcert' and 'rightcert' name
    6e1f4ade25 ovs-monitor-ipsec: Add support for tunnel 'local_ip'.
    03ee7466ca ovs-monitor-ipsec: Suppress "unknown %d argument" warning.
    d371c42bbb ovs-monitor-ipsec: Fix _nss_clear_database() parse error.
    ff48c43a59 ovs-ctl: Don't overwrite external-id hostname.


* Wed Dec 23 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-78
- Merging upstream branch-2.13 [RH git: 2cfb47639f]
    Commit list:
    7312222306 odp-util: Fix netlink message overflow with userdata.
    b3c09431ad NEWS: Move '--offload-stats' entry to correct release.
    7c24762d3e ovsdb-tool: Fix datum leak in the show-log command.
    a47647c6ec ofproto-dpif-xlate: Stop forwarding MLD reports to group ports.
    82093f97c5 github: Fix Ubuntu package installation.
    56b81e3ee7 jsonrpc: Avoid disconnecting prematurely due to long poll intervals.


* Fri Dec 04 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-77
- Merging upstream branch-2.13 [RH git: 350e017b66]
    Commit list:
    aacf05c5b8 ovsdb-idl: Fix expected condition seqno when changes are pending.
    db74cd6f4b ovsdb-cluster.at: Fix infinite loop in torture tests.


* Fri Dec 04 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-76
- Merging upstream branch-2.13 [RH git: ece49fb665]
    Commit list:
    cdf4cf4966 lib/tc: fix parse act pedit for tos rewrite


* Thu Dec 03 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-75
- Merging upstream branch-2.13 [RH git: 3e10785905]
    Commit list:
    ac5c067937 ovsdb-idl: Fix use-after-free when deleting orphaned rows.
    60607ba779 ovsdb-idl: Fix memleak when deleting orphan rows.
    08c8a29bf4 ovsdb-idl: Fix memleak when reinserting tracked orphan rows.


* Wed Dec 02 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-74
- Merging upstream branch-2.13 [RH git: 773fc1e75b]
    Commit list:
    d853716dcb python: Update build system to ensure dirs.py is created.
    9ada310291 python: set ovs.dirs variables with build system values
    9342d27a26 datapath: ovs_ct_exit to be done under ovs_lock
    d93d9181f5 compat: rcu: Add support for consolidated-RCU reader checking
    505b916b03 ovsdb-idl: Fix iteration over tracked rows with no actual data.
    1eb6abd6fc Handle refTable values with setkey()
    feec8e6888 tests: Add overflow test for the sha1 library.
    b5a39a7d7f travis: Remove support for Travis CI.
    db5e2bdd3b github: Add GitHub Actions workflow.
    3ff5e400bd ci: Don't use 'native' machine for DPDK cache.


* Thu Nov 19 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-73
- Fix building OVS on ppc64le and armv7hl with Python 3.9 [RH git: a6928f88b2]
    Python 3.9 changed the architecture naming in suffix used for binary
    extensions.
    Use python3-config --extension-suffix in order to figure out the correct
    extension suffix used for binary extensions.
    
    This is not, currently, an issue on RHEL8, but it'll be an issue on
    RHEL9 and it's an issue on Fedora Rawhide.


* Tue Nov 17 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-72
- redhat: Enable ipsec support [RH git: 2c7306b51f] (#1782141)
    Resolves: #1782141


* Mon Nov 16 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-71
- Merging upstream branch-2.13 [RH git: 2aae181525]
    Commit list:
    abe7fe4486 ovsdb-idl: Return correct seqno from ovsdb_idl_db_set_condition().
    03c12fe076 ovsdb-idl: Fix *_is_new() IDL functions.
    1b73731eef ovsdb-idl.at: Return stream open_block python tests.
    b876447179 compat: Fix compile warning.
    cb874fa2f2 compat: Remove stale code.
    6c5cd45051 tests: Add parse-flow tests for MPLS fields.
    fa59781826 ofp-actions: Fix userspace support for mpls_ttl.
    cdf2cf98e3 python: Don't raise an Exception on failure to connect via SSL.
    032fd056fe lldp: correctly increase discarded count
    f051229561 lldp: increase statsTLVsUnrecognizedTotal on unknown TLV
    12ffc6118e lldp: fix a buffer overflow when handling management address TLV
    46b5101de0 lldp: Fix size of PEEK_DISCARD_UINT32()
    364d371c58 lldp: validate a bit more received LLDP frames
    3a3c52b8a2 sha1: Fix algorithm for data bigger than 512 megabytes.
    8ea7e55eb6 odp-util: Fix overflow of nested netlink attributes.


* Wed Nov 11 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-70
- redhat: Fix conf.db permissions in the spec. [RH git: 46d3617298]
    Upstream has removed the read permission from the db file
    because it may incur security concerns, for example, IPsec
    Pre-shared keys are stored in the db.
    
    Fixes: 3e581f43a9 ("ovsdb: Remove read permission of *.db from others.")
    Signed-off-by: Flavio Leitner <fbl@redhat.com>


* Wed Nov 11 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-69
- Merging d43d10e10c netdev-offload-dpdk: Preserve HW statistics.. [RH git: a779495d03]
    Commit list:
    d43d10e10c netdev-offload-dpdk: Preserve HW statistics for modified flows.
    3e581f43a9 ovsdb: Remove read permission of *.db from others.
    1440833435 raft: Make backlog thresholds configurable.
    efc59be2ea raft: Set threshold on backlog for raft connections.


* Mon Nov 09 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-68
- Merging dc5b4e8f69 ovs-bugtool: Fix crash when enable --ovs. [RH git: de7f5508d7]
    Commit list:
    dc5b4e8f69 ovs-bugtool: Fix crash when enable --ovs.


* Thu Nov 05 2020 Ilya Maximets <i.maximets@redhat.com> - 2.13.0-67
- Merging upstream branch-2.13 [RH git: 03753de14f]
    Commit list:
    07049d5b66 bugtool: Fix for Python3.
    625a6f0f0e raft: Avoid having more than one snapshot in-flight.
    fc7a644a73 ovsdb-server: Reclaim heap memory after compaction.
    49453540d9 raft: Add log length to the memory report.


* Wed Nov 04 2020 Ilya Maximets <i.maximets@redhat.com> - 2.13.0-66
- Merging upstream branch-2.13 [RH git: 373b7e9f51]
    Commit list:
    fd29479f04 raft: Report jsonrpc backlog in kilobytes.
    7865bc49d3 ovsdb: Add raft memory usage to memory report.


* Tue Oct 27 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-65
- Merging upstream branch-2.13 [RH git: f9a054c1b5]
    Commit list:
    7a69ccf7e4 raft: Avoid annoying debug logs if raft is connected.
    3a8897322f raft: Fix error leak on failure while saving snapshot.


* Sat Oct 24 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-64
- Merging upstream branch-2.13 [RH git: 73eb33dcf1]
    Commit list:
    9bd5bf4c3a netdev-tc-offloads: Don't delete ufid mapping if fail to delete filter


* Wed Oct 21 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-63
- Merging upstream branch-2.13 [RH git: 6f80f8c230]
    Commit list:
    df3ecbbb6b travis: Fix kernel download retry.
    1c9e73f922 Revert "travis: Disable check for array of flexible structures in sparse."
    1557ce2673 ofp-ed-props: Fix using uninitialized padding for NSH encap actions.


* Wed Oct 21 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-62
- redhat: Add conflicts for older versioned packages [RH git: b1f563c738] (#1886836)
    Resolves: #1886836


* Fri Oct 09 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-61
- Merging upstream branch-2.13 [RH git: fa57a21817]
    Commit list:
    75fbada49b travis: Disable check for array of flexible structures in sparse.
    12c43c2e64 ovsdb-idl.at: Queue for termination all OVSDB IDL pids.
    61e6f03cc3 system-userspace-packet-type-aware.at: Wait for ip address updates.
    6d30b86168 dpif-netdev: Fix typo in copyright header.
    9400845f88 docs: Add flow control on i40e issue


* Wed Sep 16 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-60
- Merging upstream branch-2.13 [RH git: 38d21cf4eb]
    Commit list:
    3c2b1915d2 ipsec: Fix Strongswan configuration syntax.
    610dfdc63d cirrus: Use FreeBSD 11.4.
    0cb432954a selinux: Add missing permissions for ovs-kmod-ctl.
    9a6d26ea30 netdev-dpdk: Don't set rx mq mode for net_virtio.
    183be08223 rhel: Fix reload of OVS_USER_ID on startup.
    90443bc5c6 classifier: Fix use of uninitialized value.
    c38ebe8164 userspace-tso: Document the minimum kernel version.
    faf6651357 rhel: Fix logrotate group when dpdk is enabled.


* Thu Sep 10 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-59
- Merging upstream branch-2.13 [RH git: 4fbcdeb187]
    Commit list:
    4d6846d4d8 ovsdb-idl.at: Wait all servers to join the cluster.


* Thu Aug 27 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-58
- Merging upstream branch-2.13 [RH git: d5817ddabf]
    Commit list:
    ace73aa122 travis: Merge matrix entries.
    9eedff62fe ovs-dpctl-top: Skip "eth()" element.
    9903c42973 meta-flow: fix a typo in "MPLS Bottom of Stack Field" paragraph.
    7f1b52086b python: Fixup python shebangs to python3.
    5d1e1c161a test-conntrack: Fix conntrack benchmark by clearing conntrack metadata.


* Wed Aug 26 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-57
- Merging upstream branch-2.13 [RH git: 2fe3a06bff]
    Commit list:
    14c5912a7b travis: Test build of debian packages.
    823bea7797 debian: Fix broken build after some man pages became generated from RST
    895fc18393 debian: Add python3-sphinx to ovs build dependencies
    b0e8532d01 debian: Fix package dependencies
    0427918d89 connmgr: Support changing openflow versions without restarting.
    d02892966c ovs-monitor-ipsec: Convert Python2 code to Python3.
    8b3fcc65a0 netdev-offload-dpdk: Fix for broken ethernet matching HWOL for XL710NIC.


* Tue Aug 18 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-56
- dpdk: Updated configs to 19.11.3 [RH git: 4e4acaf40a]


* Tue Aug 18 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-55
- Merging 798524b5e3 version: 19.11.3 [RH git: 64c883ec66] (#1868709)
    Commit list:
    798524b5e3 version: 19.11.3
    1e5167d97f mem: mark pages as not accessed when freeing memory
    4153891ad2 net/mlx5: fix packet length assert in MPRQ
    8bec239cff buildtools: get static mlx dependencies for meson
    3196e264f7 net/mlx5: fix build with separate glue lib for dlopen
    f9fde3f8a9 doc: fix reference in ABI guide
    d455442cac Revert "common/qat: fix GEN3 marketing name"
    d764b2cd1f test/crypto: fix statistics case
    b965554c17 eal/ppc: fix bool type after altivec include
    9f090f7c97 net/hns3: replace memory barrier with data dependency order
    05f23c1a24 net/hns3: add free threshold in Rx
    22ae47b85b net/hns3: remove one IO barrier in Rx
    7669265b7f net/hns3: reduce judgements of free Tx ring space
    4341cd6f0c net/hns3: remove unnecessary assignments in Tx
    008d6625ed net/mlx5: fix RSS key copy to TIR context
    987ef3cd66 net/ena/base: fix testing for supported hash function
    5072ef83e7 net/hns3: fix MSI-X interrupt during initialization
    6fdabde3d9 net/hns3: fix Rx interrupt after reset
    eb23edc7c2 net/hns3: fix Tx interrupt when enabling Rx interrupt
    3db4e6aabb net/hns3: fix RSS indirection table configuration
    7cfc979bc9 net/hns3: support different numbers of Rx and Tx queues
    f16148907b net/hns3: support Rx interrupt
    a4f8b13c12 doc: add NASM installation steps
    43e4f20638 doc: fix API index
    106dddaf87 doc: prefer https when pointing to dpdk.org
    130830b165 doc: fix typo in contributors guide
    e9aeb99c93 doc: fix typo in contributors guide
    029c527ef4 examples/ip_pipeline: remove check of null response
    1b2d70662c examples/kni: fix crash during MTU set
    d9da460ee3 net/ixgbe: check driver type in MACsec API
    33189eecd0 net/i40e: fix flow director enabling
    a6c3bc7236 net/ice: fix setting L2TAG
    a46186d063 net/iavf: fix setting L2TAG
    b7a08ea7cd net/i40e: fix setting L2TAG
    696a40bd94 net/sfc/base: fix manual filter delete in EF10
    bea8e15b59 net/hinic: fix TSO
    c4d7293707 net/octeontx2: fix buffer size assignment
    586faf5a4f net/bnxt: fix Rx ring producer index
    1df20ac457 cryptodev: fix SHA-1 digest enum comment
    86809db310 doc: fix build with doxygen 1.8.18
    121f752786 examples/vm_power: drop Unix path limit redefinition
    ba5df75ed5 examples/vm_power: fix build with -fno-common
    4d1fd43b3a net/mvpp2: fix build with gcc 10
    1c2eaf9a98 vhost: fix zero-copy server mode
    3ddb8f1d07 net/i40e: fix queue related exception handling
    69516f9e3f net/ice: fix RSS for GTPU
    f956486556 net/i40e: fix wild pointer
    3af3834731 examples/kni: fix MTU change to setup Tx queue
    4b369799c7 fix same typo in multiple places
    c85044909a mempool/dpaa2: install missing header with meson
    fd2cc33835 kvargs: fix strcmp helper documentation
    0b45ef6e39 doc: fix typos in ABI policy
    a7413810b9 pci: reject negative values in PCI id
    c4d58cd40c pci: accept 32-bit domain numbers
    7b732e25df net/ice/base: update copyright
    0491724e4a common/iavf: update copyright
    75f2750b43 net/i40e/base: update copyright
    3c6d1a0269 net/ixgbe/base: update copyright
    7c36f2ea8b app/testpmd: fix DCB set
    070a7b832d common/mlx5: fix netlink buffer allocation from stack
    8fecf8ad1d net/mlx5: fix doorbell bitmap management offsets
    fc047c800b net/i40e: fix queue region in RSS flow
    099b9e280c net/bnxt: fix storing MAC address twice
    ba15f6288e net/bnxt: fix using RSS config struct
    2109b14aa9 net/bnxt: fix error log for command timeout
    bbcbd194d8 net/qede: fix port reconfiguration
    f9630f56a4 net/virtio: fix unexpected event after reconnect
    c651ee6999 vhost: handle mbuf allocation failure
    1e2a3beb12 net/hinic: fix Tx mbuf length while copying
    b191e32975 net/hinic: fix queues resource free
    733bc3f639 net/vmxnet3: handle bad host framing
    a15ee3e4a7 net/mlx5: fix VLAN flow action with wildcard VLAN item
    4de7d8bc21 net/qede: fix link state configuration
    f98d3de913 net/ixgbe: fix statistics in flow control mode
    22f701a5d4 common/mlx5: fix umem buffer alignment
    348a2c5a9a doc: fix multicast filter feature announcement
    fc962b01c7 net/e1000: fix port hotplug for multi-process
    2e33e6b144 doc: fix build issue in ABI guide
    da5586fcbe eal: fix C++17 compilation
    2d2ba1fb00 doc: fix default symbol binding in ABI guide
    ef254d821e doc: fix LTO config option
    f40d9a3cbb build: disable gcc 10 zero-length-bounds warning
    b02c7838a0 crypto/caam_jr: fix IRQ functions return type
    199d2c49a6 crypto/caam_jr: fix check of file descriptors
    053c7ff9b5 app/eventdev: check Tx adapter service ID
    a23ef1c188 event/dsw: fix enqueue burst return value
    32b5e80df1 crypto/qat: support plain SHA1..SHA512 hashes
    507cda6e23 examples: remove extra new line after link duplex
    83e7cafc27 app: remove extra new line after link duplex
    40a2233e78 net/mlx5: fix Tx queue release debug log timing
    ead66a3fb9 net/mlx4: fix drop queue error handling
    46cd8f27b1 net/mlx5: fix meter color register consideration
    77ca941f9d net/mlx5: fix matching for UDP tunnels with Verbs
    23e2c36fa1 net/mlx5: fix match on empty VLAN item in DV mode
    425b3ccd2d net/ring: fix device pointer on allocation
    39abdde91a net/ice: fix variable initialization
    8ec53ab745 Revert "net/bnxt: fix number of TQM ring"
    ee4518a2de Revert "net/bnxt: fix TQM ring context memory size"
    53038c4760 net/ixgbe: fix link state timing on fiber ports
    61706cf3f2 bus/fslmc: fix size of qman fq descriptor
    eeaa4c42b3 net/dpaa2: fix congestion ID for multiple traffic classes
    a71e30e6b0 net/dpaa2: fix 10G port negotiation
    ef6d112d7d bus/fslmc: fix dereferencing null pointer
    f83c2ba6ea app/testpmd: fix memory failure handling for i40e DDP
    e428b51c18 net/bnxt: fix FW version query
    dafdf58799 net/virtio: fix crash when device reconnecting
    abe65fce86 net/bnxt: fix TQM ring context memory size
    426e8b5253 net/bnxt: fix number of TQM ring
    2befb2f470 net/tap: fix crash in flow destroy
    82e2269d01 net/ice: fix crash in switch filter
    2e1e12f6a8 net/ice: support mark only action for flow director
    f05c433b44 net/ixgbe: fix link status synchronization on BSD
    b639786c5f net/iavf: fix link speed
    6c8f2aef2f net/bnxt: fix possible stack smashing
    1a476dbabd net/netvsc: do not configure RSS if disabled
    f815b93c27 net/netvsc: do RSS across Rx queue only
    bb0fd68c99 bus/vmbus: fix comment spelling
    4fe11771a2 net/netvsc: fix comment spelling
    024a568578 app/testpmd: fix statistics after reset
    556ae6bd83 net/failsafe: fix fd leak
    47bd1f0ad2 ipsec: check SAD lookup error
    7b842acdfa drivers/crypto: disable gcc 10 no-common errors
    b64337ffa3 examples/fips_validation: fix parsing of algorithms
    b168483089 crypto/kasumi: fix extern declaration
    0665fb6e09 crypto/qat: fix cipher descriptor for ZUC and SNOW
    de299dec14 app/crypto-perf: fix display of sample test vector
    9b91b991b6 crypto/ccp: fix fd leak on probe failure
    6e0bdc2ba1 bbdev: fix doxygen comments
    abc111ae3d test/flow_classify: enable multi-sockets system
    a009c7667f event/octeontx2: fix build for O1 optimization
    6fc3588de0 net/ena: fix build for O1 optimization
    c6f6f3d8e1 mempool/octeontx2: fix build for gcc O1 optimization
    2cb0536157 examples/eventdev: fix crash on exit
    fd554a1f8f mem: fix overflow on allocation
    f0ac3aa2d2 examples/l2fwd-keepalive: fix mbuf pool size
    deb055888f remove references to private PCI probe function
    d8aeeb8cfb service: remove rte prefix from static functions
    99303c675d service: fix identification of service running on other lcore
    c4bcf57075 service: fix race condition for MT unsafe service
    c4c9531648 mk: fix static linkage of mlx dependency
    d104eb2c03 common/octeontx: fix gcc 9.1 ABI break
    9022ffe003 event/dsw: avoid reusing previously recorded events
    85c1aae896 eventdev: fix probe and remove for secondary process
    a309eafc89 event/octeontx2: fix queue removal from Rx adapter
    46b7943fda net/mlx5: fix gcc 10 enum-conversion warning
    7e01ad84bf net/mlx5: fix VLAN ID check
    4fdea813e5 net/mlx5: fix assert in modify converting
    831152d0d9 net/mlx5: fix RSS enablement
    ea6b087b9b net/octeontx: fix dangling pointer on init failure
    ee263a1371 net/hns3: fix return value when clearing statistics
    827eb6ca97 net/hns3: fix VLAN PVID when configuring device
    6686131671 net/softnic: fix resource leak for pipeline
    60dfeffc23 net/softnic: fix memory leak for thread
    e399ff6427 net/sfc/base: fix build when EVB is enabled
    5862e3fe62 net/sfc/base: use simpler EF10 family run-time checks
    68409f9a6c net/sfc/base: use simpler EF10 family conditional check
    ecd69bfb76 net/mlx5: fix actions validation on root table
    58ca518c24 net/mlx5: fix assert in dynamic metadata handling
    a6ae060e39 vhost: prevent zero-copy with incompatible client mode
    5099fb8d59 vhost: fix peer close check
    fd7ba64cb4 net/mlx5: fix assert in doorbell lookup
    d6db84d0b1 net/i40e: fix flush of flow director filter
    a42e979217 doc: add i40e limitation for flow director
    74095b0ca6 net/i40e: fix flow director for ARP packets
    fe42bb4b74 net/bnxt: fix max ring count
    a131ab7d0f eal/ppc: fix build with gcc 9.3
    2acc78a0a1 kvargs: fix invalid token parsing on FreeBSD
    df17bcb43b eal/x86: ignore gcc 10 stringop-overflow warnings
    274dec7548 examples/ipsec-gw: fix gcc 10 maybe-uninitialized warning
    ea0fb3e5a5 net/avp: fix gcc 10 maybe-uninitialized warning
    daa2cd115f eal: fix typo in endian conversion macros
    9ef2246962 doc: fix log level example in Linux guide
    aecc7782a6 app/testpmd: add parsing for QinQ VLAN headers
    26467e800b net/bnxt: fix VNIC Rx queue count on VNIC free
    61c8f03fd4 net/bnxt: fix memory leak during queue restart
    e09bf2672d bus/pci: fix UIO resource access from secondary process
    35348ca71e usertools: check for pci.ids in /usr/share/misc
    a8e6e27b00 app: fix usage help of options separated by dashes
    0d7e4fbf2d fix various typos found by Lintian
    ccc676944f timer: protect initialization with lock
    6be8fba616 eal: fix comments spelling
    32688549a0 lpm6: fix comments spelling
    eee7a4f089 lpm6: fix size of tbl8 group
    8426cebb49 mempool: remove inline functions from export list
    632fec749f security: fix crash at accessing non-implemented ops
    0407d17dae net/bnxt: fix VLAN add when port is stopped
    a62880c4d4 net/bnxt: fix port start failure handling
    6cc939165f net/bnxt: use true/false for bool types
    886085974e net/bnxt: fix HWRM command during FW reset
    c1b7cb6792 net/iavf: fix stats query error code
    ca2ecc15f2 net/ixgbe: fix link status after port reset
    9a673fc544 net/ixgbe: fix resource leak after thread exits normally
    4c84ef15a7 net/mlx5: improve logging of MPRQ selection
    f0a019c950 net/mlx5: set dynamic flow metadata in Rx queues
    bf10f18c64 net/mlx5: fix header modify action validation
    da5c4ff51b net/mlx5: fix crash when releasing meter table
    a9018074d1 common/mlx5: fix build with rdma-core 21
    461a2ba67a net/i40e: fix flow director initialisation
    ac051be918 net/tap: fix queues fd check before close
    4c587687f7 net/virtio-user: fix devargs parsing
    74a51ef091 vhost: fix shadowed descriptors not flushed
    2f48b05305 vhost: fix shadow update
    d28299df0a net/tap: fix unexpected link handler
    8e90f78a02 net/tap: fix fd leak on creation failure
    2523e877dc net/tap: fix file close on remove
    2b74a885aa net/tap: fix check for mbuf number of segment
    2fe4af64f9 net/tap: fix mbuf and mem leak during queue release
    908866e6fc net/tap: fix mbuf double free when writev fails
    ab9701159d net/mlx5: fix validation of push VLAN without full mask
    d2f4d1ae3d net/mlx5: fix push VLAN action to use item info
    1603ade39c net/enic: fix flow action reordering
    d3c99e41b1 net/mlx5: fix jump table leak
    652a21028a net/mlx5: fix meter suffix table leak
    afca8bc661 net/mlx5: add multi-segment packets in MPRQ mode
    bbdd1a9c79 net/mlx5: enable MPRQ multi-stride operations
    a1b3dc84bc net/mlx5: add device parameter for MPRQ stride size
    31d1b373d5 net/i40e: relax barrier in Tx for NEON
    85897fd567 net/octeontx2: disable unnecessary error interrupts
    6075a1ee65 net/octeontx2: enable error and RAS interrupt in configure
    fd2f1973f4 net/mlx5: use open/read/close for ib stats query
    624db5a0ab net/mlx4: fix build with -fno-common
    b3e01cd3e4 common/mlx5: fix build with -fno-common
    be0d36b087 net/hns3: fix VLAN filter when setting promisucous mode
    c6f7d75949 net/hns3: fix default VLAN filter configuration for PF
    0bd1d3b49c net/hns3: fix RSS key length
    c4e9d7e10c net/hns3: add RSS hash offload to capabilities
    50daf2acc9 net/hns3: clear residual flow rules on init
    1ff55a18be vhost: make IOTLB cache name unique among processes
    c0c67a2dac vhost: remove unused variable
    871773f3ac net/virtio: fix outdated comment
    4f5f084c7f net/vhost: fix potential memory leak on close
    b35cbd50b9 vhost: fix packed ring zero-copy
    e624761604 vhost/crypto: add missing user protocol flag
    11d9847039 net/hinic/base: fix PF firmware hot-active problem
    f662af80b1 net/null: remove redundant check
    bfc5290bc8 net/null: fix secondary burst function selection
    670758fe8b net/pfe: fix double free of MAC address
    175f707d92 app/testpmd: fix PPPoE flow command
    03527bd393 net/mlx5: fix counter container usage
    2c0c0e4820 net/ena: set IO ring size to valid value
    59acd7de4c net/ena/base: fix indentation of multiple defines
    3c4bf79460 net/ena/base: fix indentation in CQ polling
    3c6ec30057 net/ena/base: fix documentation of functions
    c6730185e0 net/ena/base: prevent allocation of zero sized memory
    d5cfa58c05 net/ena/base: make allocation macros thread-safe
    af84a4f278 net/ice/base: remove unused code in switch rule
    5cfef294de net/ice: fix RSS advanced rule
    46825a9e59 net/nfp: fix dangling pointer on probe failure
    d027444df5 net/nfp: fix log format specifiers
    61347b53bb examples/vmdq: fix RSS configuration
    267e255ef4 ethdev: fix build when vtune profiling is on
    c6f822199a net/memif: fix resource leak
    4f880a2089 net/netvsc: avoid possible live lock
    9f54fa3e2b net/netvsc: handle Tx completions based on burst size
    62ec946eec net/netvsc: remove process event optimization
    81441b4e4f net/netvsc: fix memory free on device close
    42916635b3 net/netvsc: split send buffers from Tx descriptors
    244193073d net/netvsc: handle Rx packets during multi-channel setup
    cc1f006253 net/netvsc: propagate descriptor limits from VF
    39e690ab3b net/ice: fix input set of VLAN item
    175dc210ad net/ice: add action number check for switch
    1b23b24565 net/ice: change default tunnel type
    8e8fdd68f7 net/octeontx2: fix device configuration sequence
    272fcab063 net/octeontx: fix meson build for disabled drivers
    d50174f38a net/tap: remove unused assert
    f50974db04 net/ice/base: check memory pointer before copying
    3e51abed66 net/ice/base: fix binary order for GTPU filter
    7ba59c1fd4 net/mlx5: fix imissed counter overflow
    e7c5383a09 net/thunderx: use dynamic log type
    3e0d3b1204 net/dpaa: use dynamic log type
    516f5f9136 net/bnxt: do not use PMD log type
    45284045c5 net/pfe: do not use PMD log type
    64ca12ff65 net/tap: do not use PMD log type
    0bf29e36c3 net/virtio: do not use PMD log type
    80e04ea6ae net/mvneta: do not use PMD log type
    1b70d8acd0 examples/vmdq: fix output of pools/queues
    d9a7bf74e1 net/mlx5: fix zero value validation for metadata
    5e3859176e net/mlx5: fix call to modify action without init item
    24f6ab6d31 net/mlx5: update VLAN and encap actions validation
    2491443dce net/mlx5: fix metadata for compressed Rx CQEs
    c469619b7a net/mlx5: fix validation of VXLAN/VXLAN-GPE specs
    4493efb719 net/ixgbe: fix link status inconsistencies
    117ecae920 net/ice/base: fix MAC write command
    d57cbe48b2 net/ice/base: minor fixes
    b97902938a net/ice/base: read PSM clock frequency from register
    d1cd22be97 net/ice/base: fix uninitialized stack variables
    8081044a6f net/hns3: fix return value of setting VLAN offload
    2717e6ab25 net/hns3: fix mailbox opcode data type
    70b22c9ed2 net/hns3: fix configuring RSS hash when rules are flushed
    7953227c19 net/ipn3ke: use control thread to check link status
    d57282791c net/hinic/base: fix port start during FW hot update
    4710da6ef5 net/hinic: fix LRO
    7caa43cc22 net/hns3: fix status after repeated resets
    3f9c9bdcb5 net/hns3: fix configuring illegal VLAN PVID
    b6c05b0781 net/hns3: fix crash when flushing RSS flow rules with FLR
    1cd4ab6cf4 net/hns3: fix default error code of command interface
    e9248b23b3 net/hns3: fix packets offload features flags in Rx
    ebad6ac59a test: remove redundant macro
    b54822ff2f security: fix session counter
    477f8e08d3 security: fix return types in documentation
    4fa404e280 security: fix verification of parameters
    48bb740ce1 crypto/openssl: fix out-of-place encryption
    8d5349e781 test/crypto: fix flag check
    9aa6caeb5a drivers/crypto: fix log type variables for -fno-common
    46a37b23ba cryptodev: add asymmetric session-less feature name
    efd0dea9c8 drivers: fix log type variables for -fno-common
    2ef9870118 vfio: fix use after free with multiprocess
    5732151922 vfio: fix race condition with sysfs
    952892aa67 eal: fix PRNG init with HPET enabled
    8eefb8787a doc: fix matrix CSS for recent sphinx
    da57576513 log: fix level picked with globbing on type register
    bd5e2ef80a ipsec: fix build dependency on hash lib
    c4d52beff8 doc: fix sphinx compatibility
    b0843e5671 event/dsw: remove unnecessary read barrier
    09a714399a event/dsw: remove redundant control ring poll
    b9b72b8815 crypto/nitrox: fix oversized device name
    b878b432b7 crypto/nitrox: fix CSR register address generation
    3b841d16dc baseband/turbo_sw: fix exposed LLR decimals assumption
    2193048d87 test/ipsec: fix crash in session destroy
    152fadd540 common/qat: fix GEN3 marketing name
    196993b705 cryptodev: fix missing device id range checking
    ca31f0aee2 fib: fix headers for C++ support
    1c51807a35 ci: fix telemetry dependency in Travis
    39adba3b55 bus/pci: fix devargs on probing again
    c285902e7b kvargs: fix buffer overflow when parsing list
    bbf0c2d983 test/kvargs: fix invalid cases check
    bcdd4476cd test/kvargs: fix to consider empty elements as valid
    9aebba7e3d mem: preallocate VA space in no-huge mode
    46cd0c98bb eal/freebsd: fix queuing duplicate alarm callbacks
    7ad8cd364e test: skip some subtests in no-huge mode
    796af72c2d test: load drivers when required
    7c8ab0ae70 devtools: fix symbol map change check
    4710904861 contigmem: cleanup properly when load fails
    6e0c764098 net/mlx5: reduce Tx completion index memory loads
    307876a747 net/mlx5: fix CVLAN tag set in IP item translation
    7ad364893c net/hinic: allocate IO memory with socket id
    75457cff3f net/mlx5: fix zero metadata action
    8ea2ea8fe4 net/sfc/base: handle manual and auto filter clashes in EF10
    c6ae74f068 net/sfc/base: refactor filter lookup loop in EF10
    9e496b76ab net/sfc/base: reject automatic filter creation by users
    0e4497208a net/sfc/base: reduce filter priorities to implemented only
    c239286b98 net/sfc: set priority of created filters to manual
    8771074d95 net/sfc: fix promiscuous and allmulticast toggles errors
    6c1634ec93 ethdev: fix spelling
    7aa0060a2a net/hns3: fix promiscuous mode for PF
    32f349234b net/hinic: fix repeating cable log and length check
    d16cceef30 net/hinic: fix snprintf length of cable info
    d40bcdfb59 net/memif: fix init when already connected
    ba2322fb9a build: support MinGW-w64 with Meson
    5cdff30419 net/mlx5: fix mask used for IPv6 item validation
    7ce629f7f2 net/ice: remove bulk alloc option
    a42ef6f777 net/sfc: fix Rx queue start failure path
    251cb7e722 net/sfc: fix initialization error path
    5f0378bb2e net/vmxnet3: fix RSS setting on v4
    556cdccab2 net/sfc: fix reported promiscuous/multicast mode
    194ca60cde doc: fix number of failsafe sub-devices
    adf15e37f2 net/ice: remove unnecessary variable
    2847184082 net/enetc: fix Rx lock-up
    aec781c6b1 net/ice: fix hash flow crash
    2ce2096092 net/i40e: fix X722 performance
    64a38788d1 net/mlx5: fix VLAN PCP item calculation
    3e387d591e net/i40e: relax barrier in Tx
    2550666028 net/octeontx2: fix link information for loopback port
    c2e90f337d build: fix linker warnings with clang on Windows
    3262e4181c pci: fix build on ppc
    5a99c0d994 pci: fix build on FreeBSD
    027e022a18 pci: remove unneeded includes in public header file
    9ca664d8be telemetry: fix port stats retrieval
    c20055f471 service: fix crash on exit
    d0e456e9b1 mem: mark pages as not accessed when reserving VA
    bcf4069ff2 eal/arm64: fix precise TSC
    40a7c85881 eal: fix log message print for regex
    2a46dc5951 drivers/crypto: fix build with make 4.3
    3425ff8896 drivers: add crypto as dependency for event drivers
    25fe1c8b05 examples/qos_sched: fix build with gcc 10
    4de659fdc0 examples/eventdev: fix build with gcc 10
    84119ecce2 examples/vhost_blk: fix build with gcc 10
    5fb297ba3d app/pipeline: fix build with gcc 10
    ef348e22a0 test: fix build with gcc 10
    295ba7d0c3 crypto/octeontx2: fix build with gcc 10
    
    Resolves: #1868709


* Thu Aug 13 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-54
- Merging upstream branch-2.13 [RH git: 5dddb2d4f8]
    Commit list:
    0047ca3a02 acinclude: Fix build with kernels with prandom* moved to prandom.h.
    8a72db60ad faq: Mention Linux kernel versions supported by 2.13.x.
    114ff63e3d Documentation: Fix kernel support matrix


* Mon Aug 10 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-53
- Merging upstream branch-2.13 [RH git: bb436c2999]
    Commit list:
    184a58e8b8 ovsdb-server: Replace in-memory DB contents at raft install_snapshot.
    727bb3440d Prepare for 2.13.2.
    714caaf571 Set release date for 2.13.1.
    ac51dcac87 odp-util: Clear padding in the nd_extension.
    eeef00da2f datapath-windows: Update flow key in SET action
    37606fb5ca odp-util: Fix clearing match mask if set action is partially unnecessary.
    5ad46c9a4d debian: Fixed openvswitch-test package dependency.
    b3a9dc6e5e dpctl: Fix memory leak in dpctl_dump_flows()
    cce57c5e0e ovs-router: Fix flushing of local routes.
    8d0b409fcc acinclude: Remove libmnl for MLX5 PMD.
    217ac490ac dpif-netdev: Avoid deadlock with offloading during PMD thread deletion.


* Mon Aug 10 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-52
- ovsdb-server: Replace in-memory DB contents at raft install_snapshot. [RH git: 9f646ec051] (#1867185)
    Every time a follower has to install a snapshot received from the
    leader, it should also replace the data in memory. Right now this only
    happens when snapshots are installed that also change the schema.
    
    This can lead to inconsistent DB data on follower nodes and the snapshot
    may fail to get applied.
    
    Fixes: bda1f6b60588 ("ovsdb-server: Don't disconnect clients after raft install_snapshot.")
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit 184a58e8b892231b44479b612bdfe2529bb04363)
    
    Resolves: #1867185


* Sat Aug 08 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-51
- redhat: Add support to custom RPM releases. [RH git: 7eb5b56344]
    This commit allows the developer to specify a custom release
    string to be appended to package NVR.
    
    If the custom release is 'bz123456', the final release would
    look like -Y.bz123456.X where Y is the number of changes
    until the branch was created, and X is the number of changes
    after that.


* Sat Aug 08 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-50
- pkgtool: Use OVS static version in package NVR. [RH git: a0b572aaa1]
    The package NVR must coincide with the tarball version.


* Thu Jul 30 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-49
- odp-util: Fix clearing match mask if set action is partially unnecessary. [RH git: 6d85fea8b4] (#1862153)
    While committing set() actions, commit() could wildcard all the fields
    that are same in match key and in the set action.  This leads to
    situation where mask after commit could actually contain less bits
    than it was before.  And if set action was partially committed, all
    the fields that were the same will be cleared out from the matching key
    resulting in the incorrect (too wide) flow.
    
    For example, for the flow that matches on both src and dst mac
    addresses, if the dst mac is the same and only src should be changed
    by the set() action, destination address will be wildcarded in the
    match key and will never be matched, i.e. flows with any destination
    mac will match, which is not correct.
    
    Setting OF rule:
    
     in_port=1,dl_src=50:54:00:00:00:09 actions=mod_dl_dst(50:54:00:00:00:0a),output(2)
    
    Sending following packets on port 1:
    
      1. eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800)
      2. eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0c),eth_type(0x0800)
      3. eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800)
    
    Resulted datapath flows:
      eth(dst=50:54:00:00:00:0c),<...>, actions:set(eth(dst=50:54:00:00:00:0a)),2
      eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),<...>, actions:2
    
    The first flow  doesn't have any match on source MAC address and the
    third packet successfully matched on it while it must be dropped.
    
    Fix that by updating the match mask with only the new bits set by
    commit(), but keeping those that were cleared (OR operation).
    
    With fix applied, resulted correct flows are:
      eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),<...>, actions:2
      eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0c),<...>,
                                        actions:set(eth(dst=50:54:00:00:00:0a)),2
      eth(src=50:54:00:00:00:0b),<...>, actions:drop
    
    The code before commit dbf4a92800d0 was not able to reduce the mask,
    it was only possible to expand it to exact match, so it was OK to
    update original matching mask with the new value in all cases.
    
    Fixes: dbf4a92800d0 ("odp-util: Do not rewrite fields with the same values as matched")
    Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1854376
    Acked-by: Eli Britstein <elibr@mellanox.com>
    Tested-by: Adrián Moreno <amorenoz@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    (cherry picked from commit 37606fb5ca76aef478a51d407aaa06caf7fb9376)
    
    Resolves: #1862153


* Thu Jul 16 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-48
- redhat: Clean old changelog entries. [RH git: 6cf8d909e8]
    Fix the changelog shift caused by use of static references
    and remove the old entries not relevant to the new tarball.
    
    Fixes: 90ac9bd6aa ("redhat: Use static references.")


* Thu Jul 16 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-47
- redhat: Update the documentation. [RH git: c9571d2dad]


* Thu Jul 16 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-46
- redhat: Add merge script. [RH git: 752c59ba74]
    This script helps to provide a standard commit log.


* Thu Jul 16 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-45
- redhat: Use static references. [RH git: f1025c1515]
    Add static references because there could be patches after SHA_REF
    not available in newer tarballs. Therefore, it is only possible to
    update the references if all previous patches are applied in the new
    references.


* Wed Jul 15 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-44
- Update DPDK configs to v19.11.2. [RH git: 98e6e9823b]


* Wed Jul 15 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-43
- Merge DPDK tag 'v19.11.2' into fast-datapath-rhel-8 [RH git: 755e86c61a]


* Wed Jul 15 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-42
- Merging upstream branch-2.13 to fast-datapath-rhel-8 [RH git: 735b3f94c2]
    Commit list:
    bef407fa7f dpdk: Use DPDK 19.11.2 release.
    53e0568753 dpif-netdev: Return error code when no mark available.
    99a4564348 dpif-netdev: Add check mark to avoid ovs-vswitchd crash.
    22c6148a9a netdev-offload-dpdk: Fix Ethernet matching for type only.
    9747d5649b dpif-netdev: Don't use zero flow mark.
    39cc59dc91 netdev-linux: Fix broken build on Ubuntu 14.04
    ac92cdbc4d odp-execute: Fix length checking while executing check_pkt_len action.
    08ad9f6483 odp-util.c: Fix dp_hash execution with slowpath actions.
    5351651d37 ctags: Include new annotations to ctags ignore list.
    d5484cf697 lib/tc: only update the stats for non-empty counter
    998475d79f datapath-windows, conntrack: Fix conntrack new state
    6dbbf0771e bridge: Fix null dereference on ct_timeout_policy record
    3e5991a75e rhel: Fix syntax error when matching version.
    59cedd3b35 rhel: Support RHEL 7.8 kernel module rpm build.
    78ac2896d1 dpif-netlink: Fix Windows incompatibility when setting new feature
    51e9479da6 ovsdb-idl: Avoid inconsistent IDL state with OVSDB_MONITOR_V3.
    8ba057d345 ovs-rcu: Avoid flushing callbacks during postponing.
    b24ff56441 raft: Avoid sending equal snapshots.
    a33880c6e9 ovsdb: Fix timeout type for wait operation.
    7077328846 classifier: Prevent tries vs n_tries race leading to NULL dereference.
    a29fe0d482 ovsdb-server: Fix schema leak while reading db.
    1bb5be5138 compat: Backport ipv6_stub change
    71acf83c33 netdev-offload-tc: Re-fetch block ID after probing.
    23e3ae7158 netdev-linux: Update LAG in all cases.
    85fe081852 ofproto: Fix statistics of removed flow.
    6bd9ddc829 metaflow: Fix maskable conntrack orig tuple fields
    1600e0040c raft: Disable RAFT jsonrpc inactivity probe.
    168beb87ca raft: Fix leak of the incomplete command.
    da9dc791de compat: Fix ipv6_dst_lookup build error
    a09e22dbdd system-traffic: Check frozen state handling with TLV map change
    b267889057 tun_metadata: Fix coredump caused by use-after-free bug
    d323c5398f cirrus: Force pkg update on FreeBSD.
    62cede43ee Revert "ovsdb-idl: Avoid sending redundant conditional monitoring updates"
    b52877a483 dpif-netdev: Force port reconfiguration to change dynamic_txqs.
    dc389fd319 netdev-offload-tc: Flush rules on ingress block when init tc flow api
    e2f6393592 conntrack: Reset ct_state when entering a new zone.
    314bd235c1 ofp-actions: Fix memory leak.
    1f12a91cf9 ofproto-dpif-xlate: Fix recirculation when in_port is OFPP_CONTROLLER.
    8315f3cc98 conntrack: Fix NULL pointer dereference.
    89c85b997c dpif-netlink: avoid netlink modify flow put op failed after tc modify flow put op failed.
    49db27d213 dpif-netdev: Enter quiescent state after each offloading operation.
    bf2dcbfe5c pvector: Use acquire-release semantics for size.
    443f8e2575 tc: Fix nat port range when offloading ct action
    d69d4c0537 travis: Disable sindex build in sparse.
    25a7e5547f raft: Fix the problem of stuck in candidate role forever.
    877618fc83 raft: Fix next_index in install_snapshot reply handling.
    3ae90e1899 raft: Avoid busy loop during leader election.
    adc64ab057 raft: Fix raft_is_connected() when there is no leader yet.
    f0c8b44c58 ovsdb-server: Don't disconnect clients after raft install_snapshot.
    78c8011f58 raft-rpc: Fix message format.
    f0de491257 ovs-dpctl-top: python3 compatibility
    00dd014519 dpif-netdev.at: Fix partial offloading test cases failure.
    6f86b10549 userspace TSO: SCTP checksum offload optional.
    b837d1fdc4 userspace TSO: Include UDP checksum offload.
    ad550ebc36 netdev-dpdk: vhost: disable unsupported offload features.
    3f83220418 docs: Update conntrack established state description
    dd0293c8b5 conntrack: Fix TCP conntrack state
    0aefc0eb8e docs: Update DPDK version table
    d33cc044f3 Prepare for 2.13.1.


* Sun Jul 12 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-41
- redhat: Rename OVSCI job name. [RH git: a61f1d1095]
    The OVSCI job's name has been renamed to follow a standard.


* Wed Jul 08 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-40
- redhat: pkgtool: use diff instead of format-patch [RH git: da2129ac82]


* Thu Jun 25 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-39
- bus/pci: fix VF memory access [RH git: 2b22bcd9ad] (#1851169)
    To fix CVE-2020-12888, the linux vfio-pci module will invalidate mmaps
    and block MMIO access on disabled memory, it will send a SIGBUS to the
    application:
    https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=abafbc551fdd
    
    When the application opens the vfio PCI device, the vfio-pci module will
    enable the bus memory space through PCI read/write access. According to
    the PCIe specification, the 'Memory Space Enable' is always zero for VF:
    
                 Table 9-13 Command Register Changes
    
    Bit Location | PF and VF Register Differences | PF         | VF
                 | From Base                      | Attributes | Attributes
    -------------+--------------------------------+------------+-----------
                 | Memory Space Enable - Does not |            |
                 | apply to VFs. Must be hardwired|  Base      |  0b
         1       | to 0b for VFs. VF Memory Space |            |
                 | is controlled by the VF MSE bit|            |
                 | in the VF Control register.    |            |
    -------------+--------------------------------+------------+-----------
    
    Afterwards the vfio-pci will initialize its own virtual PCI config space
    data ('vconfig') by reading the VF's physical PCI config space, then the
    'Memory Space Enable' bit in vconfig will always be 0b value. This will
    make the vfio-pci treat the BAR memory space as disabled, and the SIGBUS
    will be triggered if access these BARs.
    
    By investigation, the VF PCI device *passthrough* into the Guest OS by
    QEMU has the 'Memory Space Enable' with 1b value. That's because every
    PCI driver will start to enable the memory space, and this action will
    be hooked by vfio-pci virtual PCI read/write to set the 'Memory Space
    Enable' in vconfig space to 1b. So VF runs in guest OS has 'Mem+', but
    VF runs in host OS has 'Mem-'.
    
    Align with PCI working mode in Guest/QEMU/Host, in DPDK, enable the PCI
    bus memory space explicitly to avoid access on disabled memory.
    
    Fixes: 33604c31354a ("vfio: refactor PCI BAR mapping")
    Cc: stable@dpdk.org
    
    Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
    Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
    Tested-by: Harman Kalra <hkalra@marvell.com>
    Tested-by: David Marchand <david.marchand@redhat.com>
    Tested-by: Thierry Martin <thierry.martin.public@gmail.com>
    (cherry picked from commit 54f3fb127d9c265a5724d193e5c7c6db29fb4150)
    
    Resolves: #1851169


* Fri Jun 05 2020 Ilya Maximets <i.maximets@redhat.com> - 2.13.0-38
- raft: Avoid sending equal snapshots. [RH git: 3168eba559] (#1834838)
    [ upstream commit 8c2c503bdb0da1ce6044a53d462f905fd4f8acf5 ]
    
    Snapshots are huge.  In some cases we could receive several outdated
    append replies from the remote server.  This could happen in high
    scale cases if the remote server is overloaded and not able to process
    all the raft requests in time.  As an action to each outdated append
    reply we're sending full database snapshot.  While remote server is
    already overloaded those snapshots will stuck in jsonrpc backlog for
    a long time making it grow up to few GB.  Since remote server wasn't
    able to timely process incoming messages it will likely not able to
    process snapshots leading to the same situation with low chances to
    recover.  Remote server will likely stuck in 'candidate' state, other
    servers will grow their memory consumption due to growing jsonrpc
    backlogs:
    
    jsonrpc|INFO|excessive sending backlog, jsonrpc: ssl:192.16.0.3:6644,
                 num of msgs: 3795, backlog: 8838994624.
    
    This patch is trying to avoid that situation by avoiding sending of
    equal snapshot install requests.  This helps maintain reasonable memory
    consumption and allows the cluster to recover on a larger scale.
    
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    
    Related: #1834838
    Signed-off-by: Ilya Maximets <i.maximets@redhat.com>


* Fri Jun 05 2020 Ilya Maximets <i.maximets@redhat.com> - 2.13.0-37
- ovsdb-server: Fix schema leak while reading db. [RH git: 92a1e56c8a] (#1834838)
    [ upstream commit 16e3a80cf646f6c53d22ef98599d5aecb8310414 ]
    
    parse_txn() function doesn't always take ownership of the 'schema'
    passed.  So, if the schema of the clustered db has same version as the
    one that already in use, parse_txn() will not use it, resulting with a
    memory leak:
    
     7,827 (56 direct, 7,771 indirect) bytes in 1 blocks are definitely lost
        at 0x483BB1A: calloc (vg_replace_malloc.c:762)
        by 0x44AD02: xcalloc (util.c:121)
        by 0x40E70E: ovsdb_schema_create (ovsdb.c:41)
        by 0x40EA6D: ovsdb_schema_from_json (ovsdb.c:217)
        by 0x415EDD: ovsdb_storage_read (storage.c:280)
        by 0x408968: read_db (ovsdb-server.c:607)
        by 0x40733D: main_loop (ovsdb-server.c:227)
        by 0x40733D: main (ovsdb-server.c:469)
    
    While we could put ovsdb_schema_destroy() in a few places inside
    'parse_txn()', from the users' point of view it seems better to have a
    constant argument and just clone the 'schema' if needed.  The caller
    will be responsible for destroying the 'schema' it owns.
    
    Fixes: 1b1d2e6daa56 ("ovsdb: Introduce experimental support for clustered databases.")
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    
    Related: #1834838
    Signed-off-by: Ilya Maximets <i.maximets@redhat.com>


* Fri Jun 05 2020 Ilya Maximets <i.maximets@redhat.com> - 2.13.0-36
- ovsdb: Add raft memory usage to memory report. [RH git: fb32a78921] (#1834838)
    [ upstream commit 3423cd97f88fe6a8de8b649d79fe6ac83bce94d1 ]
    
    Memory reports could be found in logs or by calling 'memory/show'
    appctl command.  For ovsdb-server it includes information about db
    cells, monitor connections with their backlog size, etc.  But it
    doesn't contain any information about memory consumed by raft.
    Backlogs of raft connections could be insanely large because of
    snapshot installation requests that simply contains the whole database.
    In not that healthy clusters where one of ovsdb servers is not able to
    timely handle all the incoming raft traffic, backlog on a sender's side
    could cause significant memory consumption issues.
    
    Adding new 'raft-connections' and 'raft-backlog' counters to the
    memory report to better track such conditions.
    
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    
    Related: #1834838
    Signed-off-by: Ilya Maximets <i.maximets@redhat.com>


* Tue Jun 02 2020 Aaron Conole <aconole@redhat.com> - 2.13.0-35
- netdev-offload-tc: Re-fetch block ID after probing. [RH git: d14e39f81b]
    It's possible that block_id could changes after the probe for block
    support.  Therefore, fetch the block_id again after the probe.
    
    Fixes: edc2055a2bf7 ("netdev-offload-tc: Flush rules on ingress block when init tc flow api")
    Cc: Dmytro Linkin <dmitrolin@mellanox.com>
    Acked-by: Roi Dayan <roid@mellanox.com>
    Co-authored-by: Marcelo Leitner <mleitner@redhat.com>
    Signed-off-by: Marcelo Leitner <mleitner@redhat.com>
    Signed-off-by: Aaron Conole <aconole@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Tue Jun 02 2020 Aaron Conole <aconole@redhat.com> - 2.13.0-34
- netdev-linux: Update LAG in all cases. [RH git: 8b15547574]
    In some cases, when processing a netlink change event, it's possible for
    an alternate part of OvS (like the IPv6 endpoint processing) to hold an
    active netdev interface.  This creates a race-condition, where sometimes
    the OvS change processing will take the normal path.  This doesn't work
    because the netdev device object won't actually be enslaved to the
    ovs-system (for instance, a linux bond) and ingress qdisc entries will
    be missing.
    
    To address this, we update the LAG information in ALL cases where
    LAG information could come in.
    
    Fixes: d22f8927c3c9 ("netdev-linux: monitor and offload LAG slaves to TC")
    Cc: Marcelo Leitner <mleitner@redhat.com>
    Cc: John Hurley <john.hurley@netronome.com>
    Acked-by: Roi Dayan <roid@mellanox.com>
    Signed-off-by: Aaron Conole <aconole@redhat.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>


* Wed May 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-33
- vhost: fix potential fd leak [RH git: a9e6e35814]
    Vhost will create temporary file when receiving VHOST_USER_GET_INFLIGHT_FD
    message. Malicious guest can send endless this message to drain out the
    resource of host.
    
    When receiving VHOST_USER_GET_INFLIGHT_FD message repeatedly, closing the
    file created during the last handling of this message.
    
    Fixes: d87f1a1cb7b666550 ("vhost: support inflight info sharing")
    Cc: stable@dpdk.org
    
    This issue has been assigned CVE-2020-10726
    
    Signed-off-by: Xuan Ding <xuan.ding@intel.com>
    Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
    Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>


* Wed May 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-32
- vhost: fix potential memory space leak [RH git: b39bac1377]
    A malicious container which has direct access to the vhost-user socket
    can keep sending VHOST_USER_GET_INFLIGHT_FD messages which may cause
    leaking resources until resulting a DOS. Fix it by unmapping the
    dev->inflight_info->addr before assigning new mapped addr to it.
    
    Fixes: d87f1a1cb7b6 ("vhost: support inflight info sharing")
    Cc: stable@dpdk.org
    
    This issue has been assigned CVE-2020-10726
    
    Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
    Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>


* Wed May 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-31
- vhost: fix translated address not checked [RH git: 7da9061642]
    Malicious guest can construct desc with invalid address and zero buffer
    length. That will request vhost to check both translated address and
    translated data length. This patch will add missed address check.
    
    Fixes: 75ed51697820 ("vhost: add packed ring batch dequeue")
    Fixes: ef861692c398 ("vhost: add packed ring batch enqueue")
    Cc: stable@dpdk.org
    
    This issue has been assigned CVE-2020-10725
    
    Signed-off-by: Marvin Liu <yong.liu@intel.com>
    Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>


* Wed May 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-30
- vhost: fix vring index check [RH git: 7c4cfd12e3]
    vhost_user_check_and_alloc_queue_pair() is used to extract
    a vring index from a payload. This function validates the
    index and is called early on in when performing message
    handling. Most message handlers depend on it correctly
    validating the vring index.
    
    Depending on the message type the vring index is in
    different parts of the payload. The function contains a
    switch/case for each type and copies the index. This is
    stored in a uint16. This index is then validated. Depending
    on the message, the source index is an unsigned int. If
    integer truncation occurs (uint->uint16) the top 16 bits
    of the index are never validated.
    
    When they are used later on  (e.g. in
    vhost_user_set_vring_num() or vhost_user_set_vring_addr())
    it can lead to out of bound indexing. The out of bound
    indexed data gets written to, and hence this can cause
    memory corruption.
    
    This patch fixes this vulnerability by declaring vring
    index as an unsigned int in
    vhost_user_check_and_alloc_queue_pair().
    
    Fixes: 160cbc815b41 ("vhost: remove a hack on queue allocation")
    Cc: stable@dpdk.org
    
    This issue has been assigned CVE-2020-10723
    
    Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
    Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
    Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
    Reviewed-by: Ilja Van Sprundel <ivansprundel@ioactive.com>


* Wed May 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-29
- vhost: check log mmap offset and size overflow [RH git: 517d8488dc]
    vhost_user_set_log_base() is a message handler that is
    called to handle the VHOST_USER_SET_LOG_BASE message.
    Its payload contains a 64 bit size and offset. Both are
    added up and used as a size when calling mmap().
    
    There is no integer overflow check. If an integer overflow
    occurs a smaller memory map would be created than
    requested. Since the returned mapping is mapped as writable
    and used for logging, a memory corruption could occur.
    
    Fixes: fbc4d248b198 ("vhost: fix offset while mmaping log base address")
    Cc: stable@dpdk.org
    
    This issue has been assigned CVE-2020-10722
    
    Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
    Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
    Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
    Reviewed-by: Ilja Van Sprundel <ivansprundel@ioactive.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-28
- raft: Disable RAFT jsonrpc inactivity probe. [RH git: 3d9b529afb] (#1836308)
    [ upstream commit 1600e0040caded7eaa9b1f41926f9619d8e0ec8d ]
    
    With the scale test of 640 nodes k8s cluster, raft DB nodes' jsonrpc
    session got closed due to the timeout of default 5 seconds probe.
    It will cause disturbance of the raft cluster. Since we already have
    the heartbeat for RAFT, just disable the probe between the servers
    to avoid the unnecessary jsonrpc inactivity probe.
    
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Zhen Wang <zhewang@nvidia.com>
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    
    Resolves: #1836308
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-27
- raft: Fix leak of the incomplete command. [RH git: 5c38ccd52f] (#1836307)
    [ upstream commit 168beb87ca63056e8896b09a60031565b7b60728 ]
    
    Function raft_command_initiate() returns correctly referenced command
    instance.  'n_ref' equals 1 for complete commands and 2 for incomplete
    commands because one more reference is in raft->commands list.
    raft_handle_execute_command_request__() leaks the reference by not
    returning pointer anywhere and not unreferencing incomplete commands.
    
     792 bytes in 11 blocks are definitely lost in loss record 258 of 262
        at 0x483BB1A: calloc (vg_replace_malloc.c:762)
        by 0x44BA32: xcalloc (util.c:121)
        by 0x422E5F: raft_command_create_incomplete (raft.c:2038)
        by 0x422E5F: raft_command_initiate (raft.c:2061)
        by 0x428651: raft_handle_execute_command_request__ (raft.c:4161)
        by 0x428651: raft_handle_execute_command_request (raft.c:4177)
        by 0x428651: raft_handle_rpc (raft.c:4230)
        by 0x428651: raft_conn_run (raft.c:1445)
        by 0x428DEA: raft_run (raft.c:1803)
        by 0x407392: main_loop (ovsdb-server.c:226)
        by 0x407392: main (ovsdb-server.c:469)
    
    Fixes: 1b1d2e6daa56 ("ovsdb: Introduce experimental support for clustered databases.")
    Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
    Acked-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: William Tu <u9012063@gmail.com>
    
    Resolves: #1836307
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-26
- raft: Fix the problem of stuck in candidate role forever. [RH git: 9c76350e27] (#1836305)
    [ upstream commit 25a7e5547f1e107db0f032ad269f447c57401531 ]
    
    Sometimes a server can stay in candidate role forever, even if the server
    already see the new leader and handles append-requests normally. However,
    because of the wrong role, it appears as disconnected from cluster and
    so the clients are disconnected.
    
    This problem happens when 2 servers become candidates in the same
    term, and one of them is elected as leader in that term. It can be
    reproduced by the test cases added in this patch.
    
    The root cause is that the current implementation only changes role to
    follower when a bigger term is observed (in raft_receive_term__()).
    According to the RAFT paper, if another candidate becomes leader with
    the same term, the candidate should change to follower.
    
    This patch fixes it by changing the role to follower when leader
    is being updated in raft_update_leader().
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-25
- raft: Fix next_index in install_snapshot reply handling. [RH git: cc3d026992] (#1836305)
    [ upstream commit 877618fc833273d1e29e012b5e925d51cba80ff5 ]
    
    When a leader handles install_snapshot reply, the next_index for
    the follower should be log_start instead of log_end, because there
    can be new entries added in leader's log after initiating the
    install_snapshot procedure.  Also, it should send all the accumulated
    entries to follower in the following append-request message, instead
    of sending 0 entries, to speed up the converge.
    
    Without this fix, there is no functional problem, but it takes
    uncessary extra rounds of append-requests responsed with "inconsistency"
    by follower, although finally will be converged.
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-24
- raft: Avoid busy loop during leader election. [RH git: 053b78c8d6] (#1836305)
    [ upstream commit 3ae90e1899c5a05148ea1870d9bb4ac3c05e3a19 ]
    
    When a server doesn't see a leader yet, e.g. during leader re-election,
    if a transaction comes from a client, it will cause 100% CPU busy loop.
    With debug log enabled it is like:
    
    2020-02-28T04:04:35.631Z|00059|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00062|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00065|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00068|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00071|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00074|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    2020-02-28T04:04:35.631Z|00077|poll_loop|DBG|wakeup due to 0-ms timeout at ../ovsdb/trigger.c:164
    ...
    
    The problem is that in ovsdb_trigger_try(), all cluster errors are treated
    as temporary error and retry immediately. This patch fixes it by introducing
    'run_triggers_now', which tells if a retry is needed immediately. When the
    cluster error is with detail 'not leader', we don't immediately retry, but
    will wait for the next poll event to trigger the retry. When 'not leader'
    status changes, there must be a event, i.e. raft RPC that changes the
    status, so the trigger is guaranteed to be triggered, without busy loop.
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-23
- raft: Fix raft_is_connected() when there is no leader yet. [RH git: e732012d7b] (#1836305)
    [ upstream commit adc64ab057345f7004c44bf92363b9adda862134 ]
    
    If there is never a leader known by the current server, it's status
    should be "disconnected" to the cluster. Without this patch, when
    a server in cluster is restarted, before it successfully connecting
    back to the cluster it will appear as connected, which is wrong.
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-22
- ovsdb-server: Don't disconnect clients after raft install_snapshot. [RH git: 8ff30dfee6] (#1836305)
    [ upstream commit f0c8b44c5832c36989fad78927407fc14e64ce46 ]
    
    When "schema" field is found in read_db(), there can be two cases:
    1. There is a schema change in clustered DB and the "schema" is the new one.
    2. There is a install_snapshot RPC happened, which caused log compaction on the
    server and the next log is just the snapshot, which always constains "schema"
    field, even though the schema hasn't been changed.
    
    The current implementation doesn't handle case 2), and always assume the schema
    is changed hence disconnect all clients of the server. It can cause stability
    problem when there are big number of clients connected when this happens in
    a large scale environment.
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Fri May 15 2020 Dumitru Ceara <dceara@redhat.com> - 2.13.0-21
- raft-rpc: Fix message format. [RH git: 914d885061] (#1836305)
    [ upstream commit 78c8011f58daec41ec97440f2e42795699322742 ]
    
    Signed-off-by: Han Zhou <hzhou@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1836305
    Signed-off-by: Dumitru Ceara <dceara@redhat.com>


* Wed Apr 22 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-20
- redhat: pkgtool: Use the oldest sha1 [RH git: 4c657a79de]
    Doing git merge from a branch to another branch the tag:C0FF3E commit is
    repeated, but the correct one is the oldest one.


* Mon Apr 20 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-19
- Fix building locally on Fedora 32+ [RH git: d1c89e4d99]


* Thu Apr 16 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-18
- Set -fcommon in DPDK CFLAGS [RH git: f8a379e95e]
    This is needed to build on Fedora 32+


* Thu Apr 16 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-17
- Update DPDK config files for 19.11.1 [RH git: d771330907]


* Thu Apr 16 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-16
- Merge tag 'v19.11.1' into fast-datapath-rhel-8 [RH git: 0b3abfb0e6]
    dpdk-19.11.1


* Tue Apr 14 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-15
- bugtool: Fix for Python3. [RH git: 71f25b7920] (#1809241)
    Currently ovs-bugtool tool doesn't start on Python 3.
    This commit fixes ovs-bugtool to make it works on Python 3.
    
    Replaced StringIO.StringIO with io.BytesIO since the script is
    processing binary data.
    
    Reported-at: https://bugzilla.redhat.com/1809241
    Reported-by: Flavio Leitner <fbl@sysclose.org>
    Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
    Co-authored-by: William Tu <u9012063@gmail.com>
    Signed-off-by: William Tu <u9012063@gmail.com>
    (cherry picked from commit 9e6c00bca9af29031d0e160d33174b7ae99b9244)


* Tue Apr 07 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-14
- redhat: Skip NVR check only if building rhel-8 on rhel-7. [RH git: 2b9f32bef2]


* Mon Apr 06 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-13
- redhat: rh-dgit-brew: Skip NVR check in RHEL-7. [RH git: 6280d8d29f]
    The RPM in RHEL-7 can't parse Supplements tag in the SPEC to get
    the package NVR. The NVR is used to check if brew is already done.
    
    error: line 241: Unknown tag: Supplements: (openvswitch2.13 and network-scripts)
    error: query of specfile openvswitch2.13.spec failed, can't parse
    
    Use --skip-nvr-check to work around the issue.


* Mon Apr 06 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-12
- redhat: pkgtool: Use BZ id from reported-at tag. [RH git: 3ee7ec51b6]
    Some upstream commits might contain the Reported-at tag
    pointing to Red Hat bugzilla. In that case, use the BZ id
    in the package's changelog.
    
    Signed-off-by: Flavio Leitner <fbl@redhat.com>


* Fri Mar 27 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-11
- redhat: ovsci: Schedule the CI job while brew is building. [RH git: 1551e1e70e]
    The CI will wait for the brew build to complete and this helps
    to have a single place to monitor and also to record in the
    CI log the brew build.


* Tue Mar 24 2020 Flavio Leitner <fbl@redhat.com> - 2.13.0-10
- redhat: ovsci: Use the correct job name and params. [RH git: 220f32afb2]
    Jenkins needs to support different use-cases so fix the
    parameters to be uniform and the job name to allow multiple
    triggers (formal and non-formal releases processes).
    
    Signed-off-by: Flavio Leitner <fbl@redhat.com>


* Mon Mar 23 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-9
- Add compatibility with RHEL7 git [RH git: 3492995783]


* Mon Mar 23 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-8
- Use the date in UTC [RH git: b53bdb16b8]
    In order to avoid changing date in changelog cast the date in UTC


* Mon Mar 23 2020 Numan Siddique <nusiddiq@redhat.com> - 2.13.0-7
- ofproto-dpif-xlate: Fix recirculation when in_port is OFPP_CONTROLLER. [RH git: 4ee0f6af9e] (#1775160)
    [ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ]
    
    Recirculation usually requires finding the pre-recirculation input port.
    Packets sent by the controller, with in_port of OFPP_CONTROLLER or
    OFPP_NONE, do not have a real input port data structure, only a port
    number.  The code in xlate_lookup_ofproto_() mishandled this case,
    failing to return the ofproto data structure.  This commit fixes the
    problem and adds a test to guard against regression.
    
    Reported-by: Numan Siddique <numans@ovn.org>
    Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2020-March/368642.html
    Tested-by: Numan Siddique <numans@ovn.org>
    Acked-by: Numan Siddique <numans@ovn.org>
    Signed-off-by: Ben Pfaff <blp@ovn.org>
    
    Resolves: #1775160
    Signed-off-by: Numan Siddique <nusiddiq@redhat.com>


* Wed Mar 11 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-6
- vhost: fix packed virtqueue ready condition [RH git: 0b4e7827b8] (#1812620)
    [ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ]
    
    Consider a virtqueue ready when, apart from the descriptor area,
    both event suppression areas have been mapped.
    
    Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues")
    
    Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
    Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
    
    Resolves: #1812620


* Thu Feb 27 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-5
- redhat: permit make to fail when pkgtool --gen{spec,patches} exist badly [RH git: 61807f941e]


* Tue Feb 25 2020 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-4
- vhost: protect log address translation in IOTLB update [RH git: 0d4370404f] (#1806599)
    [ upstream commit 4f37df14c405b754b5e971c75f4f67f4bb5bfdde ]
    
    Currently, the log address translation only  happens in the vhost-user's
    translate_ring_addresses(). However, the IOTLB update handler is not
    checking if it was mapped to re-trigger that translation.
    
    Since the log address mapping could fail, check it on iotlb updates.
    Also, check it on vring_translate() so we do not dirty pages if the
    logging address is not yet ready.
    
    Additionally, properly protect the accesses to the iotlb structures.
    
    Fixes: fbda9f145927 ("vhost: translate incoming log address to GPA")
    
    Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
    Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
    
    Resolves: #1806599
    Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>