From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 9C6458E0001 for ; Tue, 18 Dec 2018 14:29:27 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id 82so16072916pfs.20 for ; Tue, 18 Dec 2018 11:29:27 -0800 (PST) Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id h36si13940128pgm.200.2018.12.18.11.29.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 11:29:26 -0800 (PST) References: <1545115948-25467-1-git-send-email-yang.shi@linux.alibaba.com> From: Tim Chen Subject: Re: [RFC PATCH 1/2] mm: swap: check if swap backing device is congested or not Message-ID: <6a51d47a-b87f-b0f1-4dae-843730dba698@linux.intel.com> Date: Tue, 18 Dec 2018 11:29:25 -0800 MIME-Version: 1.0 In-Reply-To: <1545115948-25467-1-git-send-email-yang.shi@linux.alibaba.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Yang Shi , ying.huang@intel.com, tim.c.chen@intel.com, minchan@kernel.org, Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org 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. So probably change the check to if (swp_type(entry) < nr_swapfiles && inode_read_congested(si->swap_file->f_mapping->host)) goto skip; > + if (inode_read_congested(inode)) > + goto skip; > + > do_poll = false; > /* Read a page_cluster sized and aligned cluster around offset. */ > start_offset = offset & ~mask; > Thanks. Tim