squashfs-migrate-from-ll_rw_block-usage-to-bio.patch removed from -mm tree
The patch titled
Subject: squashfs: migrate from ll_rw_block usage to BIO
has been removed from the -mm tree. Its filename was
squashfs-migrate-from-ll_rw_block-usage-to-bio.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Philippe Liard <[email protected]>
Subject: squashfs: migrate from ll_rw_block usage to BIO
ll_rw_block() function has been deprecated in favor of BIO which appears to come with large performance improvements.
This patch decreases boot time by close to 40% when using squashfs for the root file-system. This is observed at least in the context of starting an Android VM on Chrome OS using crosvm
(https://chromium.googlesource.com/chromiumos/platform/crosvm). The patch was tested on 4.19 as well as master.
This patch is largely based on Adrien Schildknecht's patch that was originally sent as https://lkml.org/lkml/2017/9/22/814 though with some significant changes and simplifications while also taking Phillip Lougher's feedback into account, around preserving support for FILE_CACHE in particular.
---
fs/squashfs/block.c | 273 +++++++++++----------- fs/squashfs/decompressor.h | 5 fs/squashfs/decompressor_multi.c | 9 fs/squashfs/decompressor_multi_percpu.c | 6 fs/squashfs/decompressor_single.c | 9 fs/squashfs/lz4_wrapper.c | 17 - fs/squashfs/lzo_wrapper.c | 17 - fs/squashfs/squashfs.h | 4 fs/squashfs/xz_wrapper.c | 51 ++-- fs/squashfs/zlib_wrapper.c | 63 ++--- fs/squashfs/zstd_wrapper.c | 62 ++-- 11 files changed, 279 insertions(+), 237 deletions(-)
fs/squashfs/block.c renamed from fs/squashfs/block.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +146 -127
@@ -13,6 +13,7 @@* datablocks and metadata blocks. */ +#include <linux/blkdev.h> #include <linux/fs.h> #include <linux/vfs.h> #include <linux/slab.h>
@@ -27,45 +28,104 @@#include "page_actor.h" /* -* Read the metadata block length, this is stored in the first two -* bytes of the metadata block. +* Returns the amount of bytes copied to the page actor. */ -static struct buffer_head *get_block_length (struct super_block *sb, -u64 *cur_index,int *offset,int *length) +static int copy_bio_to_actor (struct bio *bio, +struct squashfs_page_actor *actor, +int offset,int req_length) +{ +void *actor_addr =squashfs_first_page (actor); +struct bvec_iter_all iter_all = {}; +struct bio_vec *bvec =bvec_init_iter_all (&iter_all); +int copied_bytes =0 ; +int actor_offset =0 ; + +if (WARN_ON_ONCE (!bio_next_segment (bio, &iter_all))) +return 0 ; + +while (copied_bytes < req_length) { +int bytes_to_copy =min_t (int, bvec->bv_len - offset, +PAGE_SIZE - actor_offset); + + bytes_to_copy =min_t (int, bytes_to_copy, + req_length - copied_bytes); +memcpy (actor_addr + actor_offset, +page_address (bvec->bv_page) + bvec->bv_offset + offset, + bytes_to_copy); + + actor_offset += bytes_to_copy; + copied_bytes += bytes_to_copy; + offset += bytes_to_copy; + +if (actor_offset >=PAGE_SIZE ) { + actor_addr =squashfs_next_page (actor); +if (!actor_addr) +break ; + actor_offset =0 ; + } +if (offset >= bvec->bv_len) { +if (!bio_next_segment (bio, &iter_all)) +break ; + offset =0 ; + } + } +squashfs_finish_page (actor); +return copied_bytes; +} + +static int squashfs_bio_read (struct super_block *sb,u64 index,int length, +struct bio **biop,int *block_offset) {struct squashfs_sb_info *msblk = sb->s_fs_info; -struct buffer_head *bh; +const u64 read_start =round_down (index, msblk->devblksize); +const sector_t block = read_start >> msblk->devblksize_log2; +const u64 read_end =round_up (index + length, msblk->devblksize); +const sector_t block_end = read_end >> msblk->devblksize_log2; +int offset = read_start -round_down (index,PAGE_SIZE ); +int total_len = (block_end - block) << msblk->devblksize_log2; +const int page_count =DIV_ROUND_UP (total_len + offset,PAGE_SIZE ); +int error, i; +struct bio *bio; - bh =sb_bread (sb, *cur_index); -if (bh ==NULL ) -return NULL ; - -if (msblk->devblksize - *offset ==1 ) { - *length = (unsigned char ) bh->b_data[*offset]; -put_bh (bh); - bh =sb_bread (sb, ++(*cur_index)); -if (bh ==NULL ) -return NULL ; - *length |= (unsigned char ) bh->b_data[0 ] <<8 ; - *offset =1 ; - }else { - *length = (unsigned char ) bh->b_data[*offset] | - (unsigned char ) bh->b_data[*offset +1 ] <<8 ; - *offset +=2 ; - -if (*offset == msblk->devblksize) { -put_bh (bh); - bh =sb_bread (sb, ++(*cur_index)); -if (bh ==NULL ) -return NULL ; - *offset =0 ; + bio =bio_alloc (GFP_NOIO , page_count); +if (!bio) +return -ENOMEM ; + +bio_set_dev (bio, sb->s_bdev); + bio->bi_opf =READ ; + bio->bi_iter.bi_sector = block * (msblk->devblksize >>SECTOR_SHIFT ); + +for (i =0 ; i < page_count; ++i) { +unsigned int len = + min_t(unsigned int, PAGE_SIZE - offset, total_len); +struct page *page =alloc_page (GFP_NOIO ); + +if (!page) { + error = -ENOMEM ; + goto out_free_bio; } +if (!bio_add_page (bio, page, len, offset)) { + error = -EIO ; + goto out_free_bio; + } + offset =0 ; + total_len -= len; } -return bh; + error =submit_bio_wait (bio); +if (error) + goto out_free_bio; + + *biop = bio; + *block_offset = index & ((1 << msblk->devblksize_log2) -1 ); +return 0 ; + +out_free_bio: +bio_free_pages (bio); +bio_put (bio); +return error; } -/* * Read and decompress a metadata block or datablock. Length is non-zero * if a datablock is being read (the size is stored elsewhere in the
@@ -76,129 +136,88 @@ static struct buffer_head *get_block_len* algorithms). */ int squashfs_read_data (struct super_block *sb,u64 index,int length, -u64 *next_index,struct squashfs_page_actor *output) +u64 *next_index,struct squashfs_page_actor *output) {struct squashfs_sb_info *msblk = sb->s_fs_info; -struct buffer_head **bh; -int offset = index & ((1 << msblk->devblksize_log2) -1 ); -u64 cur_index = index >> msblk->devblksize_log2; -int bytes, compressed, b =0 , k =0 , avail, i; - - bh =kcalloc (((output->length + msblk->devblksize -1 ) - >> msblk->devblksize_log2) +1 ,sizeof (*bh),GFP_KERNEL ); -if (bh ==NULL ) -return -ENOMEM ; +struct bio *bio =NULL ; +int compressed; +int res; +int offset;if (length) {/* * Datablock. */ - bytes = -offset; compressed =SQUASHFS_COMPRESSED_BLOCK (length); length =SQUASHFS_COMPRESSED_SIZE_BLOCK (length); -if (next_index) - *next_index = index + length; -TRACE ("Block @ 0x%llx, %scompressed size %d, src size %d\n" , index, compressed ?"" :"un" , length, output->length); - -if (length <0 || length > output->length || - (index + length) > msblk->bytes_used) - goto read_failure; - -for (b =0 ; bytes < length; b++, cur_index++) { - bh[b] =sb_getblk (sb, cur_index); -if (bh[b] ==NULL ) - goto block_release; - bytes += msblk->devblksize; - } -ll_rw_block (REQ_OP_READ ,0 , b, bh); }else {/* * Metadata block. */ -if ((index +2 ) > msblk->bytes_used) - goto read_failure; - - bh[0 ] =get_block_length (sb, &cur_index, &offset, &length); -if (bh[0 ] ==NULL ) - goto read_failure; - b =1 ; +const u8 *data; +struct bvec_iter_all iter_all = {}; +struct bio_vec *bvec =bvec_init_iter_all (&iter_all); + +if (index +2 > msblk->bytes_used) { + res = -EIO ; + goto out; + } + res =squashfs_bio_read (sb, index,2 , &bio, &offset); +if (res) + goto out; + +if (WARN_ON_ONCE (!bio_next_segment (bio, &iter_all))) { + res = -EIO ; + goto out_free_bio; + } +/* Extract the length of the metadata block */ + data =page_address (bvec->bv_page) + bvec->bv_offset; + length = data[offset]; +if (offset <= bvec->bv_len -1 ) { + length |= data[offset +1 ] <<8 ; + }else { +if (WARN_ON_ONCE (!bio_next_segment (bio, &iter_all))) { + res = -EIO ; + goto out_free_bio; + } + data =page_address (bvec->bv_page) + bvec->bv_offset; + length |= data[0 ] <<8 ; + } +bio_free_pages (bio); +bio_put (bio); - bytes = msblk->devblksize - offset; compressed =SQUASHFS_COMPRESSED (length); length =SQUASHFS_COMPRESSED_SIZE (length); -if (next_index) - *next_index = index + length +2 ; + index +=2 ;TRACE ("Block @ 0x%llx, %scompressed size %d\n" , index, - compressed ?"" :"un" , length); - -if (length <0 || length > output->length || - (index + length) > msblk->bytes_used) - goto block_release; - -for (; bytes < length; b++) { - bh[b] =sb_getblk (sb, ++cur_index); -if (bh[b] ==NULL ) - goto block_release; - bytes += msblk->devblksize; - } -ll_rw_block (REQ_OP_READ ,0 , b -1 , bh +1 ); + compressed ?"" :"un" , length); } +if (next_index) + *next_index = index + length; -for (i =0 ; i < b; i++) { -wait_on_buffer (bh[i]); -if (!buffer_uptodate (bh[i])) - goto block_release; - } + res =squashfs_bio_read (sb, index, length, &bio, &offset); +if (res) + goto out;if (compressed) { -if (!msblk->stream) - goto read_failure; - length =squashfs_decompress (msblk, bh, b, offset, length, - output); -if (length <0 ) - goto read_failure; - }else { -/* -* Block is uncompressed. -*/ -int in, pg_offset =0 ; -void *data =squashfs_first_page (output); - -for (bytes = length; k < b; k++) { - in =min (bytes, msblk->devblksize - offset); - bytes -= in; -while (in) { -if (pg_offset ==PAGE_SIZE ) { - data =squashfs_next_page (output); - pg_offset =0 ; - } - avail =min_t (int, in,PAGE_SIZE - - pg_offset); -memcpy (data + pg_offset, bh[k]->b_data + offset, - avail); - in -= avail; - pg_offset += avail; - offset += avail; - } - offset =0 ; -put_bh (bh[k]); +if (!msblk->stream) { + res = -EIO ; + goto out_free_bio; } -squashfs_finish_page (output); + res =squashfs_decompress (msblk, bio, offset, length, output); + }else { + res =copy_bio_to_actor (bio, output, offset, length); } -kfree (bh); -return length; +out_free_bio: +bio_free_pages (bio); +bio_put (bio); +out: +if (res <0 ) +ERROR ("Failed to read block 0x%llx: %d\n" , index, res); -block_release: -for (; k < b; k++) -put_bh (bh[k]); - -read_failure: -ERROR ("squashfs_read_data failed to read block 0x%llx\n" , - (unsigned long long ) index); -kfree (bh); -return -EIO ; +return res; }
fs/squashfs/decompressor.h renamed from fs/squashfs/decompressor.h~squashfs-migrate-from-ll_rw_block-usage-to-bio +3 -2
@@ -10,13 +10,14 @@* decompressor.h */ +#include <linux/bio.h> +struct squashfs_decompressor {void *(*init)(struct squashfs_sb_info *,void *);void *(*comp_opts)(struct squashfs_sb_info *,void *,int );void (*free)(void *);int (*decompress)(struct squashfs_sb_info *,void *, -struct buffer_head **,int ,int ,int , -struct squashfs_page_actor *); +struct bio *,int ,int ,struct squashfs_page_actor *);int id;char *name;int supported;
fs/squashfs/decompressor_multi.c renamed from fs/squashfs/decompressor_multi.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +5 -4
@@ -6,7 +6,7 @@#include <linux/types.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <linux/buffer_head.h> +#include <linux/bio.h> #include <linux/sched.h> #include <linux/wait.h> #include <linux/cpumask.h>
@@ -180,14 +180,15 @@ wait: } -int squashfs_decompress (struct squashfs_sb_info *msblk,struct buffer_head **bh, -int b,int offset,int length,struct squashfs_page_actor *output) +int squashfs_decompress (struct squashfs_sb_info *msblk,struct bio *bio, +int offset,int length, +struct squashfs_page_actor *output) {int res;struct squashfs_stream *stream = msblk->stream;struct decomp_stream *decomp_stream =get_decomp_stream (msblk, stream); res = msblk->decompressor->decompress (msblk, decomp_stream->stream, - bh, b, offset, length, output); + bio, offset, length, output);put_decomp_stream (decomp_stream, stream);if (res <0 ) ERROR("%s decompression failed, data probably corrupt\n",
fs/squashfs/decompressor_multi_percpu.c renamed from fs/squashfs/decompressor_multi_percpu.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +3 -3
@@ -75,8 +75,8 @@ void squashfs_decompressor_destroy(struc } } -int squashfs_decompress (struct squashfs_sb_info *msblk,struct buffer_head **bh, -int b,int offset,int length,struct squashfs_page_actor *output) +int squashfs_decompress (struct squashfs_sb_info *msblk,struct bio *bio, +int offset,int length,struct squashfs_page_actor *output) {struct squashfs_stream *stream;int res;
@@ -84,7 +84,7 @@ int squashfs_decompress(struct squashfs_local_lock (&msblk->stream->lock); stream =this_cpu_ptr (msblk->stream); - res = msblk->decompressor->decompress (msblk, stream->stream, bh, b, + res = msblk->decompressor->decompress (msblk, stream->stream, bio, offset, length, output);local_unlock (&msblk->stream->lock);
fs/squashfs/decompressor_single.c renamed from fs/squashfs/decompressor_single.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +5 -4
@@ -7,7 +7,7 @@#include <linux/types.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <linux/buffer_head.h> +#include <linux/bio.h> #include "squashfs_fs.h" #include "squashfs_fs_sb.h"
@@ -59,14 +59,15 @@ void squashfs_decompressor_destroy(struc } } -int squashfs_decompress (struct squashfs_sb_info *msblk,struct buffer_head **bh, -int b,int offset,int length,struct squashfs_page_actor *output) +int squashfs_decompress (struct squashfs_sb_info *msblk,struct bio *bio, +int offset,int length, +struct squashfs_page_actor *output) {int res;struct squashfs_stream *stream = msblk->stream;mutex_lock (&stream->mutex); - res = msblk->decompressor->decompress (msblk, stream->stream, bh, b, + res = msblk->decompressor->decompress (msblk, stream->stream, bio, offset, length, output);mutex_unlock (&stream->mutex);
fs/squashfs/lz4_wrapper.c renamed from fs/squashfs/lz4_wrapper.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +10 -7
@@ -4,7 +4,7 @@* Phillip Lougher <[email protected]> */ -#include <linux/buffer_head.h> +#include <linux/bio.h> #include <linux/mutex.h> #include <linux/slab.h> #include <linux/vmalloc.h>
@@ -89,20 +89,23 @@ static void lz4_free(void *strm)static int lz4_uncompress (struct squashfs_sb_info *msblk,void *strm, -struct buffer_head **bh,int b,int offset,int length, +struct bio *bio,int offset,int length,struct squashfs_page_actor *output) { +struct bvec_iter_all iter_all = {}; +struct bio_vec *bvec =bvec_init_iter_all (&iter_all);struct squashfs_lz4 *stream = strm;void *buff = stream->input, *data; -int avail, i, bytes = length, res; +int bytes = length, res; -for (i =0 ; i < b; i++) { - avail =min (bytes, msblk->devblksize - offset); -memcpy (buff, bh[i]->b_data + offset, avail); +while (bio_next_segment (bio, &iter_all)) { +int avail =min (bytes, ((int )bvec->bv_len) - offset); + + data =page_address (bvec->bv_page) + bvec->bv_offset; +memcpy (buff, data + offset, avail); buff += avail; bytes -= avail; offset =0 ; -put_bh (bh[i]); } res = LZ4_decompress_safe(stream->input, stream->output,
fs/squashfs/lzo_wrapper.c renamed from fs/squashfs/lzo_wrapper.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +10 -7
@@ -9,7 +9,7 @@*/ #include <linux/mutex.h> -#include <linux/buffer_head.h> +#include <linux/bio.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/lzo.h>
@@ -63,21 +63,24 @@ static void lzo_free(void *strm)static int lzo_uncompress (struct squashfs_sb_info *msblk,void *strm, -struct buffer_head **bh,int b,int offset,int length, +struct bio *bio,int offset,int length,struct squashfs_page_actor *output) { +struct bvec_iter_all iter_all = {}; +struct bio_vec *bvec =bvec_init_iter_all (&iter_all);struct squashfs_lzo *stream = strm;void *buff = stream->input, *data; -int avail, i, bytes = length, res; +int bytes = length, res;size_t out_len = output->length; -for (i =0 ; i < b; i++) { - avail =min (bytes, msblk->devblksize - offset); -memcpy (buff, bh[i]->b_data + offset, avail); +while (bio_next_segment (bio, &iter_all)) { +int avail =min (bytes, ((int )bvec->bv_len) - offset); + + data =page_address (bvec->bv_page) + bvec->bv_offset; +memcpy (buff, data + offset, avail); buff += avail; bytes -= avail; offset =0 ; -put_bh (bh[i]); } res = lzo1x_decompress_safe(stream->input, (size_t)length,
fs/squashfs/squashfs.h renamed from fs/squashfs/squashfs.h~squashfs-migrate-from-ll_rw_block-usage-to-bio +2 -2
@@ -40,8 +40,8 @@ extern void *squashfs_decompressor_setup/* decompressor_xxx.c */ extern void *squashfs_decompressor_create (struct squashfs_sb_info *,void *);extern void squashfs_decompressor_destroy (struct squashfs_sb_info *); -extern int squashfs_decompress (struct squashfs_sb_info *,struct buffer_head **, -int ,int ,int ,struct squashfs_page_actor *); +extern int squashfs_decompress (struct squashfs_sb_info *,struct bio *, +int ,int ,struct squashfs_page_actor *);extern int squashfs_max_decompressors (void );/* export.c */
fs/squashfs/xz_wrapper.c renamed from fs/squashfs/xz_wrapper.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +29 -22
81 lines not on this page · raw message
fs/squashfs/zlib_wrapper.c renamed from fs/squashfs/zlib_wrapper.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +34 -29
99 lines not on this page · raw message
fs/squashfs/zstd_wrapper.c renamed from fs/squashfs/zstd_wrapper.c~squashfs-migrate-from-ll_rw_block-usage-to-bio +30 -25
98 lines not on this page · raw message