Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf1e9d6 authored by Chao Yu's avatar Chao Yu Committed by Linus Torvalds
Browse files

zram: fix incorrect stat with failed_reads 



Since we allocate a temporary buffer in zram_bvec_read to handle partial
page operations in commit 924bd88d ("Staging: zram: allow partial
page operations"), our ->failed_reads value may be incorrect as we do
not increase its value when failing to allocate the temporary buffer.

Let's fix this issue and correct the annotation of failed_reads.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
Acked-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0c38e1fe

drivers/block/zram/zram_drv.c

+7 −3
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) 
	/* Should NEVER happen. Return bio error if it does. */

	if (unlikely(ret)) {

		pr_err("Decompression failed! err=%d, page=%u\n", ret, index);

		atomic64_inc(&zram->stats.failed_reads);

		return ret;

	}
@@ -547,8 +546,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, 
		zcomp_strm_release(zram->comp, zstrm);

	if (is_partial_io(bvec))

		kfree(uncmem);

	if (ret)

		atomic64_inc(&zram->stats.failed_writes);

	return ret;

}
@@ -566,6 +563,13 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, 
		ret = zram_bvec_write(zram, bvec, index, offset);

	}



	if (unlikely(ret)) {

		if (rw == READ)

			atomic64_inc(&zram->stats.failed_reads);

		else

			atomic64_inc(&zram->stats.failed_writes);

	}



	return ret;

}

drivers/block/zram/zram_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct zram_stats { 
	atomic64_t compr_data_size;	/* compressed size of pages stored */

	atomic64_t num_reads;	/* failed + successful */

	atomic64_t num_writes;	/* --do-- */

	atomic64_t failed_reads;	/* should NEVER! happen */

	atomic64_t failed_reads;	/* can happen when memory is too low */

	atomic64_t failed_writes;	/* can happen when memory is too low */

	atomic64_t invalid_io;	/* non-page-aligned I/O requests */

	atomic64_t notify_free;	/* no. of swap slot free notifications */