zram: remove valid_io_request

All bios hande to drivers from the block layer are checked against the
device size and for logical block alignment already (and have been since
long before zram was merged), so don't duplicate those checks.

Link: https://lkml.kernel.org/r/20230411171459.567614-3-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>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 57787cbdf1f72850e3aafd41c1db651b964d4b7d..f4466ad1fd4aefcbc34e7eee289b286af889cb46 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -175,30 +175,6 @@ static inline u32 zram_get_priority(struct zram *zram, u32 index)
        return prio & ZRAM_COMP_PRIORITY_MASK;
 }
 
-/*
- * Check if request is within bounds and aligned on zram logical blocks.
- */
-static inline bool valid_io_request(struct zram *zram,
-               sector_t start, unsigned int size)
-{
-       u64 end, bound;
-
-       /* unaligned request */
-       if (unlikely(start & (ZRAM_SECTOR_PER_LOGICAL_BLOCK - 1)))
-               return false;
-       if (unlikely(size & (ZRAM_LOGICAL_BLOCK_SIZE - 1)))
-               return false;
-
-       end = start + (size >> SECTOR_SHIFT);
-       bound = zram->disksize >> SECTOR_SHIFT;
-       /* out of range */
-       if (unlikely(start >= bound || end > bound || start > end))
-               return false;
-
-       /* I/O request is valid */
-       return true;
-}
-
 static void update_position(u32 *index, int *offset, struct bio_vec *bvec)
 {
        *index  += (*offset + bvec->bv_len) / PAGE_SIZE;
@@ -1184,10 +1160,9 @@ static ssize_t io_stat_show(struct device *dev,
 
        down_read(&zram->init_lock);
        ret = scnprintf(buf, PAGE_SIZE,
-                       "%8llu %8llu %8llu %8llu\n",
+                       "%8llu %8llu 0 %8llu\n",
                        (u64)atomic64_read(&zram->stats.failed_reads),
                        (u64)atomic64_read(&zram->stats.failed_writes),
-                       (u64)atomic64_read(&zram->stats.invalid_io),
                        (u64)atomic64_read(&zram->stats.notify_free));
        up_read(&zram->init_lock);
 
@@ -2037,13 +2012,6 @@ static void zram_submit_bio(struct bio *bio)
 {
        struct zram *zram = bio->bi_bdev->bd_disk->private_data;
 
-       if (!valid_io_request(zram, bio->bi_iter.bi_sector,
-                                       bio->bi_iter.bi_size)) {
-               atomic64_inc(&zram->stats.invalid_io);
-               bio_io_error(bio);
-               return;
-       }
-
        __zram_make_request(zram, bio);
 }
 

diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index c5254626f051faebcf06453242d8711467b68981..ca7a15bd48456afbcc6f23394ea9c18040905108 100644 (file)
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -78,7 +78,6 @@ struct zram_stats {
        atomic64_t compr_data_size;     /* compressed size of pages stored */
        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 */
        atomic64_t same_pages;          /* no. of same element filled pages */
        atomic64_t huge_pages;          /* no. of huge pages */