From d5d6f97213b61440f4915983bd0d08ca26ad66f0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Aug 2022 17:34:12 +0200 Subject: [PATCH] 5.15-stable patches added patches: io_uring-mem-account-pbuf-buckets.patch revert-net-usb-ax88179_178a-needs-flag_send_zlp.patch --- .../io_uring-mem-account-pbuf-buckets.patch | 34 +++++ ...usb-ax88179_178a-needs-flag_send_zlp.patch | 123 ++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 queue-5.15/io_uring-mem-account-pbuf-buckets.patch create mode 100644 queue-5.15/revert-net-usb-ax88179_178a-needs-flag_send_zlp.patch diff --git a/queue-5.15/io_uring-mem-account-pbuf-buckets.patch b/queue-5.15/io_uring-mem-account-pbuf-buckets.patch new file mode 100644 index 00000000000..369a57616ee --- /dev/null +++ b/queue-5.15/io_uring-mem-account-pbuf-buckets.patch @@ -0,0 +1,34 @@ +From cc18cc5e82033d406f54144ad6f8092206004684 Mon Sep 17 00:00:00 2001 +From: Pavel Begunkov +Date: Thu, 4 Aug 2022 15:13:46 +0100 +Subject: io_uring: mem-account pbuf buckets + +From: Pavel Begunkov + +commit cc18cc5e82033d406f54144ad6f8092206004684 upstream. + +Potentially, someone may create as many pbuf bucket as there are indexes +in an xarray without any other restrictions bounding our memory usage, +put memory needed for the buckets under memory accounting. + +Cc: +Signed-off-by: Pavel Begunkov +Link: https://lore.kernel.org/r/d34c452e45793e978d26e2606211ec9070d329ea.1659622312.git.asml.silence@gmail.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + fs/io_uring.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/io_uring.c ++++ b/fs/io_uring.c +@@ -4477,7 +4477,8 @@ static int io_provide_buffers(struct io_ + + ret = io_add_buffers(p, &head); + if (ret >= 0 && !list) { +- ret = xa_insert(&ctx->io_buffers, p->bgid, head, GFP_KERNEL); ++ ret = xa_insert(&ctx->io_buffers, p->bgid, head, ++ GFP_KERNEL_ACCOUNT); + if (ret < 0) + __io_remove_buffers(ctx, head, p->bgid, -1U); + } diff --git a/queue-5.15/revert-net-usb-ax88179_178a-needs-flag_send_zlp.patch b/queue-5.15/revert-net-usb-ax88179_178a-needs-flag_send_zlp.patch new file mode 100644 index 00000000000..13d9bc8c8fe --- /dev/null +++ b/queue-5.15/revert-net-usb-ax88179_178a-needs-flag_send_zlp.patch @@ -0,0 +1,123 @@ +From 6fd2c17fb6e02a8c0ab51df1cfec82ce96b8e83d Mon Sep 17 00:00:00 2001 +From: Jose Alonso +Date: Mon, 8 Aug 2022 08:35:04 -0300 +Subject: Revert "net: usb: ax88179_178a needs FLAG_SEND_ZLP" + +From: Jose Alonso + +commit 6fd2c17fb6e02a8c0ab51df1cfec82ce96b8e83d upstream. + +This reverts commit 36a15e1cb134c0395261ba1940762703f778438c. + +The usage of FLAG_SEND_ZLP causes problems to other firmware/hardware +versions that have no issues. + +The FLAG_SEND_ZLP is not safe to use in this context. +See: +https://patchwork.ozlabs.org/project/netdev/patch/1270599787.8900.8.camel@Linuxdev4-laptop/#118378 +The original problem needs another way to solve. + +Fixes: 36a15e1cb134 ("net: usb: ax88179_178a needs FLAG_SEND_ZLP") +Cc: stable@vger.kernel.org +Reported-by: Ronald Wahl +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216327 +Link: https://bugs.archlinux.org/task/75491 +Signed-off-by: Jose Alonso +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/ax88179_178a.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/drivers/net/usb/ax88179_178a.c ++++ b/drivers/net/usb/ax88179_178a.c +@@ -1796,7 +1796,7 @@ static const struct driver_info ax88179_ + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1809,7 +1809,7 @@ static const struct driver_info ax88178a + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1822,7 +1822,7 @@ static const struct driver_info cypress_ + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1835,7 +1835,7 @@ static const struct driver_info dlink_du + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1848,7 +1848,7 @@ static const struct driver_info sitecom_ + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1861,7 +1861,7 @@ static const struct driver_info samsung_ + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1874,7 +1874,7 @@ static const struct driver_info lenovo_i + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1887,7 +1887,7 @@ static const struct driver_info belkin_i + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1900,7 +1900,7 @@ static const struct driver_info toshiba_ + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; +@@ -1913,7 +1913,7 @@ static const struct driver_info mct_info + .link_reset = ax88179_link_reset, + .reset = ax88179_reset, + .stop = ax88179_stop, +- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, ++ .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .rx_fixup = ax88179_rx_fixup, + .tx_fixup = ax88179_tx_fixup, + }; -- 2.47.3