[PATCH 00/13] Backport 1.4 fixes to 1.3

[PATCH 00/13] Backport 1.4 fixes to 1.3

[Matias Ezequiel Vara Larsen]

Backport commits from 1.4 branch into 1.3 in preparation for releasing
v1.3.

Haixu Cui (1):
  content: Rename SPI master to SPI controller

Martin Kröning (1):
  virtio_pci_cap64: specify offset_hi, length_hi endianness

Paolo Abeni (2):
  virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
  virtio-net: clarify DATA_VALID semantic for encap protos.

Parav Pandit (8):
  conformance: Add missing virtqueue reset conformance references
  packed-ring: Change host,guest to device,driver
  description: Avoid splitting the word virtqueue
  virtio-blk: Fix data type of num_queues field
  virtio-net: Fix receive buffer size calculation text
  virtio-net: Clarify the size of the struct virtio_net_hdr for tx
  virtio-net: Annotate virtio_net_hdr as field
  gpu: editorial: Fix spelling errors

Steffen Trumtrar (1):
  virtio-net: Fix receive buffer size typo

 conformance.tex                  |  2 ++
 content.tex                      |  2 +-
 device-types/blk/description.tex |  2 +-
 device-types/gpu/description.tex |  6 ++--
 device-types/net/description.tex | 52 +++++++++++++++++++++++---------
 packed-ring.tex                  |  4 +--
 transport-pci.tex                |  4 +--
 7 files changed, 49 insertions(+), 23 deletions(-)


base-commit: b495841a8e80d12c1130f8868f4128866291142d
-- 
2.42.0

[PATCH 01/13] conformance: Add missing virtqueue reset conformance references

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Add the missing references to the virtqueue reset related conformance
requirements.

Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
[CH: pushed as an editorial change]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit 925b42e3f72fdd113a5e4cc219b739c2c74dba23)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 conformance.tex | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conformance.tex b/conformance.tex
index dc00e84..863f9c5 100644
--- a/conformance.tex
+++ b/conformance.tex
@@ -76,6 +76,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Device Reset}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Device Configuration Space}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Virtqueues}
+\item \ref{drivernormative:Basic Facilities of a Virtio Device / Virtqueues / Virtqueue Reset / Virtqueue Reset}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Message Framing}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Virtqueues / The Virtqueue Descriptor Table}
 \item \ref{drivernormative:Basic Facilities of a Virtio Device / Virtqueues / The Virtqueue Descriptor Table / Indirect Descriptors}
@@ -162,6 +163,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Feature Bits}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Device Reset}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Device Configuration Space}
+\item \ref{devicenormative:Basic Facilities of a Virtio Device / Virtqueues / Virtqueue Reset / Virtqueue Reset}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Message Framing}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Virtqueues / The Virtqueue Descriptor Table}
 \item \ref{devicenormative:Basic Facilities of a Virtio Device / Virtqueues / The Virtqueue Descriptor Table / Indirect Descriptors}
-- 
2.42.0

[PATCH 02/13] packed-ring: Change host,guest to device,driver

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Rest of the packed ring description already uses the device
and driver terminology. Change the introductory line as well from
host and guest to device and driver respectively.

Signed-off-by: Parav Pandit <parav@nvidia.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
[CH: pushed as an editorial update]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit 68d5cc4fe4081a49235885005647b095b7965c0b)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 packed-ring.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packed-ring.tex b/packed-ring.tex
index 9eeb382..2bb66de 100644
--- a/packed-ring.tex
+++ b/packed-ring.tex
@@ -2,7 +2,7 @@ \section{Packed Virtqueues}\label{sec:Basic Facilities of a Virtio Device / Pack
 
 Packed virtqueues is an alternative compact virtqueue layout using
 read-write memory, that is memory that is both read and written
-by both host and guest.
+by both the device and the driver.
 
 Use of packed virtqueues is negotiated by the VIRTIO_F_RING_PACKED
 feature bit.
-- 
2.42.0

[PATCH 03/13] description: Avoid splitting the word virtqueue

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Don't split the word virtqueue.

Signed-off-by: Parav Pandit <parav@nvidia.com>
[CH: applied as editorial]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit 4cb03b12dc951f0152cd2cd9c79b24492e174e43)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/gpu/description.tex | 2 +-
 packed-ring.tex                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-types/gpu/description.tex b/device-types/gpu/description.tex
index 4435248..66e4873 100644
--- a/device-types/gpu/description.tex
+++ b/device-types/gpu/description.tex
@@ -190,7 +190,7 @@ \subsubsection{Device Operation: Configure mouse cursor}
 
 \subsubsection{Device Operation: Request header}\label{sec:Device Types / GPU Device / Device Operation / Device Operation: Request header}
 
-All requests and responses on the virt queues have a fixed header
+All requests and responses on the virtqueues have a fixed header
 using the following layout structure and definitions:
 
 \begin{lstlisting}
diff --git a/packed-ring.tex b/packed-ring.tex
index 2bb66de..3ee55a1 100644
--- a/packed-ring.tex
+++ b/packed-ring.tex
@@ -194,7 +194,7 @@ \subsection{Scatter-Gather Support}
 
 The device limits the number of descriptors in a list through a
 transport-specific and/or device-specific value. If not limited,
-the maximum number of descriptors in a list is the virt queue
+the maximum number of descriptors in a list is the virtqueue
 size.
 
 \subsection{Next Flag: Descriptor Chaining}
-- 
2.42.0

[PATCH 04/13] content: Rename SPI master to SPI controller

