mirror of
https://github.com/openvswitch/ovs
synced 2025-08-22 01:51:26 +00:00
dpdk: Update to use v22.11.1.
This commit add support to for DPDK v22.11.1, it includes the following changes. 1. ci: Reduce DPDK compilation time. 2. system-dpdk: Update vhost tests to be compatible with DPDK 22.07. http://patchwork.ozlabs.org/project/openvswitch/list/?series=316528 3. system-dpdk: Update vhost tests to be compatible with DPDK 22.07. http://patchwork.ozlabs.org/project/openvswitch/list/?series=311332 4. netdev-dpdk: Report device bus specific information. 5. netdev-dpdk: Drop reference to Rx header split. http://patchwork.ozlabs.org/project/openvswitch/list/?series=321808 In addition documentation was also updated in this commit for use with DPDK v22.11.1. The Debian shared DPDK compilation test is removed as part of this patch due to a packaging requirement. Once DPDK v22.11.1 is available in Debian repositories it should be re-enabled in OVS. For credit all authors of the original commits to 'dpdk-latest' with the above changes have been added as co-authors for this commit Signed-off-by: David Marchand <david.marchand@redhat.com> Co-authored-by: David Marchand <david.marchand@redhat.com> Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> Co-authored-by: Sunil Pai G <sunil.pai.g@intel.com> Tested-by: Michael Phelan <michael.phelan@intel.com> Tested-by: Emma Finn <emma.finn@intel.com> Signed-off-by: Ian Stokes <ian.stokes@intel.com>
This commit is contained in:
parent
55b9507e68
commit
a77c7796f2
@ -160,6 +160,11 @@ function install_dpdk()
|
||||
# meson verbose outputs.
|
||||
DPDK_OPTS="$DPDK_OPTS -Ddeveloper_mode=disabled"
|
||||
|
||||
# OVS compilation and "normal" unit tests (run in the CI) do not depend on
|
||||
# any DPDK driver being present.
|
||||
# We can disable all drivers to save compilation time.
|
||||
DPDK_OPTS="$DPDK_OPTS -Ddisable_drivers=*/*"
|
||||
|
||||
# Install DPDK using prefix.
|
||||
DPDK_OPTS="$DPDK_OPTS --prefix=$(pwd)/build"
|
||||
|
||||
@ -228,7 +233,7 @@ fi
|
||||
|
||||
if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
|
||||
if [ -z "$DPDK_VER" ]; then
|
||||
DPDK_VER="21.11.2"
|
||||
DPDK_VER="22.11.1"
|
||||
fi
|
||||
install_dpdk $DPDK_VER
|
||||
fi
|
||||
|
1
.github/workflows/build-and-test.yml
vendored
1
.github/workflows/build-and-test.yml
vendored
@ -213,7 +213,6 @@ jobs:
|
||||
matrix:
|
||||
include:
|
||||
- dpdk: no
|
||||
- dpdk: shared
|
||||
|
||||
steps:
|
||||
- name: checkout
|
||||
|
@ -233,7 +233,7 @@ Q: Are all the DPDK releases that OVS versions work with maintained?
|
||||
The latest information about DPDK stable and LTS releases can be found
|
||||
at `DPDK stable`_.
|
||||
|
||||
.. _DPDK stable: http://doc.dpdk.org/guides-21.11/contributing/stable.html
|
||||
.. _DPDK stable: http://doc.dpdk.org/guides-22.11/contributing/stable.html
|
||||
|
||||
Q: I get an error like this when I configure Open vSwitch:
|
||||
|
||||
|
@ -42,7 +42,7 @@ Build requirements
|
||||
In addition to the requirements described in :doc:`general`, building Open
|
||||
vSwitch with DPDK will require the following:
|
||||
|
||||
- DPDK 21.11.2
|
||||
- DPDK 22.11.1
|
||||
|
||||
- A `DPDK supported NIC`_
|
||||
|
||||
@ -59,8 +59,8 @@ vSwitch with DPDK will require the following:
|
||||
|
||||
Detailed system requirements can be found at `DPDK requirements`_.
|
||||
|
||||
.. _DPDK supported NIC: https://doc.dpdk.org/guides-21.11/nics/index.html
|
||||
.. _DPDK requirements: https://doc.dpdk.org/guides-21.11/linux_gsg/sys_reqs.html
|
||||
.. _DPDK supported NIC: https://doc.dpdk.org/guides-22.11/nics/index.html
|
||||
.. _DPDK requirements: https://doc.dpdk.org/guides-22.11/linux_gsg/sys_reqs.html
|
||||
|
||||
.. _dpdk-install:
|
||||
|
||||
@ -73,9 +73,9 @@ Install DPDK
|
||||
#. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``::
|
||||
|
||||
$ cd /usr/src/
|
||||
$ wget https://fast.dpdk.org/rel/dpdk-21.11.2.tar.xz
|
||||
$ tar xf dpdk-21.11.2.tar.xz
|
||||
$ export DPDK_DIR=/usr/src/dpdk-stable-21.11.2
|
||||
$ wget https://fast.dpdk.org/rel/dpdk-22.11.1.tar.xz
|
||||
$ tar xf dpdk-22.11.tar.xz
|
||||
$ export DPDK_DIR=/usr/src/dpdk-stable-22.11.1
|
||||
$ cd $DPDK_DIR
|
||||
|
||||
#. Configure and install DPDK using Meson
|
||||
@ -121,7 +121,7 @@ Install DPDK
|
||||
|
||||
.. _DPDK sources: http://dpdk.org/rel
|
||||
.. _DPDK documentation:
|
||||
https://doc.dpdk.org/guides-21.11/linux_gsg/build_dpdk.html
|
||||
https://doc.dpdk.org/guides-22.11/linux_gsg/build_dpdk.html
|
||||
|
||||
Install OVS
|
||||
~~~~~~~~~~~
|
||||
@ -722,7 +722,7 @@ Limitations
|
||||
release notes`_.
|
||||
|
||||
.. _DPDK release notes:
|
||||
https://doc.dpdk.org/guides-21.11/rel_notes/release_21_11.html
|
||||
https://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html
|
||||
|
||||
- Upper bound MTU: DPDK device drivers differ in how the L2 frame for a
|
||||
given MTU value is calculated e.g. i40e driver includes 2 x vlan headers in
|
||||
|
@ -117,7 +117,7 @@ tool::
|
||||
|
||||
For more information, refer to the `DPDK documentation <dpdk-drivers>`__.
|
||||
|
||||
.. _dpdk-drivers: https://doc.dpdk.org/guides-21.11/linux_gsg/linux_drivers.html
|
||||
.. _dpdk-drivers: https://doc.dpdk.org/guides-22.11/linux_gsg/linux_drivers.html
|
||||
|
||||
.. _dpdk-phy-multiqueue:
|
||||
|
||||
@ -235,7 +235,7 @@ To hotplug a port with igb_uio in this case, DPDK must be configured to use
|
||||
physical addressing for IOVA mode. For more information regarding IOVA modes
|
||||
in DPDK please refer to the `DPDK IOVA Mode Detection`__.
|
||||
|
||||
__ https://doc.dpdk.org/guides-21.11/prog_guide/env_abstraction_layer.html#iova-mode-detection
|
||||
__ https://doc.dpdk.org/guides-22.11/prog_guide/env_abstraction_layer.html#iova-mode-detection
|
||||
|
||||
To configure OVS DPDK to use physical addressing for IOVA::
|
||||
|
||||
@ -267,7 +267,7 @@ Representors are multi devices created on top of one PF.
|
||||
|
||||
For more information, refer to the `DPDK documentation`__.
|
||||
|
||||
__ https://doc.dpdk.org/guides-21.11/prog_guide/switch_representation.html#port-representors
|
||||
__ https://doc.dpdk.org/guides-22.11/prog_guide/switch_representation.html#port-representors
|
||||
|
||||
Prior to port representors there was a one-to-one relationship between the PF
|
||||
and the eth device. With port representors the relationship becomes one PF to
|
||||
@ -401,7 +401,7 @@ in the ``options`` column of the ``Interface`` table.
|
||||
kernel netdevice, and be inherited from it when Open vSwitch is restarted,
|
||||
even if the options described in this section are unset from Open vSwitch.
|
||||
|
||||
.. _bifurcated-drivers: https://doc.dpdk.org/guides-21.11/linux_gsg/linux_drivers.html#bifurcated-driver
|
||||
.. _bifurcated-drivers: https://doc.dpdk.org/guides-22.11/linux_gsg/linux_drivers.html#bifurcated-driver
|
||||
|
||||
- Configure the VF MAC address::
|
||||
|
||||
|
@ -63,4 +63,4 @@ run::
|
||||
More information on the different types of virtual DPDK PMDs can be found in
|
||||
the `DPDK documentation`__.
|
||||
|
||||
__ https://doc.dpdk.org/guides-21.11/nics/overview.html
|
||||
__ https://doc.dpdk.org/guides-22.11/nics/overview.html
|
||||
|
@ -539,4 +539,4 @@ shown with::
|
||||
|
||||
Further information can be found in the
|
||||
`DPDK documentation
|
||||
<https://doc.dpdk.org/guides-21.11/prog_guide/vhost_lib.html>`__
|
||||
<https://doc.dpdk.org/guides-22.11/prog_guide/vhost_lib.html>`__
|
||||
|
@ -353,7 +353,7 @@ All tests are skipped if no hugepages are configured. User must look into the DP
|
||||
manual to figure out how to `Configure hugepages`_.
|
||||
The phy test will skip if no compatible physical device is available.
|
||||
|
||||
.. _Configure hugepages: https://doc.dpdk.org/guides-21.11/linux_gsg/sys_reqs.html
|
||||
.. _Configure hugepages: https://doc.dpdk.org/guides-22.11/linux_gsg/sys_reqs.html
|
||||
|
||||
All the features documented under `Unit Tests`_ are available for the DPDK
|
||||
testsuite.
|
||||
|
@ -46,7 +46,7 @@ datasheet for compatibility. Secondly, the NIC must have an associated DPDK
|
||||
Poll Mode Driver (PMD) which supports `TSO`. For a list of features per PMD,
|
||||
refer to the `DPDK documentation`__.
|
||||
|
||||
__ https://doc.dpdk.org/guides-21.11/nics/overview.html
|
||||
__ https://doc.dpdk.org/guides-22.11/nics/overview.html
|
||||
|
||||
Enabling TSO
|
||||
~~~~~~~~~~~~
|
||||
|
18
NEWS
18
NEWS
@ -9,23 +9,7 @@ Post-v3.0.0
|
||||
- Windows:
|
||||
* Conntrack IPv6 fragment support.
|
||||
- DPDK:
|
||||
* OVS validated with DPDK 21.11.2.
|
||||
DPDK 21.11.2 contains fixes for the following CVEs:
|
||||
CVE-2022-28199 cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-28199
|
||||
CVE-2022-2132 cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2132
|
||||
A bug was introduced in DPDK 21.11.1 by the commit
|
||||
01e3dee29c02 ("vhost: fix unsafe vring addresses modifications").
|
||||
This bug can cause a deadlock when vIOMMU is enabled and NUMA
|
||||
reallocation of the virtqueues happen.
|
||||
A fix has been posted and pushed to the DPDK 21.11 branch.
|
||||
It can be found here:
|
||||
https://patches.dpdk.org/project/dpdk/patch/20220725203206.427083-2-david.marchand@redhat.com/.
|
||||
If a user wishes to avoid the issue then it is recommended to use
|
||||
DPDK 21.11.0 until the release of DPDK 21.11.3.
|
||||
It should be noted that DPDK 21.11.0 does not benefit from the numerous
|
||||
bug and CVE fixes addressed since its release.
|
||||
If a user wishes to benefit from these fixes it is recommended to use
|
||||
DPDK 21.11.2.
|
||||
* Add support for DPDK 22.11.1.
|
||||
- For the QoS max-rate and STP/RSTP path-cost configuration OVS now assumes
|
||||
10 Gbps link speed by default in case the actual link speed cannot be
|
||||
determined. Previously it was 10 Mbps. Values can still be overridden
|
||||
|
2
debian/control.in
vendored
2
debian/control.in
vendored
@ -21,7 +21,7 @@ Build-Depends:
|
||||
iproute2,
|
||||
libcap-ng-dev,
|
||||
libdbus-1-dev [amd64 i386 ppc64el arm64],
|
||||
# DPDK_NETDEV libdpdk-dev (>= 21.11) [amd64 i386 ppc64el arm64],
|
||||
# DPDK_NETDEV libdpdk-dev (>= 22.11) [amd64 i386 ppc64el arm64],
|
||||
libnuma-dev [amd64 i386 ppc64el arm64],
|
||||
libpcap-dev [amd64 i386 ppc64el arm64],
|
||||
libssl-dev,
|
||||
|
@ -27,9 +27,10 @@
|
||||
#include <sys/stat.h>
|
||||
#include <linux/if.h>
|
||||
|
||||
#include <rte_bus_pci.h>
|
||||
#include <rte_bus.h>
|
||||
#include <rte_config.h>
|
||||
#include <rte_cycles.h>
|
||||
#include <rte_dev.h>
|
||||
#include <rte_errno.h>
|
||||
#include <rte_ethdev.h>
|
||||
#include <rte_flow.h>
|
||||
@ -166,7 +167,6 @@ typedef uint16_t dpdk_port_t;
|
||||
|
||||
static const struct rte_eth_conf port_conf = {
|
||||
.rxmode = {
|
||||
.split_hdr_size = 0,
|
||||
.offloads = 0,
|
||||
},
|
||||
.rx_adv_conf = {
|
||||
@ -3645,6 +3645,7 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args)
|
||||
{
|
||||
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
|
||||
struct rte_eth_dev_info dev_info;
|
||||
const char *bus_info;
|
||||
uint32_t link_speed;
|
||||
uint32_t dev_flags;
|
||||
|
||||
@ -3657,19 +3658,8 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args)
|
||||
rte_eth_dev_info_get(dev->port_id, &dev_info);
|
||||
link_speed = dev->link.link_speed;
|
||||
dev_flags = *dev_info.dev_flags;
|
||||
bus_info = rte_dev_bus_info(dev_info.device);
|
||||
ovs_mutex_unlock(&dev->mutex);
|
||||
const struct rte_bus *bus;
|
||||
const struct rte_pci_device *pci_dev;
|
||||
uint16_t vendor_id = RTE_PCI_ANY_ID;
|
||||
uint16_t device_id = RTE_PCI_ANY_ID;
|
||||
bus = rte_bus_find_by_device(dev_info.device);
|
||||
if (bus && !strcmp(bus->name, "pci")) {
|
||||
pci_dev = RTE_DEV_TO_PCI(dev_info.device);
|
||||
if (pci_dev) {
|
||||
vendor_id = pci_dev->id.vendor_id;
|
||||
device_id = pci_dev->id.device_id;
|
||||
}
|
||||
}
|
||||
ovs_mutex_unlock(&dpdk_mutex);
|
||||
|
||||
smap_add_format(args, "port_no", DPDK_PORT_ID_FMT, dev->port_id);
|
||||
@ -3693,8 +3683,10 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args)
|
||||
smap_add_format(args, "if_type", "%"PRIu32, IF_TYPE_ETHERNETCSMACD);
|
||||
smap_add_format(args, "if_descr", "%s %s", rte_version(),
|
||||
dev_info.driver_name);
|
||||
smap_add_format(args, "pci-vendor_id", "0x%x", vendor_id);
|
||||
smap_add_format(args, "pci-device_id", "0x%x", device_id);
|
||||
smap_add_format(args, "bus_info", "bus_name=%s%s%s",
|
||||
rte_bus_name(rte_dev_bus(dev_info.device)),
|
||||
bus_info != NULL ? ", " : "",
|
||||
bus_info != NULL ? bus_info : "");
|
||||
|
||||
/* Not all link speeds are defined in the OpenFlow specs e.g. 25 Gbps.
|
||||
* In that case the speed will not be reported as part of the usual
|
||||
|
@ -71,7 +71,7 @@ BuildRequires: libcap-ng libcap-ng-devel
|
||||
%endif
|
||||
%if %{with dpdk}
|
||||
BuildRequires: libpcap-devel numactl-devel
|
||||
BuildRequires: dpdk-devel >= 21.11
|
||||
BuildRequires: dpdk-devel >= 22.11
|
||||
Provides: %{name}-dpdk = %{version}-%{release}
|
||||
%endif
|
||||
%if %{with afxdp}
|
||||
|
@ -78,14 +78,14 @@ AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -112,11 +112,11 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuser0 -- set Interface dpdkvhostuser0
|
||||
AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user server: socket created" \
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) vhost-user server: socket created" \
|
||||
ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "Socket $OVS_RUNDIR/dpdkvhostuser0 created for vhost-user port dpdkvhostuser0" \
|
||||
ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: bind to $OVS_RUNDIR/dpdkvhostuser0" ovs-vswitchd.log], [],
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) binding succeeded" ovs-vswitchd.log], [],
|
||||
[stdout])
|
||||
|
||||
dnl Set up namespaces
|
||||
@ -157,8 +157,8 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuser0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: recvmsg failed@d
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostuser0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) recvmsg failed@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) failed to connect: No such file or directory@d
|
||||
\@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d
|
||||
\@failed to enumerate system datapaths: No such file or directory@d
|
||||
])")
|
||||
@ -187,9 +187,9 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 -- set Interface \
|
||||
AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Set up namespaces
|
||||
ADD_NAMESPACES(ns1, ns2)
|
||||
@ -229,8 +229,8 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: recvmsg failed@d
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) recvmsg failed@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
\@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d
|
||||
\@failed to enumerate system datapaths: No such file or directory@d
|
||||
])")
|
||||
@ -304,14 +304,14 @@ AT_CHECK([ovs-vsctl list interface dpdkvhostuserclient0], [], [stdout])
|
||||
AT_CHECK([grep -E 'ingress_policing_rate: 0' stdout], [], [stdout])
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -345,14 +345,14 @@ AT_CHECK([grep -E 'ingress_policing_rate: 0' stdout], [], [stdout])
|
||||
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -385,14 +385,14 @@ AT_CHECK([ovs-vsctl list interface dpdkvhostuserclient0], [], [stdout])
|
||||
AT_CHECK([grep -E 'ingress_policing_rate: 10000' stdout], [], [stdout])
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -448,9 +448,9 @@ AT_CHECK([ovs-appctl -t ovs-vswitchd qos/show dpdkvhostuserclient0], [], [stdout
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Fail if egress policer could not be created
|
||||
AT_FAIL_IF([grep "Could not create rte meter for egress policer" ovs-vswitchd.log], [], [stdout])
|
||||
@ -465,7 +465,7 @@ AT_CHECK([grep -E 'QoS not configured on dpdkvhostuserclient0' stdout], [], [std
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -487,9 +487,9 @@ OVS_WAIT_UNTIL([ovs-vsctl set port dpdkvhostuserclient0 qos=@newqos -- --id=@new
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Check egress policer was not created
|
||||
AT_CHECK([ovs-appctl -t ovs-vswitchd qos/show dpdkvhostuserclient0], [], [stdout])
|
||||
@ -498,7 +498,7 @@ AT_CHECK([grep -E 'QoS not configured on dpdkvhostuserclient0' stdout], [], [std
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
\@Could not create rte meter for egress policer@d
|
||||
\@Failed to set QoS type egress-policer on port dpdkvhostuserclient0: Invalid argument@d
|
||||
])")
|
||||
@ -522,9 +522,9 @@ OVS_WAIT_UNTIL([ovs-vsctl set port dpdkvhostuserclient0 qos=@newqos -- --id=@new
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Check egress policer was not created
|
||||
AT_CHECK([ovs-appctl -t ovs-vswitchd qos/show dpdkvhostuserclient0], [], [stdout])
|
||||
@ -533,7 +533,7 @@ AT_CHECK([grep -E 'QoS not configured on dpdkvhostuserclient0' stdout], [], [std
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
\@Could not create rte meter for egress policer@d
|
||||
\@Failed to set QoS type egress-policer on port dpdkvhostuserclient0: Invalid argument@d
|
||||
])")
|
||||
@ -646,9 +646,9 @@ AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Execute testpmd in background
|
||||
on_exit "pkill -f -x -9 'tail -f /dev/null'"
|
||||
@ -675,7 +675,7 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -703,9 +703,9 @@ AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Execute testpmd in background
|
||||
on_exit "pkill -f -x -9 'tail -f /dev/null'"
|
||||
@ -732,7 +732,7 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
])")
|
||||
AT_CLEANUP
|
||||
dnl --------------------------------------------------------------------------
|
||||
@ -864,7 +864,7 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
\@dpdkvhostuserclient0: unsupported MTU 9711@d
|
||||
\@failed to set MTU for network device dpdkvhostuserclient0: Invalid argument@d
|
||||
])")
|
||||
@ -894,9 +894,9 @@ AT_CHECK([ovs-vsctl show], [], [stdout])
|
||||
sleep 2
|
||||
|
||||
dnl Parse log file
|
||||
AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout])
|
||||
|
||||
dnl Execute testpmd in background
|
||||
on_exit "pkill -f -x -9 'tail -f /dev/null'"
|
||||
@ -921,7 +921,7 @@ pkill -f -x -9 'tail -f /dev/null'
|
||||
dnl Clean up
|
||||
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
|
||||
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
|
||||
\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d
|
||||
\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d
|
||||
\@dpdkvhostuserclient0: unsupported MTU 67@d
|
||||
\@failed to set MTU for network device dpdkvhostuserclient0: Invalid argument@d
|
||||
])")
|
||||
|
Loading…
x
Reference in New Issue
Block a user