From 2005a81b9f32cd1832c749894cdc5e1dc44e24e1 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 18 2022 18:14:17 +0000
Subject: Import openvswitch2.15-2.15.0-58 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index b7b9fb2..3bb9a75 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -149,10 +149,38 @@ index 3a24e54f97..20c148f5eb 100644
  .. note::
  
 diff --git a/Documentation/topics/dpdk/pmd.rst b/Documentation/topics/dpdk/pmd.rst
-index caa7d97bef..e481e79414 100644
+index caa7d97bef..9a79e43db5 100644
 --- a/Documentation/topics/dpdk/pmd.rst
 +++ b/Documentation/topics/dpdk/pmd.rst
-@@ -239,7 +239,9 @@ If not set, the default variance improvement threshold is 25%.
+@@ -31,17 +31,19 @@ input ports for packets, classifying packets once received, and executing
+ actions on the packets once they are classified.
+ 
+ PMD threads utilize Receive (Rx) and Transmit (Tx) queues, commonly known as
+-*rxq*\s and *txq*\s. While Tx queue configuration happens automatically, Rx
+-queues can be configured by the user. This can happen in one of two ways:
++*rxq*\s and *txq*\s to receive and send packets from/to an interface.
+ 
+-- For physical interfaces, configuration is done using the
+-  :program:`ovs-appctl` utility.
++- For physical interfaces, the number of Tx Queues is automatically configured
++  based on the number of PMD thread cores. The number of Rx queues can be
++  configured with::
+ 
+-- For virtual interfaces, configuration is done using the :program:`ovs-appctl`
+-  utility, but this configuration must be reflected in the guest configuration
+-  (e.g. QEMU command line arguments).
++        $ ovs-vsctl set Interface <interface_name> options:n_rxq=N
+ 
+-The :program:`ovs-appctl` utility also provides a number of commands for
++- For virtual interfaces, the number of Tx and Rx queues are configured by
++  libvirt/QEMU and enabled/disabled in the guest. Refer to :doc:'vhost-user'
++  for more information.
++
++The :program:`ovs-appctl` utility provides a number of commands for
+ querying PMD threads and their respective queues. This, and all of the above,
+ is discussed here.
+ 
+@@ -239,7 +241,9 @@ If not set, the default variance improvement threshold is 25%.
  
      PMD Auto Load Balancing doesn't currently work if queues are assigned
      cross NUMA as actual processing load could get worse after assignment
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 534afc7..3535627 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 57%{?dist}
+Release: 58%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -699,6 +699,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Jan 18 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-58
+- Merging upstream branch-2.15 [RH git: 14826e19b9]
+    Commit list:
+    7f978ee372 Documentation: Fix Rx/Tx queue configuration section.
+
+
 * Mon Jan 17 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-57
 - Merging upstream branch-2.15 [RH git: 228a38c3dc]
     Commit list: