Skip to content

Commit e447a01

Browse files
minchanktorvalds
authored andcommitted
zram: set BDI_CAP_STABLE_WRITES once
With fast swap storage, the platform wants to use swap more aggressively and swap-in is crucial to application latency. The rw_page() based synchronous devices like zram, pmem and btt are such fast storage. When I profile swapin performance with zram lz4 decompress test, S/W overhead is more than 70%. Maybe, it would be bigger in nvdimm. This patchset reduces swap-in latency by skipping swapcache if the swap device is a synchronous device like a rw_page() based device. It enhances by 45% my swapin test (5G sequential swapin, no readahead) from 2.41sec to 1.64sec. This patch (of 4): Commit 19b7ccf ("block: get rid of blk_integrity_revalidate()") fixed a weird thing (i.e., reset BDI_CAP_STABLE_WRITES flag unconditionally whenever revalidat_disk is called) so zram doesn't need to reset the flag any more when revalidating the bdev. Instead, set the flag just once when the zram device is created. It shouldn't change any behavior. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Minchan Kim <[email protected]> Reviewed-by: Sergey Senozhatsky <[email protected]> Cc: Ilya Dryomov <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Dan Williams <[email protected]> Cc: Ross Zwisler <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Huang Ying <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4171044 commit e447a01

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

drivers/block/zram/zram_drv.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,6 @@ static inline bool is_partial_io(struct bio_vec *bvec)
122122
}
123123
#endif
124124

125-
static void zram_revalidate_disk(struct zram *zram)
126-
{
127-
revalidate_disk(zram->disk);
128-
/* revalidate_disk reset the BDI_CAP_STABLE_WRITES so set again */
129-
zram->disk->queue->backing_dev_info->capabilities |=
130-
BDI_CAP_STABLE_WRITES;
131-
}
132-
133125
/*
134126
* Check if request is within bounds and aligned on zram logical blocks.
135127
*/
@@ -1373,7 +1365,8 @@ static ssize_t disksize_store(struct device *dev,
13731365
zram->comp = comp;
13741366
zram->disksize = disksize;
13751367
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
1376-
zram_revalidate_disk(zram);
1368+
1369+
revalidate_disk(zram->disk);
13771370
up_write(&zram->init_lock);
13781371

13791372
return len;
@@ -1420,7 +1413,7 @@ static ssize_t reset_store(struct device *dev,
14201413
/* Make sure all the pending I/O are finished */
14211414
fsync_bdev(bdev);
14221415
zram_reset_device(zram);
1423-
zram_revalidate_disk(zram);
1416+
revalidate_disk(zram->disk);
14241417
bdput(bdev);
14251418

14261419
mutex_lock(&bdev->bd_mutex);
@@ -1539,6 +1532,7 @@ static int zram_add(void)
15391532
/* zram devices sort of resembles non-rotational disks */
15401533
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
15411534
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zram->disk->queue);
1535+
15421536
/*
15431537
* To ensure that we always get PAGE_SIZE aligned
15441538
* and n*PAGE_SIZED sized I/O requests.
@@ -1563,6 +1557,8 @@ static int zram_add(void)
15631557
if (ZRAM_LOGICAL_BLOCK_SIZE == PAGE_SIZE)
15641558
blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);
15651559

1560+
zram->disk->queue->backing_dev_info->capabilities |=
1561+
BDI_CAP_STABLE_WRITES;
15661562
add_disk(zram->disk);
15671563

15681564
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,

0 commit comments

Comments
 (0)