[Matias Ezequiel Vara Larsen]

From: Haixu Cui <quic_haixcui@quicinc.com>

SPI master is an outdated term and should use SPI controller.

Signed-off-by: Haixu Cui <quic_haixcui@quicinc.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit bb11bf9b25cc86c6ff02bf9f243da55b0d383a32)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 content.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content.tex b/content.tex
index c17ffa6..d3fc6a4 100644
--- a/content.tex
+++ b/content.tex
@@ -737,7 +737,7 @@ \chapter{Device Types}\label{sec:Device Types}
 \hline
 44         &   ISM device \\
 \hline
-45         &   SPI master \\
+45         &   SPI controller \\
 \hline
 \end{tabular}
 
-- 
2.42.0

[PATCH 05/13] virtio-blk: Fix data type of num_queues field

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Correct the endianness of num_queues field to be little endian.

Suggested-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20240521122119.2004071-1-parav@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 18e47c01207b2983a7dfd1e2c7de1bdc408d391a)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/blk/description.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-types/blk/description.tex b/device-types/blk/description.tex
index f04c932..2712ada 100644
--- a/device-types/blk/description.tex
+++ b/device-types/blk/description.tex
@@ -108,7 +108,7 @@ \subsection{Device configuration layout}\label{sec:Device Types / Block Device /
         } topology;
         u8 writeback;
         u8 unused0;
-        u16 num_queues;
+        le16 num_queues;
         le32 max_discard_sectors;
         le32 max_discard_seg;
         le32 discard_sector_alignment;
-- 
2.42.0

[PATCH 06/13] virtio-net: Fix receive buffer size calculation text

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Receive buffer size calculation is based on the following
negotiated features.

The text has wrong calculation for IPv6 and also it has missed
VIRTIO_NET_F_HASH_REPORT.

The problem of igorance of VIRTIO_NET_F_HASH_REPORT is reported
in [1], however fix for ipv6 payload length must also be
considered.

Since for the both the fixes touching same requirements, a
new issue is created as [2].

This patch brings following fixes.

1. Fix annotating struct virtio_net_hdr as field
2. Fix receive buffer calculation for guest GSO cases to consider
   ipv6 payload length
3. small grammar corrections for article
4. reword the requirement to consider the virtio_ndr_hdr which is
   depends on the negotiated feature, hence first clarify the
   struct virtio_net_hdr size

[1] https://github.com/oasis-tcs/virtio-spec/issues/170
[2] https://github.com/oasis-tcs/virtio-spec/issues/183

