5.10-stable patches

added patches:
	iommu-amd-clarify-amd-iommuv2-initialization-messages.patch
	vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch

diff --git a/queue-5.10/iommu-amd-clarify-amd-iommuv2-initialization-messages.patch b/queue-5.10/iommu-amd-clarify-amd-iommuv2-initialization-messages.patch
new file mode 100644 (file)
index 0000000..fa20233
--- /dev/null
+++ b/queue-5.10/iommu-amd-clarify-amd-iommuv2-initialization-messages.patch
@@ -0,0 +1,44 @@
+From 717e88aad37befedfd531378b632e794e24e9afb Mon Sep 17 00:00:00 2001
+From: Joerg Roedel <jroedel@suse.de>
+Date: Tue, 23 Nov 2021 11:55:07 +0100
+Subject: iommu/amd: Clarify AMD IOMMUv2 initialization messages
+
+From: Joerg Roedel <jroedel@suse.de>
+
+commit 717e88aad37befedfd531378b632e794e24e9afb upstream.
+
+The messages printed on the initialization of the AMD IOMMUv2 driver
+have caused some confusion in the past. Clarify the messages to lower
+the confusion in the future.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Link: https://lore.kernel.org/r/20211123105507.7654-3-joro@8bytes.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iommu/amd/iommu_v2.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/iommu/amd/iommu_v2.c
++++ b/drivers/iommu/amd/iommu_v2.c
+@@ -927,10 +927,8 @@ static int __init amd_iommu_v2_init(void
+ {
+       int ret;
+ 
+-      pr_info("AMD IOMMUv2 driver by Joerg Roedel <jroedel@suse.de>\n");
+-
+       if (!amd_iommu_v2_supported()) {
+-              pr_info("AMD IOMMUv2 functionality not available on this system\n");
++              pr_info("AMD IOMMUv2 functionality not available on this system - This is not a bug.\n");
+               /*
+                * Load anyway to provide the symbols to other modules
+                * which may use AMD IOMMUv2 optionally.
+@@ -947,6 +945,8 @@ static int __init amd_iommu_v2_init(void
+ 
+       amd_iommu_register_ppr_notifier(&ppr_nb);
+ 
++      pr_info("AMD IOMMUv2 loaded and initialized\n");
++
+       return 0;
+ 
+ out:

diff --git a/queue-5.10/series b/queue-5.10/series
index fc9d529c657b7e6571b1be84b868e04908aa0197..5d6512b1df5856339ab72d65848921b429d0620b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -103,3 +103,5 @@ sched-scs-reset-task-stack-state-in-bringup_cpu.patch
 f2fs-set-sbi_need_fsck-flag-when-inconsistent-node-b.patch
 ceph-properly-handle-statfs-on-multifs-setups.patch
 smb3-do-not-error-on-fsync-when-readonly.patch
+iommu-amd-clarify-amd-iommuv2-initialization-messages.patch
+vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch

diff --git a/queue-5.10/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch b/queue-5.10/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch
new file mode 100644 (file)
index 0000000..b10341f
--- /dev/null
+++ b/queue-5.10/vhost-vsock-fix-incorrect-used-length-reported-to-the-guest.patch
@@ -0,0 +1,41 @@
+From 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 Mon Sep 17 00:00:00 2001
+From: Stefano Garzarella <sgarzare@redhat.com>
+Date: Mon, 22 Nov 2021 17:35:24 +0100
+Subject: vhost/vsock: fix incorrect used length reported to the guest
+
+From: Stefano Garzarella <sgarzare@redhat.com>
+
+commit 49d8c5ffad07ca014cfae72a1b9b8c52b6ad9cb8 upstream.
+
+The "used length" reported by calling vhost_add_used() must be the
+number of bytes written by the device (using "in" buffers).
+
+In vhost_vsock_handle_tx_kick() the device only reads the guest
+buffers (they are all "out" buffers), without writing anything,
+so we must pass 0 as "used length" to comply virtio spec.
+
+Fixes: 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko")
+Cc: stable@vger.kernel.org
+Reported-by: Halil Pasic <pasic@linux.ibm.com>
+Suggested-by: Jason Wang <jasowang@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
+Link: https://lore.kernel.org/r/20211122163525.294024-2-sgarzare@redhat.com
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/vhost/vsock.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/vhost/vsock.c
++++ b/drivers/vhost/vsock.c
+@@ -494,7 +494,7 @@ static void vhost_vsock_handle_tx_kick(s
+                       virtio_transport_free_pkt(pkt);
+ 
+               len += sizeof(pkt->hdr);
+-              vhost_add_used(vq, head, len);
++              vhost_add_used(vq, head, 0);
+               total_len += len;
+               added = true;
+       } while(likely(!vhost_exceeds_weight(vq, ++pkts, total_len)));