From 4db5f86e75bcf6c2da0ff5337524649da2080445 Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: May 12 2023 08:07:40 +0000 Subject: xen/netback: use same error messages for same errors (git-fixes). --- diff --git a/patches.suse/xen-netback-use-same-error-messages-for-same-errors.patch b/patches.suse/xen-netback-use-same-error-messages-for-same-errors.patch new file mode 100644 index 0000000..f057fa2 --- /dev/null +++ b/patches.suse/xen-netback-use-same-error-messages-for-same-errors.patch @@ -0,0 +1,39 @@ +Patch-mainline: v6.3-rc5 +Git-commit: 2eca98e5b24d01c02b46c67be05a5f98cc9789b1 +References: git-fixes +From: Juergen Gross +Date: Wed, 29 Mar 2023 10:02:59 +0200 +Subject: [PATCH] xen/netback: use same error messages for same errors + +Issue the same error message in case an illegal page boundary crossing +has been detected in both cases where this is tested. + +Suggested-by: Jan Beulich +Signed-off-by: Juergen Gross +Reviewed-by: Jan Beulich +Link: https://lore.kernel.org/r/20230329080259.14823-1-jgross@suse.com +Signed-off-by: Paolo Abeni +--- + drivers/net/xen-netback/netback.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c +index 4943be4fd99d..c1501f41e2d8 100644 +--- a/drivers/net/xen-netback/netback.c ++++ b/drivers/net/xen-netback/netback.c +@@ -994,10 +994,8 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, + + /* No crossing a page as the payload mustn't fragment. */ + if (unlikely((txreq.offset + txreq.size) > XEN_PAGE_SIZE)) { +- netdev_err(queue->vif->dev, +- "txreq.offset: %u, size: %u, end: %lu\n", +- txreq.offset, txreq.size, +- (unsigned long)(txreq.offset&~XEN_PAGE_MASK) + txreq.size); ++ netdev_err(queue->vif->dev, "Cross page boundary, txreq.offset: %u, size: %u\n", ++ txreq.offset, txreq.size); + xenvif_fatal_tx_err(queue->vif); + break; + } +-- +2.35.3 + diff --git a/series.conf b/series.conf index 1751b49..b700e78 100644 --- a/series.conf +++ b/series.conf @@ -63314,6 +63314,7 @@ patches.suse/usb-chipidea-core-fix-possible-concurrent-when-switc.patch patches.suse/s390-vfio-ap-fix-memory-leak-in-vfio_ap-device-drive.patch patches.suse/xen-netback-don-t-do-grant-copy-across-page-boundary.patch + patches.suse/xen-netback-use-same-error-messages-for-same-errors.patch patches.suse/NFSv4-Fix-hangs-when-recovering-open-state-after-a-s.patch patches.suse/ring-buffer-Fix-race-while-reader-and-writer-are-on-the-same-page.patch patches.suse/ftrace-Mark-get_lock_parent_ip-__always_inline.patch