Fixes: https://github.com/oasis-tcs/virtio-spec/issues/170
Fixes: https://github.com/oasis-tcs/virtio-spec/issues/183
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Message-Id: <20240606102014.2103986-2-parav@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 00806815385340dd411cc67df3f6837935bb5e26)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 76585b0..0c7d361 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -654,10 +654,15 @@ \subsubsection{Setting Up Receive Buffers}\label{sec:Device Types / Network Devi
 If the VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
 VIRTIO_NET_F_GUEST_UFO, VIRTIO_NET_F_GUEST_USO4 or VIRTIO_NET_F_GUEST_USO6
 features are used, the maximum incoming packet
-will be to 65550 bytes long (the maximum size of a
-TCP or UDP packet, plus the 14 byte ethernet header), otherwise
-1514 bytes.  The 12-byte struct virtio_net_hdr is prepended to this,
-making for 65562 or 1526 bytes.
+will be 65589 bytes long (14 bytes of Ethernet header, plus 40 bytes of
+the IPv6 header, plus 65535 bytes of maximum IPv6 payload including any
+extension header), otherwise 1514 bytes.
+When VIRTIO_NET_F_HASH_REPORT is not negotiated, the required receive buffer
+size is either 65601 or 1526 bytes accounting for 20 bytes of
+\field{struct virtio_net_hdr} followed by receive packet.
+When VIRTIO_NET_F_HASH_REPORT is negotiated, the required receive buffer
+size is either 65609 or 1534 bytes accounting for 12 bytes of
+\field{struct virtio_net_hdr} followed by receive packet.
 
 \drivernormative{\paragraph}{Setting Up Receive Buffers}{Device Types / Network Device / Device Operation / Setting Up Receive Buffers}
 
@@ -666,18 +671,25 @@ \subsubsection{Setting Up Receive Buffers}\label{sec:Device Types / Network Devi
   \begin{itemize}
     \item If VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, VIRTIO_NET_F_GUEST_UFO,
 	VIRTIO_NET_F_GUEST_USO4 or VIRTIO_NET_F_GUEST_USO6 are negotiated, the driver SHOULD populate
-      the receive queue(s) with buffers of at least 65562 bytes.
+      the receive queue(s) with buffers of at least 65609 bytes if
+      VIRTIO_NET_F_HASH_REPORT is negotiated, and of at least 65601 bytes if not.
     \item Otherwise, the driver SHOULD populate the receive queue(s)
-      with buffers of at least 1526 bytes.
+      with buffers of at least 1534 bytes if VIRTIO_NET_F_HASH_REPORT
+      is negotiated, and of at least 1526 bytes if not.
   \end{itemize}
 \item If VIRTIO_NET_F_MRG_RXBUF is negotiated, each buffer MUST be at
-least the size of the struct virtio_net_hdr.
+least size of \field{struct virtio_net_hdr},
+i.e. 20 bytes if VIRTIO_NET_F_HASH_REPORT is negotiated, and 12 bytes if not.
 \end{itemize}
 
 \begin{note}
 Obviously each buffer can be split across multiple descriptor elements.
 \end{note}
 
+When calculating the size of \field{struct virtio_net_hdr}, the driver
+MUST consider all the fields inclusive up to \field{padding_reserved},
+i.e. 20 bytes if VIRTIO_NET_F_HASH_REPORT is negotiated, and 12 bytes if not.
+
 If VIRTIO_NET_F_MQ is negotiated, each of receiveq1\ldots receiveqN
 that will be used SHOULD be populated with receive buffers.
 
-- 
2.42.0

[PATCH 07/13] virtio-net: Clarify the size of the struct virtio_net_hdr for tx

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

The feature VIRTIO_NET_F_HASH_REPORT only applies to the receive side.
However, when VIRTIO_NET_F_HASH_REPORT feature was introduced, it was
not clarified that the size of the struct virtio_net_hdr on the packet
transmission also uses higher size when VIRTIO_NET_F_HASH_REPORT is
negotiated.

Explicitly clarify this.

Fixes: https://github.com/oasis-tcs/virtio-spec/issues/183
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Message-Id: <20240606102014.2103986-3-parav@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit bf0fdf8ba828b694a22c44d45cb3fd34cf813e99)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 0c7d361..7f9ed38 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -525,6 +525,9 @@ \subsubsection{Packet Transmission}\label{sec:Device Types / Network Device / De
 
 \drivernormative{\paragraph}{Packet Transmission}{Device Types / Network Device / Device Operation / Packet Transmission}
 
+For the transmit packet buffer, the driver MUST use the size of the
+structure \field{struct virtio_net_hdr} same as the receive packet buffer.
+
 The driver MUST set \field{num_buffers} to zero.
 
 If VIRTIO_NET_F_CSUM is not negotiated, the driver MUST set
-- 
2.42.0

[PATCH 08/13] virtio-net: Annotate virtio_net_hdr as field

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

At several places struct virtio_net_hdr missed out the field
annotation. Add it.

Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Message-Id: <20240606102014.2103986-4-parav@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 6abd42fd2398718ff689dc51fa93d38ede97be8f)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 7f9ed38..86cdb63 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -431,11 +431,11 @@ \subsection{Device Operation}\label{sec:Device Types / Network Device / Device O
 
 \subsubsection{Legacy Interface: Device Operation}\label{sec:Device Types / Network Device / Device Operation / Legacy Interface: Device Operation}
 When using the legacy interface, transitional devices and drivers
-MUST format the fields in struct virtio_net_hdr
+MUST format the fields in \field{struct virtio_net_hdr}
 according to the native endian of the guest rather than
 (necessarily when not using the legacy interface) little-endian.
 
-The legacy driver only presented \field{num_buffers} in the struct virtio_net_hdr
+The legacy driver only presented \field{num_buffers} in the \field{struct virtio_net_hdr}
 when VIRTIO_NET_F_MRG_RXBUF was negotiated; without that feature the
 structure was 2 bytes shorter.
 
@@ -729,7 +729,7 @@ \subsubsection{Processing of Incoming Packets}\label{sec:Device Types / Network
   chains them together to form a single packet in a way similar to
   how it would store it in a single buffer spread over multiple
   descriptors.
-  The other buffers will not begin with a struct virtio_net_hdr.
+  The other buffers will not begin with a \field{struct virtio_net_hdr}.
 
 \item If
   \field{num_buffers} is one, then the entire packet will be
@@ -1825,7 +1825,7 @@ \subsubsection{Legacy Interface: Framing Requirements}\label{sec:Device
 
 When using legacy interfaces, transitional drivers which have not
 negotiated VIRTIO_F_ANY_LAYOUT MUST use a single descriptor for the
-struct virtio_net_hdr on both transmit and receive, with the
+\field{struct virtio_net_hdr} on both transmit and receive, with the
 network data in the following descriptors.
 
 Additionally, when using the control virtqueue (see \ref{sec:Device
-- 
2.42.0

[PATCH 09/13] virtio_pci_cap64: specify offset_hi, length_hi endianness

[Matias Ezequiel Vara Larsen]

From: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>

While the capability introduction says "This virtio structure capability uses little-endian format,"
it might be preferrable to be explicit about the endianness of offset_hi and length_hi.

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Fixes: https://github.com/oasis-tcs/virtio-spec/issues/196
Message-Id: <DF89BB0F-6BA4-4DAB-AEC3-03AAF858EC8E@eonerc.rwth-aachen.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 9b3129fe72360a78e76b6dd890d3abc5a45fa915)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 transport-pci.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/transport-pci.tex b/transport-pci.tex
index a5c6719..95b08b8 100644
--- a/transport-pci.tex
+++ b/transport-pci.tex
@@ -252,8 +252,8 @@ \subsection{Virtio Structure PCI Capabilities}\label{sec:Virtio Transport Option
 \begin{lstlisting}
 struct virtio_pci_cap64 {
         struct virtio_pci_cap cap;
-        u32 offset_hi;
-        u32 length_hi;
+        le32 offset_hi;
+        le32 length_hi;
 };
 \end{lstlisting}
 
-- 
2.42.0

[PATCH 10/13] gpu: editorial: Fix spelling errors

[Matias Ezequiel Vara Larsen]

From: Parav Pandit <parav@nvidia.com>

Fix spelling errors.

Branch: virtio-1.4
Fixes: fed64230bf31 ("Add virtio gpu device specification.")
Fixes: https://github.com/oasis-tcs/virtio-spec/issues/205
Reviewed-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
Signed-off-by: Parav Pandit <parav@nvidia.com>
Link: https://lore.kernel.org/r/20240916030835.68178-5-parav@nvidia.com
(cherry picked from commit ec1845bd5a0261a65e29137f949ba03bf2fb44e2)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/gpu/description.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-types/gpu/description.tex b/device-types/gpu/description.tex
index 66e4873..ba4ea76 100644
--- a/device-types/gpu/description.tex
+++ b/device-types/gpu/description.tex
@@ -166,7 +166,7 @@ \subsubsection{Device Operation: Multihead setup}
 
 \devicenormative{\subsubsection}{Device Operation: Command lifecycle and fencing}{Device Types / GPU Device / Device Operation / Device Operation: Command lifecycle and fencing}
 
-The device MAY process controlq commands asyncronously and return them
+The device MAY process controlq commands asynchronously and return them
 to the driver before the processing is complete.  If the driver needs
 to know when the processing is finished it can set the
 VIRTIO_GPU_FLAG_FENCE flag in the request.  The device MUST finish the
@@ -345,7 +345,7 @@ \subsubsection{Device Operation: controlq}\label{sec:Device Types / GPU Device /
 display).
 
 The \field{enabled} field is set when the user enabled the display.
-It is roughly the same as the connected state of a phyiscal display
+It is roughly the same as the connected state of a physical display
 connector.
 
 \item[VIRTIO_GPU_CMD_GET_EDID] Retrieve the EDID data for a given
-- 
2.42.0

[PATCH 11/13] virtio-net: clarify NEEDS_CSUM semantic for GSO packats.

[Matias Ezequiel Vara Larsen]

From: Paolo Abeni <pabeni@redhat.com>

The current wording is a bit unclear hinting to possible additional
nested headers. For GSO packets virtio net (currently) supports
offload for the checksum of single transport header, explicitly state
that in both the driver and device sections.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Link: https://lore.kernel.org/r/81034d9f4b12f7bd7aa6f7f5266cb6d551d0823c.1732699986.git.pabeni@redhat.com
(cherry picked from commit 8e443f483843c3d42a4128778f1c7548a02c48bf)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 86cdb63..9ea713d 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -567,6 +567,11 @@ \subsubsection{Packet Transmission}\label{sec:Device Types / Network Device / De
 \item the driver MUST validate the packet checksum at
 	offset \field{csum_offset} from \field{csum_start} as well as all
 	preceding offsets;
+\begin{note}
+If \field{gso_type} differs from VIRTIO_NET_HDR_GSO_NONE, \field{csum_offset}
+points to the only transport header present in the packet, and there are no
+additional preceding checksums validated by VIRTIO_NET_HDR_F_NEEDS_CSUM.
+\end{note}
 \item the driver MUST set the packet checksum stored in the
 	buffer to the TCP/UDP pseudo header;
 \item the driver MUST set \field{csum_start} and
@@ -767,7 +772,11 @@ \subsubsection{Processing of Incoming Packets}\label{sec:Device Types / Network
   if bit VIRTIO_NET_HDR_F_RSC_INFO is not set in \field{flags},
   then \field{csum_start} and \field{csum_offset} indicate how to calculate it
   (see Packet Transmission point 1).
-
+\begin{note}
+If \field{gso_type} differs from VIRTIO_NET_HDR_GSO_NONE, \field{csum_offset}
+points to the only transport header present in the packet, and there are no
+additional preceding checksums validated by VIRTIO_NET_HDR_F_NEEDS_CSUM.
+\end{note}
 \end{enumerate}
 
 If applicable, the device calculates per-packet hash for incoming packets as
-- 
2.42.0

[PATCH 12/13] virtio-net: clarify DATA_VALID semantic for encap protos.

[Matias Ezequiel Vara Larsen]

From: Paolo Abeni <pabeni@redhat.com>

DATA_VALID allows offloading a single checksum level, leaving
unspecified which header checksum is offloaded when one or more
encapsulated protocols are present.

In such a case, the only option usable from the guest OS is
offloading the outermost checksum. That also matches the existing
implementation.

Explicitly state such the constraint, to remove any ambiguity and
make later changes more straightforward.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Link: https://lore.kernel.org/r/ec6fdbfba2c4fc1969d83799836ebb694a01fb30.1732699986.git.pabeni@redhat.com
(cherry picked from commit 95c085b2f16de4bcdcae9c42d7828d9b8efc7836)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 9ea713d..375faac 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -866,8 +866,8 @@ \subsubsection{Processing of Incoming Packets}\label{sec:Device Types / Network
 If the VIRTIO_NET_F_GUEST_CSUM feature has been negotiated, the
 device MAY set the VIRTIO_NET_HDR_F_DATA_VALID bit in
 \field{flags}, if so, the device MUST validate the packet
-checksum (in case of multiple encapsulated protocols, one level
-of checksums is validated).
+checksum. One level of checksum is validated: in case of multiple
+encapsulated protocols the outermost one.
 
 \drivernormative{\paragraph}{Processing of Incoming
 Packets}{Device Types / Network Device / Device Operation /
-- 
2.42.0

[PATCH 13/13] virtio-net: Fix receive buffer size typo

[Matias Ezequiel Vara Larsen]

From: Steffen Trumtrar <s.trumtrar@pengutronix.de>

The commit 00806815385340dd411cc67df3f6837935bb5e26 introduced a slight
typo in the struct virtio_net_hdr size calculation depending on
VIRTIO_NET_F_HASH_REPORT negotiation.

Without VIRTIO_NET_F_HASH_REPORT the struct is smaller than with the
feature. This mix up only occurs in one instance; sizes are correct in
all other occurences.

Fix this typo.

Fixes: 008068153853 ("virtio-net: Fix receive buffer size calculation text")
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Fixes: https://github.com/oasis-tcs/virtio-spec/issues/216
Link: https://lore.kernel.org/r/20250207-v1-4-topic-virtio-net-receive-buffer-fix-v1-1-efcef167d6bc@pengutronix.de
(cherry picked from commit 124fcd0e97f209aab19639e7369116d99ede22a2)
Signed-off-by: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
---
 device-types/net/description.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-types/net/description.tex b/device-types/net/description.tex
index 375faac..4494633 100644
--- a/device-types/net/description.tex
+++ b/device-types/net/description.tex
@@ -666,10 +666,10 @@ \subsubsection{Setting Up Receive Buffers}\label{sec:Device Types / Network Devi
 the IPv6 header, plus 65535 bytes of maximum IPv6 payload including any
 extension header), otherwise 1514 bytes.
 When VIRTIO_NET_F_HASH_REPORT is not negotiated, the required receive buffer
-size is either 65601 or 1526 bytes accounting for 20 bytes of
+size is either 65601 or 1526 bytes accounting for 12 bytes of
 \field{struct virtio_net_hdr} followed by receive packet.
 When VIRTIO_NET_F_HASH_REPORT is negotiated, the required receive buffer
-size is either 65609 or 1534 bytes accounting for 12 bytes of
+size is either 65609 or 1534 bytes accounting for 20 bytes of
 \field{struct virtio_net_hdr} followed by receive packet.
 
 \drivernormative{\paragraph}{Setting Up Receive Buffers}{Device Types / Network Device / Device Operation / Setting Up Receive Buffers}
-- 
2.42.0

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Michael S. Tsirkin]

On Tue, Apr 01, 2025 at 03:35:00PM +0200, Matias Ezequiel Vara Larsen wrote:
> Backport commits from 1.4 branch into 1.3 in preparation for releasing
> v1.3.
> 
> Haixu Cui (1):
>   content: Rename SPI master to SPI controller
> 
> Martin Kröning (1):
>   virtio_pci_cap64: specify offset_hi, length_hi endianness
> 
> Paolo Abeni (2):
>   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
>   virtio-net: clarify DATA_VALID semantic for encap protos.
> 
> Parav Pandit (8):
>   conformance: Add missing virtqueue reset conformance references
>   packed-ring: Change host,guest to device,driver
>   description: Avoid splitting the word virtqueue
>   virtio-blk: Fix data type of num_queues field
>   virtio-net: Fix receive buffer size calculation text
>   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
>   virtio-net: Annotate virtio_net_hdr as field
>   gpu: editorial: Fix spelling errors
> 
> Steffen Trumtrar (1):
>   virtio-net: Fix receive buffer size typo


Backport Looks good to me.

>  conformance.tex                  |  2 ++
>  content.tex                      |  2 +-
>  device-types/blk/description.tex |  2 +-
>  device-types/gpu/description.tex |  6 ++--
>  device-types/net/description.tex | 52 +++++++++++++++++++++++---------
>  packed-ring.tex                  |  4 +--
>  transport-pci.tex                |  4 +--
>  7 files changed, 49 insertions(+), 23 deletions(-)
> 
> 
> base-commit: b495841a8e80d12c1130f8868f4128866291142d
> -- 
> 2.42.0

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Cornelia Huck]

On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen <mvaralar@redhat.com> wrote:

> Backport commits from 1.4 branch into 1.3 in preparation for releasing
> v1.3.
>
> Haixu Cui (1):
>   content: Rename SPI master to SPI controller
>
> Martin Kröning (1):
>   virtio_pci_cap64: specify offset_hi, length_hi endianness
>
> Paolo Abeni (2):
>   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
>   virtio-net: clarify DATA_VALID semantic for encap protos.
>
> Parav Pandit (8):
>   conformance: Add missing virtqueue reset conformance references
>   packed-ring: Change host,guest to device,driver
>   description: Avoid splitting the word virtqueue
>   virtio-blk: Fix data type of num_queues field
>   virtio-net: Fix receive buffer size calculation text
>   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
>   virtio-net: Annotate virtio_net_hdr as field
>   gpu: editorial: Fix spelling errors
>
> Steffen Trumtrar (1):
>   virtio-net: Fix receive buffer size typo
>
>  conformance.tex                  |  2 ++
>  content.tex                      |  2 +-
>  device-types/blk/description.tex |  2 +-
>  device-types/gpu/description.tex |  6 ++--
>  device-types/net/description.tex | 52 +++++++++++++++++++++++---------
>  packed-ring.tex                  |  4 +--
>  transport-pci.tex                |  4 +--
>  7 files changed, 49 insertions(+), 23 deletions(-)
>
>
> base-commit: b495841a8e80d12c1130f8868f4128866291142d

Looks good to me.

RE: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Parav Pandit]

> From: Cornelia Huck <cohuck@redhat.com>
> Sent: Wednesday, April 2, 2025 2:53 PM
> 
> On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> wrote:
> 
> > Backport commits from 1.4 branch into 1.3 in preparation for releasing
> > v1.3.
> >
> > Haixu Cui (1):
> >   content: Rename SPI master to SPI controller
> >
> > Martin Kröning (1):
> >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> >
> > Paolo Abeni (2):
> >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> >   virtio-net: clarify DATA_VALID semantic for encap protos.
> >
> > Parav Pandit (8):
> >   conformance: Add missing virtqueue reset conformance references
> >   packed-ring: Change host,guest to device,driver
> >   description: Avoid splitting the word virtqueue
> >   virtio-blk: Fix data type of num_queues field
> >   virtio-net: Fix receive buffer size calculation text
> >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> >   virtio-net: Annotate virtio_net_hdr as field
> >   gpu: editorial: Fix spelling errors
> >
> > Steffen Trumtrar (1):
> >   virtio-net: Fix receive buffer size typo
> >
> >  conformance.tex                  |  2 ++
> >  content.tex                      |  2 +-
> >  device-types/blk/description.tex |  2 +-
> > device-types/gpu/description.tex |  6 ++--
> > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> >  packed-ring.tex                  |  4 +--
> >  transport-pci.tex                |  4 +--
> >  7 files changed, 49 insertions(+), 23 deletions(-)
> >
> >
> > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> 
> Looks good to me.

I did dry run and was able to merge them to master successfully with pdf diff too.
Do we need a vote for it or because these changes are already voted somewhere else or they are editorial, can I merge the changes now?

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Matias Ezequiel Vara Larsen]

On Wed, Apr 2, 2025 at 12:25 PM Parav Pandit <parav@nvidia.com> wrote:
>
>
> > From: Cornelia Huck <cohuck@redhat.com>
> > Sent: Wednesday, April 2, 2025 2:53 PM
> >
> > On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> > wrote:
> >
> > > Backport commits from 1.4 branch into 1.3 in preparation for releasing
> > > v1.3.
> > >
> > > Haixu Cui (1):
> > >   content: Rename SPI master to SPI controller
> > >
> > > Martin Kröning (1):
> > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > >
> > > Paolo Abeni (2):
> > >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> > >   virtio-net: clarify DATA_VALID semantic for encap protos.
> > >
> > > Parav Pandit (8):
> > >   conformance: Add missing virtqueue reset conformance references
> > >   packed-ring: Change host,guest to device,driver
> > >   description: Avoid splitting the word virtqueue
> > >   virtio-blk: Fix data type of num_queues field
> > >   virtio-net: Fix receive buffer size calculation text
> > >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> > >   virtio-net: Annotate virtio_net_hdr as field
> > >   gpu: editorial: Fix spelling errors
> > >
> > > Steffen Trumtrar (1):
> > >   virtio-net: Fix receive buffer size typo
> > >
> > >  conformance.tex                  |  2 ++
> > >  content.tex                      |  2 +-
> > >  device-types/blk/description.tex |  2 +-
> > > device-types/gpu/description.tex |  6 ++--
> > > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> > >  packed-ring.tex                  |  4 +--
> > >  transport-pci.tex                |  4 +--
> > >  7 files changed, 49 insertions(+), 23 deletions(-)
> > >
> > >
> > > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> >
> > Looks good to me.
>
> I did dry run and was able to merge them to master successfully with pdf diff too.
> Do we need a vote for it or because these changes are already voted somewhere else or they are editorial, can I merge the changes now?
>

Cool, thanks. I do not know how this usually works. I was planning to
follow the normal procedure: 1. open an issue, 2. comment in the
thread, 3. open a ballot.

Matias

RE: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Parav Pandit]

> From: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> Sent: Wednesday, April 2, 2025 3:59 PM
> 
> On Wed, Apr 2, 2025 at 12:25 PM Parav Pandit <parav@nvidia.com> wrote:
> >
> >
> > > From: Cornelia Huck <cohuck@redhat.com>
> > > Sent: Wednesday, April 2, 2025 2:53 PM
> > >
> > > On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen
> > > <mvaralar@redhat.com>
> > > wrote:
> > >
> > > > Backport commits from 1.4 branch into 1.3 in preparation for
> > > > releasing v1.3.
> > > >
> > > > Haixu Cui (1):
> > > >   content: Rename SPI master to SPI controller
> > > >
> > > > Martin Kröning (1):
> > > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > > >
> > > > Paolo Abeni (2):
> > > >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> > > >   virtio-net: clarify DATA_VALID semantic for encap protos.
> > > >
> > > > Parav Pandit (8):
> > > >   conformance: Add missing virtqueue reset conformance references
> > > >   packed-ring: Change host,guest to device,driver
> > > >   description: Avoid splitting the word virtqueue
> > > >   virtio-blk: Fix data type of num_queues field
> > > >   virtio-net: Fix receive buffer size calculation text
> > > >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> > > >   virtio-net: Annotate virtio_net_hdr as field
> > > >   gpu: editorial: Fix spelling errors
> > > >
> > > > Steffen Trumtrar (1):
> > > >   virtio-net: Fix receive buffer size typo
> > > >
> > > >  conformance.tex                  |  2 ++
> > > >  content.tex                      |  2 +-
> > > >  device-types/blk/description.tex |  2 +-
> > > > device-types/gpu/description.tex |  6 ++--
> > > > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> > > >  packed-ring.tex                  |  4 +--
> > > >  transport-pci.tex                |  4 +--
> > > >  7 files changed, 49 insertions(+), 23 deletions(-)
> > > >
> > > >
> > > > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> > >
> > > Looks good to me.
> >
> > I did dry run and was able to merge them to master successfully with pdf
> diff too.
> > Do we need a vote for it or because these changes are already voted
> somewhere else or they are editorial, can I merge the changes now?
> >
> 
> Cool, thanks. I do not know how this usually works. I was planning to follow
> the normal procedure: 1. open an issue, 2. comment in the thread, 3. open a
> ballot.
> 
Sounds good to me.

We need below fix too.

124fcd0 virtio-net: Fix receive buffer size typo

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Matias Ezequiel Vara Larsen]

On Wed, Apr 2, 2025 at 12:59 PM Parav Pandit <parav@nvidia.com> wrote:
>
>
> > From: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> > Sent: Wednesday, April 2, 2025 3:59 PM
> >
> > On Wed, Apr 2, 2025 at 12:25 PM Parav Pandit <parav@nvidia.com> wrote:
> > >
> > >
> > > > From: Cornelia Huck <cohuck@redhat.com>
> > > > Sent: Wednesday, April 2, 2025 2:53 PM
> > > >
> > > > On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen
> > > > <mvaralar@redhat.com>
> > > > wrote:
> > > >
> > > > > Backport commits from 1.4 branch into 1.3 in preparation for
> > > > > releasing v1.3.
> > > > >
> > > > > Haixu Cui (1):
> > > > >   content: Rename SPI master to SPI controller
> > > > >
> > > > > Martin Kröning (1):
> > > > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > > > >
> > > > > Paolo Abeni (2):
> > > > >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> > > > >   virtio-net: clarify DATA_VALID semantic for encap protos.
> > > > >
> > > > > Parav Pandit (8):
> > > > >   conformance: Add missing virtqueue reset conformance references
> > > > >   packed-ring: Change host,guest to device,driver
> > > > >   description: Avoid splitting the word virtqueue
> > > > >   virtio-blk: Fix data type of num_queues field
> > > > >   virtio-net: Fix receive buffer size calculation text
> > > > >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> > > > >   virtio-net: Annotate virtio_net_hdr as field
> > > > >   gpu: editorial: Fix spelling errors
> > > > >
> > > > > Steffen Trumtrar (1):
> > > > >   virtio-net: Fix receive buffer size typo
> > > > >
> > > > >  conformance.tex                  |  2 ++
> > > > >  content.tex                      |  2 +-
> > > > >  device-types/blk/description.tex |  2 +-
> > > > > device-types/gpu/description.tex |  6 ++--
> > > > > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> > > > >  packed-ring.tex                  |  4 +--
> > > > >  transport-pci.tex                |  4 +--
> > > > >  7 files changed, 49 insertions(+), 23 deletions(-)
> > > > >
> > > > >
> > > > > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> > > >
> > > > Looks good to me.
> > >
> > > I did dry run and was able to merge them to master successfully with pdf
> > diff too.
> > > Do we need a vote for it or because these changes are already voted
> > somewhere else or they are editorial, can I merge the changes now?
> > >
> >
> > Cool, thanks. I do not know how this usually works. I was planning to follow
> > the normal procedure: 1. open an issue, 2. comment in the thread, 3. open a
> > ballot.
> >
> Sounds good to me.
>
> We need below fix too.
>
> 124fcd0 virtio-net: Fix receive buffer size typo

I think it is in `[PATCH 13/13] virtio-net: Fix receive buffer size typo`.

Matias

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Matias Ezequiel Vara Larsen]

On Wed, Apr 2, 2025 at 5:24 PM Matias Ezequiel Vara Larsen
<mvaralar@redhat.com> wrote:
>
> On Wed, Apr 2, 2025 at 12:59 PM Parav Pandit <parav@nvidia.com> wrote:
> >
> >
> > > From: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> > > Sent: Wednesday, April 2, 2025 3:59 PM
> > >
> > > On Wed, Apr 2, 2025 at 12:25 PM Parav Pandit <parav@nvidia.com> wrote:
> > > >
> > > >
> > > > > From: Cornelia Huck <cohuck@redhat.com>
> > > > > Sent: Wednesday, April 2, 2025 2:53 PM
> > > > >
> > > > > On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen
> > > > > <mvaralar@redhat.com>
> > > > > wrote:
> > > > >
> > > > > > Backport commits from 1.4 branch into 1.3 in preparation for
> > > > > > releasing v1.3.
> > > > > >
> > > > > > Haixu Cui (1):
> > > > > >   content: Rename SPI master to SPI controller
> > > > > >
> > > > > > Martin Kröning (1):
> > > > > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > > > > >
> > > > > > Paolo Abeni (2):
> > > > > >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> > > > > >   virtio-net: clarify DATA_VALID semantic for encap protos.
> > > > > >
> > > > > > Parav Pandit (8):
> > > > > >   conformance: Add missing virtqueue reset conformance references
> > > > > >   packed-ring: Change host,guest to device,driver
> > > > > >   description: Avoid splitting the word virtqueue
> > > > > >   virtio-blk: Fix data type of num_queues field
> > > > > >   virtio-net: Fix receive buffer size calculation text
> > > > > >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> > > > > >   virtio-net: Annotate virtio_net_hdr as field
> > > > > >   gpu: editorial: Fix spelling errors
> > > > > >
> > > > > > Steffen Trumtrar (1):
> > > > > >   virtio-net: Fix receive buffer size typo
> > > > > >
> > > > > >  conformance.tex                  |  2 ++
> > > > > >  content.tex                      |  2 +-
> > > > > >  device-types/blk/description.tex |  2 +-
> > > > > > device-types/gpu/description.tex |  6 ++--
> > > > > > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> > > > > >  packed-ring.tex                  |  4 +--
> > > > > >  transport-pci.tex                |  4 +--
> > > > > >  7 files changed, 49 insertions(+), 23 deletions(-)
> > > > > >
> > > > > >
> > > > > > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> > > > >
> > > > > Looks good to me.
> > > >
> > > > I did dry run and was able to merge them to master successfully with pdf
> > > diff too.
> > > > Do we need a vote for it or because these changes are already voted
> > > somewhere else or they are editorial, can I merge the changes now?
> > > >
> > >
> > > Cool, thanks. I do not know how this usually works. I was planning to follow
> > > the normal procedure: 1. open an issue, 2. comment in the thread, 3. open a
> > > ballot.
> > >
> > Sounds good to me.
> >
> > We need below fix too.
> >
> > 124fcd0 virtio-net: Fix receive buffer size typo
>
> I think it is in `[PATCH 13/13] virtio-net: Fix receive buffer size typo`.
>
> Matias

Could please open a voting ballot for these changes?

Fixes: https://github.com/oasis-tcs/virtio-spec/issues/220

Thanks, Matias.

Re: [PATCH 00/13] Backport 1.4 fixes to 1.3

[Michael S. Tsirkin]

On Thu, Apr 03, 2025 at 10:14:42AM +0200, Matias Ezequiel Vara Larsen wrote:
> On Wed, Apr 2, 2025 at 5:24 PM Matias Ezequiel Vara Larsen
> <mvaralar@redhat.com> wrote:
> >
> > On Wed, Apr 2, 2025 at 12:59 PM Parav Pandit <parav@nvidia.com> wrote:
> > >
> > >
> > > > From: Matias Ezequiel Vara Larsen <mvaralar@redhat.com>
> > > > Sent: Wednesday, April 2, 2025 3:59 PM
> > > >
> > > > On Wed, Apr 2, 2025 at 12:25 PM Parav Pandit <parav@nvidia.com> wrote:
> > > > >
> > > > >
> > > > > > From: Cornelia Huck <cohuck@redhat.com>
> > > > > > Sent: Wednesday, April 2, 2025 2:53 PM
> > > > > >
> > > > > > On Tue, Apr 01 2025, Matias Ezequiel Vara Larsen
> > > > > > <mvaralar@redhat.com>
> > > > > > wrote:
> > > > > >
> > > > > > > Backport commits from 1.4 branch into 1.3 in preparation for
> > > > > > > releasing v1.3.
> > > > > > >
> > > > > > > Haixu Cui (1):
> > > > > > >   content: Rename SPI master to SPI controller
> > > > > > >
> > > > > > > Martin Kröning (1):
> > > > > > >   virtio_pci_cap64: specify offset_hi, length_hi endianness
> > > > > > >
> > > > > > > Paolo Abeni (2):
> > > > > > >   virtio-net: clarify NEEDS_CSUM semantic for GSO packats.
> > > > > > >   virtio-net: clarify DATA_VALID semantic for encap protos.
> > > > > > >
> > > > > > > Parav Pandit (8):
> > > > > > >   conformance: Add missing virtqueue reset conformance references
> > > > > > >   packed-ring: Change host,guest to device,driver
> > > > > > >   description: Avoid splitting the word virtqueue
> > > > > > >   virtio-blk: Fix data type of num_queues field
> > > > > > >   virtio-net: Fix receive buffer size calculation text
> > > > > > >   virtio-net: Clarify the size of the struct virtio_net_hdr for tx
> > > > > > >   virtio-net: Annotate virtio_net_hdr as field
> > > > > > >   gpu: editorial: Fix spelling errors
> > > > > > >
> > > > > > > Steffen Trumtrar (1):
> > > > > > >   virtio-net: Fix receive buffer size typo
> > > > > > >
> > > > > > >  conformance.tex                  |  2 ++
> > > > > > >  content.tex                      |  2 +-
> > > > > > >  device-types/blk/description.tex |  2 +-
> > > > > > > device-types/gpu/description.tex |  6 ++--
> > > > > > > device-types/net/description.tex | 52 +++++++++++++++++++++++---------
> > > > > > >  packed-ring.tex                  |  4 +--
> > > > > > >  transport-pci.tex                |  4 +--
> > > > > > >  7 files changed, 49 insertions(+), 23 deletions(-)
> > > > > > >
> > > > > > >
> > > > > > > base-commit: b495841a8e80d12c1130f8868f4128866291142d
> > > > > >
> > > > > > Looks good to me.
> > > > >
> > > > > I did dry run and was able to merge them to master successfully with pdf
> > > > diff too.
> > > > > Do we need a vote for it or because these changes are already voted
> > > > somewhere else or they are editorial, can I merge the changes now?
> > > > >
> > > >
> > > > Cool, thanks. I do not know how this usually works. I was planning to follow
> > > > the normal procedure: 1. open an issue, 2. comment in the thread, 3. open a
> > > > ballot.
> > > >
> > > Sounds good to me.
> > >
> > > We need below fix too.
> > >
> > > 124fcd0 virtio-net: Fix receive buffer size typo
> >
> > I think it is in `[PATCH 13/13] virtio-net: Fix receive buffer size typo`.
> >
> > Matias
> 
> Could please open a voting ballot for these changes?
> 
> Fixes: https://github.com/oasis-tcs/virtio-spec/issues/220
> 
> Thanks, Matias.


OK but you need to fix the link in the issue to point at
the virtio comment list. We need to be sure only patches
on list are merged.