Change since last update:
Fix an urgent regression introduced by commitbaa2c7c971
("block: set .bi_max_vecs as actual allocated vector number"), which could cause unexpected hung since linux 5.12-rc1. Resolve it by avoiding using bio->bi_max_vecs completely. -----BEGIN PGP SIGNATURE----- iIsEABYIADMWIQThPAmQN9sSA0DVxtI5NzHcH7XmBAUCYEpAyBUcaHNpYW5na2Fv QHJlZGhhdC5jb20ACgkQOTcx3B+15gS55wD9GnsRm3ABN7AUKEX1lcGBt67dTEfv 587cRSwJWHHbAl8A/0yLTt1CsnPXXxBchSGkIZ3MmQ/q2OVJ5o4rt9FRjMEC =opvX -----END PGP SIGNATURE----- Merge tag 'erofs-for-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs Pull erofs fix from Gao Xiang: "Fix an urgent regression introduced by commitbaa2c7c971
("block: set .bi_max_vecs as actual allocated vector number"), which could cause unexpected hung since linux 5.12-rc1. Resolve it by avoiding using bio->bi_max_vecs completely" * tag 'erofs-for-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: erofs: fix bio->bi_max_vecs behavior change
This commit is contained in:
commit
420623430a
@ -129,6 +129,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
|
||||
struct page *page,
|
||||
erofs_off_t *last_block,
|
||||
unsigned int nblocks,
|
||||
unsigned int *eblks,
|
||||
bool ra)
|
||||
{
|
||||
struct inode *const inode = mapping->host;
|
||||
@ -145,8 +146,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
|
||||
|
||||
/* note that for readpage case, bio also equals to NULL */
|
||||
if (bio &&
|
||||
/* not continuous */
|
||||
*last_block + 1 != current_block) {
|
||||
(*last_block + 1 != current_block || !*eblks)) {
|
||||
submit_bio_retry:
|
||||
submit_bio(bio);
|
||||
bio = NULL;
|
||||
@ -216,7 +216,8 @@ submit_bio_retry:
|
||||
if (nblocks > DIV_ROUND_UP(map.m_plen, PAGE_SIZE))
|
||||
nblocks = DIV_ROUND_UP(map.m_plen, PAGE_SIZE);
|
||||
|
||||
bio = bio_alloc(GFP_NOIO, bio_max_segs(nblocks));
|
||||
*eblks = bio_max_segs(nblocks);
|
||||
bio = bio_alloc(GFP_NOIO, *eblks);
|
||||
|
||||
bio->bi_end_io = erofs_readendio;
|
||||
bio_set_dev(bio, sb->s_bdev);
|
||||
@ -229,16 +230,8 @@ submit_bio_retry:
|
||||
/* out of the extent or bio is full */
|
||||
if (err < PAGE_SIZE)
|
||||
goto submit_bio_retry;
|
||||
|
||||
--*eblks;
|
||||
*last_block = current_block;
|
||||
|
||||
/* shift in advance in case of it followed by too many gaps */
|
||||
if (bio->bi_iter.bi_size >= bio->bi_max_vecs * PAGE_SIZE) {
|
||||
/* err should reassign to 0 after submitting */
|
||||
err = 0;
|
||||
goto submit_bio_out;
|
||||
}
|
||||
|
||||
return bio;
|
||||
|
||||
err_out:
|
||||
@ -252,7 +245,6 @@ has_updated:
|
||||
|
||||
/* if updated manually, continuous pages has a gap */
|
||||
if (bio)
|
||||
submit_bio_out:
|
||||
submit_bio(bio);
|
||||
return err ? ERR_PTR(err) : NULL;
|
||||
}
|
||||
@ -264,23 +256,26 @@ submit_bio_out:
|
||||
static int erofs_raw_access_readpage(struct file *file, struct page *page)
|
||||
{
|
||||
erofs_off_t last_block;
|
||||
unsigned int eblks;
|
||||
struct bio *bio;
|
||||
|
||||
trace_erofs_readpage(page, true);
|
||||
|
||||
bio = erofs_read_raw_page(NULL, page->mapping,
|
||||
page, &last_block, 1, false);
|
||||
page, &last_block, 1, &eblks, false);
|
||||
|
||||
if (IS_ERR(bio))
|
||||
return PTR_ERR(bio);
|
||||
|
||||
DBG_BUGON(bio); /* since we have only one bio -- must be NULL */
|
||||
if (bio)
|
||||
submit_bio(bio);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void erofs_raw_access_readahead(struct readahead_control *rac)
|
||||
{
|
||||
erofs_off_t last_block;
|
||||
unsigned int eblks;
|
||||
struct bio *bio = NULL;
|
||||
struct page *page;
|
||||
|
||||
@ -291,7 +286,7 @@ static void erofs_raw_access_readahead(struct readahead_control *rac)
|
||||
prefetchw(&page->flags);
|
||||
|
||||
bio = erofs_read_raw_page(bio, rac->mapping, page, &last_block,
|
||||
readahead_count(rac), true);
|
||||
readahead_count(rac), &eblks, true);
|
||||
|
||||
/* all the page errors are ignored when readahead */
|
||||
if (IS_ERR(bio)) {
|
||||
@ -305,7 +300,6 @@ static void erofs_raw_access_readahead(struct readahead_control *rac)
|
||||
put_page(page);
|
||||
}
|
||||
|
||||
/* the rare case (end in gaps) */
|
||||
if (bio)
|
||||
submit_bio(bio);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user