mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
zram: simplify bvec iteration in __zram_make_request
bio_for_each_segment synthetize bvecs that never cross page boundaries, so don't duplicate that work in an inner loop. Link: https://lkml.kernel.org/r/20230411171459.567614-5-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Acked-by: Minchan Kim <minchan@kernel.org> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
0120dd6e4e
commit
af8b04c637
1 changed files with 10 additions and 30 deletions
|
@ -175,12 +175,6 @@ static inline u32 zram_get_priority(struct zram *zram, u32 index)
|
||||||
return prio & ZRAM_COMP_PRIORITY_MASK;
|
return prio & ZRAM_COMP_PRIORITY_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void update_position(u32 *index, int *offset, struct bio_vec *bvec)
|
|
||||||
{
|
|
||||||
*index += (*offset + bvec->bv_len) / PAGE_SIZE;
|
|
||||||
*offset = (*offset + bvec->bv_len) % PAGE_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void update_used_max(struct zram *zram,
|
static inline void update_used_max(struct zram *zram,
|
||||||
const unsigned long pages)
|
const unsigned long pages)
|
||||||
{
|
{
|
||||||
|
@ -1960,16 +1954,10 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
|
||||||
|
|
||||||
static void __zram_make_request(struct zram *zram, struct bio *bio)
|
static void __zram_make_request(struct zram *zram, struct bio *bio)
|
||||||
{
|
{
|
||||||
int offset;
|
|
||||||
u32 index;
|
|
||||||
struct bio_vec bvec;
|
|
||||||
struct bvec_iter iter;
|
struct bvec_iter iter;
|
||||||
|
struct bio_vec bv;
|
||||||
unsigned long start_time;
|
unsigned long start_time;
|
||||||
|
|
||||||
index = bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT;
|
|
||||||
offset = (bio->bi_iter.bi_sector &
|
|
||||||
(SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT;
|
|
||||||
|
|
||||||
switch (bio_op(bio)) {
|
switch (bio_op(bio)) {
|
||||||
case REQ_OP_DISCARD:
|
case REQ_OP_DISCARD:
|
||||||
case REQ_OP_WRITE_ZEROES:
|
case REQ_OP_WRITE_ZEROES:
|
||||||
|
@ -1980,24 +1968,16 @@ static void __zram_make_request(struct zram *zram, struct bio *bio)
|
||||||
}
|
}
|
||||||
|
|
||||||
start_time = bio_start_io_acct(bio);
|
start_time = bio_start_io_acct(bio);
|
||||||
bio_for_each_segment(bvec, bio, iter) {
|
bio_for_each_segment(bv, bio, iter) {
|
||||||
struct bio_vec bv = bvec;
|
u32 index = iter.bi_sector >> SECTORS_PER_PAGE_SHIFT;
|
||||||
unsigned int unwritten = bvec.bv_len;
|
u32 offset = (iter.bi_sector & (SECTORS_PER_PAGE - 1)) <<
|
||||||
|
SECTOR_SHIFT;
|
||||||
|
|
||||||
do {
|
if (zram_bvec_rw(zram, &bv, index, offset, bio_op(bio),
|
||||||
bv.bv_len = min_t(unsigned int, PAGE_SIZE - offset,
|
bio) < 0) {
|
||||||
unwritten);
|
bio->bi_status = BLK_STS_IOERR;
|
||||||
if (zram_bvec_rw(zram, &bv, index, offset,
|
break;
|
||||||
bio_op(bio), bio) < 0) {
|
}
|
||||||
bio->bi_status = BLK_STS_IOERR;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
bv.bv_offset += bv.bv_len;
|
|
||||||
unwritten -= bv.bv_len;
|
|
||||||
|
|
||||||
update_position(&index, &offset, &bv);
|
|
||||||
} while (unwritten);
|
|
||||||
}
|
}
|
||||||
bio_end_io_acct(bio, start_time);
|
bio_end_io_acct(bio, start_time);
|
||||||
bio_endio(bio);
|
bio_endio(bio);
|
||||||
|
|
Loading…
Reference in a new issue