From: Pankaj Raghav <kernel@pankajraghav.com>
To: minchan@kernel.org, senozhatsky@chromium.org
Cc: linux-kernel@vger.kernel.org, axboe@kernel.dk,
p.raghav@samsung.com, linux-block@vger.kernel.org,
kernel@pankajraghav.com, gost.dev@samsung.com
Subject: [PATCH 5/5] zram: don't overload blk_idx variable in writeback_store()
Date: Mon, 11 Sep 2023 15:34:30 +0200 [thread overview]
Message-ID: <20230911133430.1824564-6-kernel@pankajraghav.com> (raw)
In-Reply-To: <20230911133430.1824564-1-kernel@pankajraghav.com>
From: Pankaj Raghav <p.raghav@samsung.com>
Instead of overloading blk_idx variable to find if it was allocated and
used, add a new boolean variable blk_allocated.
No functional changes.
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
---
drivers/block/zram/zram_drv.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 27313c2d781d..7c1420e92c6a 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -747,6 +747,7 @@ static ssize_t writeback_store(struct device *dev,
ssize_t ret = len;
int mode, err;
unsigned long blk_idx = 0;
+ bool blk_allocated = false;
unsigned int io_pages;
u64 bd_wb_limit_pages = ULONG_MAX;
struct index_mapping map = {};
@@ -803,7 +804,7 @@ static ssize_t writeback_store(struct device *dev,
}
spin_unlock(&zram->wb_limit_lock);
- if (!blk_idx) {
+ if (!blk_allocated) {
io_pages = min(1UL << order, nr_pages);
io_pages = min_t(u64, bd_wb_limit_pages, io_pages);
@@ -812,6 +813,7 @@ static ssize_t writeback_store(struct device *dev,
ret = -ENOSPC;
break;
}
+ blk_allocated = true;
}
if (!writeback_prep_or_skip_index(zram, mode, index)) {
@@ -850,12 +852,12 @@ static ssize_t writeback_store(struct device *dev,
* the unused blocks after looping through all indices.
*/
if (map.nr_of_entries == io_pages) {
- blk_idx = 0;
+ blk_allocated = false;
map.nr_of_entries = 0;
}
}
- if (blk_idx)
+ if (blk_allocated)
free_block_bdev_range(zram, blk_idx + map.nr_of_entries,
io_pages - map.nr_of_entries);
folio_put(folio);
--
2.40.1
next prev parent reply other threads:[~2023-09-11 22:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230911133442eucas1p2f773a475e0a6dc1a448c63884d58c8d3@eucas1p2.samsung.com>
2023-09-11 13:34 ` [PATCH 0/5] Improve zram writeback performance Pankaj Raghav
2023-09-11 13:34 ` [PATCH 1/5] zram: move index preparation to a separate function in writeback_store Pankaj Raghav
2023-09-11 13:34 ` [PATCH 2/5] zram: encapsulate writeback to the backing bdev in a function Pankaj Raghav
2023-09-11 13:34 ` [PATCH 3/5] zram: add alloc_block_bdev_range() and free_block_bdev_range() Pankaj Raghav
2023-09-11 13:34 ` [PATCH 4/5] zram: batch IOs during writeback to improve performance Pankaj Raghav
2023-09-11 13:34 ` Pankaj Raghav [this message]
2023-09-18 13:53 ` [PATCH 0/5] Improve zram writeback performance Pankaj Raghav
2023-09-19 0:33 ` Sergey Senozhatsky
2023-09-19 14:20 ` Pankaj Raghav
2024-09-25 15:53 ` Jassi Brar
2024-09-26 4:33 ` Sergey Senozhatsky
2024-09-29 22:21 ` Jassi Brar
2024-09-26 4:41 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230911133430.1824564-6-kernel@pankajraghav.com \
--to=kernel@pankajraghav.com \
--cc=axboe@kernel.dk \
--cc=gost.dev@samsung.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=p.raghav@samsung.com \
--cc=senozhatsky@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®