Re: [RFC PATCH 1/2] mm: swap: check if swap backing device is congested or not

From: Yang Shi
Date: Wed Dec 19 2018 - 13:41:48 EST




On 12/19/18 9:28 AM, Tim Chen wrote:
On 12/18/18 9:56 PM, Yang Shi wrote:

On 12/18/18 4:16 PM, Tim Chen wrote:
On 12/18/18 3:43 PM, Yang Shi wrote:
On 12/18/18 11:29 AM, Tim Chen wrote:
On 12/17/18 10:52 PM, Yang Shi wrote:

diff --git a/mm/swap_state.c b/mm/swap_state.c
index fd2f21e..7cc3c29 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -538,11 +538,15 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,
ÂÂÂÂÂÂ bool do_poll = true, page_allocated;
ÂÂÂÂÂÂ struct vm_area_struct *vma = vmf->vma;
ÂÂÂÂÂÂ unsigned long addr = vmf->address;
+ÂÂÂ struct inode *inode = si->swap_file->f_mapping->host;
ÂÂ ÂÂÂÂÂ mask = swapin_nr_pages(offset) - 1;
ÂÂÂÂÂÂ if (!mask)
ÂÂÂÂÂÂÂÂÂÂ goto skip;
Shmem will also be using this function and I don't think the inode_read_congested
logic is relevant for that case.
IMHO, shmem is also relevant. As long as it is trying to readahead from swap, it should check if the underlying device is busy or not regardless of shmem or anon page.

I don't think your dereference inode = si->swap_file->f_mapping->host
is always safe. You should do it only when (si->flags & SWP_FS) is true.
Do you mean it is not safe for swap partition?
The f_mapping may not be instantiated. It is only done for SWP_FS.

Really? I saw the below calls in swapon:

swap_file = file_open_name(name, O_RDWR|O_LARGEFILE, 0);
...
p->swap_file = swap_file;
mapping = swap_file->f_mapping;
inode = mapping->host;
...

Then the below code manipulates the inode.

And, trace shows file_open_name() does call blkdev_open if it is turning block device swap on. And, blkdev_open() would return instantiated address_space and inode.

Am I missing something?

Thanks,
Yang


Tim