leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erofs: add manual PSI accounting for the compressed address space

Browse Source 
erofs uses an additional address space for compressed data read from disk
in addition to the one directly associated with the inode.  Reading into
the lower address space is open coded using add_to_page_cache_lru instead
of using the filemap.c helper for page allocation micro-optimizations,
which means it is not covered by the MM PSI annotations for ->read_folio
and ->readahead, so add manual ones instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220915094200.139713-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2022-09-15 10:41:59 +01:00 committed by Jens Axboe
parent 4088a47e78
commit 99486c511f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/erofs/zdata.c
View File

@ -7,6 +7,7 @@
#include "zdata.h" #include "zdata.h"
#include "compress.h" #include "compress.h"
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <linux/psi.h>
#include <trace/events/erofs.h> #include <trace/events/erofs.h>
@ -1365,6 +1366,8 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,
struct block_device *last_bdev; struct block_device *last_bdev;
unsigned int nr_bios = 0; unsigned int nr_bios = 0;
struct bio *bio = NULL; struct bio *bio = NULL;
/* initialize to 1 to make skip psi_memstall_leave unless needed */
unsigned long pflags = 1;
bi_private = jobqueueset_init(sb, q, fgq, force_fg); bi_private = jobqueueset_init(sb, q, fgq, force_fg);
qtail[JQ_BYPASS] = &q[JQ_BYPASS]->head; qtail[JQ_BYPASS] = &q[JQ_BYPASS]->head;
@ -1414,10 +1417,15 @@ static void z_erofs_submit_queue(struct z_erofs_decompress_frontend *f,
if (bio && (cur != last_index + 1 || if (bio && (cur != last_index + 1 ||
last_bdev != mdev.m_bdev)) { last_bdev != mdev.m_bdev)) {
submit_bio_retry: submit_bio_retry:
if (!pflags)
psi_memstall_leave(&pflags);
submit_bio(bio); submit_bio(bio);
bio = NULL; bio = NULL;
} }
if (unlikely(PageWorkingset(page)))
psi_memstall_enter(&pflags);
if (!bio) { if (!bio) {
bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS, bio = bio_alloc(mdev.m_bdev, BIO_MAX_VECS,
REQ_OP_READ, GFP_NOIO); REQ_OP_READ, GFP_NOIO);
@ -1445,8 +1453,11 @@ submit_bio_retry:
move_to_bypass_jobqueue(pcl, qtail, owned_head); move_to_bypass_jobqueue(pcl, qtail, owned_head);
} while (owned_head != Z_EROFS_PCLUSTER_TAIL); } while (owned_head != Z_EROFS_PCLUSTER_TAIL);
if (bio) if (bio) {
if (!pflags)
psi_memstall_leave(&pflags);
submit_bio(bio); submit_bio(bio);
}
/* /*
* although background is preferred, no one is pending for submission. * although background is preferred, no one is pending for submission.