From 4ac8aabd3a5f567027a1ae0474c45a683abdf636 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 18 2022 17:02:02 +0000
Subject: Import openvswitch2.13-2.13.0-144 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index d87d367..6f8be00 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -791,10 +791,38 @@ index 38e52c8deb..55a98e2b0e 100644
  -----------------------------------------------
  
 diff --git a/Documentation/topics/dpdk/pmd.rst b/Documentation/topics/dpdk/pmd.rst
-index 6f1fdcbc6f..b017b84f6a 100644
+index 6f1fdcbc6f..854837be8f 100644
 --- a/Documentation/topics/dpdk/pmd.rst
 +++ b/Documentation/topics/dpdk/pmd.rst
-@@ -224,7 +224,9 @@ load then the actual reassignment will be performed.
+@@ -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.
+ 
+@@ -224,7 +226,9 @@ load then the actual reassignment will be performed.
  
      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.13.spec b/SPECS/openvswitch2.13.spec
index fa0befe..a1ef70c 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 143%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 144%{?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
@@ -712,6 +712,12 @@ exit 0
 %endif
 
 %changelog
+* 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: