Drop zram-fix-uninitialized-zram-not-releasing-backing-de.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/series b/queue-5.10/series
index ad58b056435f9abcf6b5d1a4e3773ac1b4b24581..69b906c91a961dc6fa91407d92e69e00af3f08c9 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -95,7 +95,6 @@ sd-update-the-bdev-size-in-sd_revalidate_disk.patch
 block-remove-the-update_bdev-parameter-to-set_capaci.patch
 zram-use-set_capacity_and_notify.patch
 drivers-block-zram-zram_drv.c-do-not-keep-dangling-z.patch
-zram-fix-uninitialized-zram-not-releasing-backing-de.patch
 net-mlx5-make-api-mlx5_core_is_ecpf-accept-const-poi.patch
 rdma-mlx5-enforce-same-type-port-association-for-mul.patch
 rdma-bnxt_re-add-check-for-path-mtu-in-modify_qp.patch

diff --git a/queue-5.10/zram-fix-uninitialized-zram-not-releasing-backing-de.patch b/queue-5.10/zram-fix-uninitialized-zram-not-releasing-backing-de.patch
deleted file mode 100644 (file)
index 5a84fee..0000000
--- a/queue-5.10/zram-fix-uninitialized-zram-not-releasing-backing-de.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f8f08cc9436187c1fcb912e5f756e96f512935c3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Dec 2024 00:57:16 +0800
-Subject: zram: fix uninitialized ZRAM not releasing backing device
-
-From: Kairui Song <kasong@tencent.com>
-
-[ Upstream commit 74363ec674cb172d8856de25776c8f3103f05e2f ]
-
-Setting backing device is done before ZRAM initialization.  If we set the
-backing device, then remove the ZRAM module without initializing the
-device, the backing device reference will be leaked and the device will be
-hold forever.
-
-Fix this by always reset the ZRAM fully on rmmod or reset store.
-
-Link: https://lkml.kernel.org/r/20241209165717.94215-3-ryncsn@gmail.com
-Fixes: 013bf95a83ec ("zram: add interface to specif backing device")
-Signed-off-by: Kairui Song <kasong@tencent.com>
-Reported-by: Desheng Wu <deshengwu@tencent.com>
-Suggested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/zram/zram_drv.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 8e13586be8c9..05a46fbe0ea9 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -1146,12 +1146,16 @@ static void zram_meta_free(struct zram *zram, u64 disksize)
-       size_t num_pages = disksize >> PAGE_SHIFT;
-       size_t index;
- 
-+      if (!zram->table)
-+              return;
-+
-       /* Free all pages that are still in this zram device */
-       for (index = 0; index < num_pages; index++)
-               zram_free_page(zram, index);
- 
-       zs_destroy_pool(zram->mem_pool);
-       vfree(zram->table);
-+      zram->table = NULL;
- }
- 
- static bool zram_meta_alloc(struct zram *zram, u64 disksize)
-@@ -1694,11 +1698,6 @@ static void zram_reset_device(struct zram *zram)
- 
-       zram->limit_pages = 0;
- 
--      if (!init_done(zram)) {
--              up_write(&zram->init_lock);
--              return;
--      }
--
-       set_capacity_and_notify(zram->disk, 0);
-       part_stat_set_all(&zram->disk->part0, 0);
- 
--- 
-2.39.5
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 53a3005e20c1499bff2383523e0171f947f494af..e0b74230907c5a9b2dc5ca88b302f77e2e8a6955 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -113,7 +113,6 @@ xhci-retry-stop-endpoint-on-buggy-nec-controllers.patch
 usb-xhci-limit-stop-endpoint-retries.patch
 xhci-turn-nec-specific-quirk-for-handling-stop-endpo.patch
 drivers-block-zram-zram_drv.c-do-not-keep-dangling-z.patch
-zram-fix-uninitialized-zram-not-releasing-backing-de.patch
 rdma-mlx5-enforce-same-type-port-association-for-mul.patch
 rdma-bnxt_re-add-check-for-path-mtu-in-modify_qp.patch
 rdma-bnxt_re-fix-reporting-hw_ver-in-query_device.patch

diff --git a/queue-5.15/zram-fix-uninitialized-zram-not-releasing-backing-de.patch b/queue-5.15/zram-fix-uninitialized-zram-not-releasing-backing-de.patch
deleted file mode 100644 (file)
index 92a8bfe..0000000
--- a/queue-5.15/zram-fix-uninitialized-zram-not-releasing-backing-de.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b6a138af7438a2eff9fa129de3c3ab8aa04b061a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Dec 2024 00:57:16 +0800
-Subject: zram: fix uninitialized ZRAM not releasing backing device
-
-From: Kairui Song <kasong@tencent.com>
-
-[ Upstream commit 74363ec674cb172d8856de25776c8f3103f05e2f ]
-
-Setting backing device is done before ZRAM initialization.  If we set the
-backing device, then remove the ZRAM module without initializing the
-device, the backing device reference will be leaked and the device will be
-hold forever.
-
-Fix this by always reset the ZRAM fully on rmmod or reset store.
-
-Link: https://lkml.kernel.org/r/20241209165717.94215-3-ryncsn@gmail.com
-Fixes: 013bf95a83ec ("zram: add interface to specif backing device")
-Signed-off-by: Kairui Song <kasong@tencent.com>
-Reported-by: Desheng Wu <deshengwu@tencent.com>
-Suggested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/zram/zram_drv.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 9eed579d02f0..02efa0ca242a 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -1150,12 +1150,16 @@ static void zram_meta_free(struct zram *zram, u64 disksize)
-       size_t num_pages = disksize >> PAGE_SHIFT;
-       size_t index;
- 
-+      if (!zram->table)
-+              return;
-+
-       /* Free all pages that are still in this zram device */
-       for (index = 0; index < num_pages; index++)
-               zram_free_page(zram, index);
- 
-       zs_destroy_pool(zram->mem_pool);
-       vfree(zram->table);
-+      zram->table = NULL;
- }
- 
- static bool zram_meta_alloc(struct zram *zram, u64 disksize)
-@@ -1699,11 +1703,6 @@ static void zram_reset_device(struct zram *zram)
- 
-       zram->limit_pages = 0;
- 
--      if (!init_done(zram)) {
--              up_write(&zram->init_lock);
--              return;
--      }
--
-       set_capacity_and_notify(zram->disk, 0);
-       part_stat_set_all(zram->disk->part0, 0);
- 
--- 
-2.39.5
-