From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25790C7EE23 for ; Fri, 9 Jun 2023 01:58:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A97788E0002; Thu, 8 Jun 2023 21:58:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A47758E0001; Thu, 8 Jun 2023 21:58:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90FCB8E0002; Thu, 8 Jun 2023 21:58:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 80D358E0001 for ; Thu, 8 Jun 2023 21:58:45 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 533541C7937 for ; Fri, 9 Jun 2023 01:58:45 +0000 (UTC) X-FDA: 80881550610.03.D5A37E6 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf30.hostedemail.com (Postfix) with ESMTP id A0DA280007 for ; Fri, 9 Jun 2023 01:58:42 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=AqXY2FoT; spf=pass (imf30.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686275923; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=W7KjA3YoJuYYkDVos5TytLaLMvoora204luhPIQ/tN4=; b=f+/Ac3O+ATEu9HjMOf5c1bE0WRse6pCQpWDQJOnts4dBRnaax9pkR36MzRDxJR8CL00Acg vNbM/MDJq+wMYN4q74DwN0eAwhaY/hlW7/azUo3oAKpb2Hp7Cnhxqh82iW/t08vDeLZBQX ha0Ig/xe0ZdBDPe2sr8MNPloh7sUsy4= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=AqXY2FoT; spf=pass (imf30.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686275923; a=rsa-sha256; cv=none; b=E8dy5DjsmW+A9zRMQyxS4UFueYKe22XN4qSpePGmUfvon1rTNRmN1lrHQIDTy4k3N8Fqy4 hUBI8k3GK+Z7PJ+UKKBZjw6fVwuMZjzAHXAFWn4FMgRaXVBSw0aPPQNjkfBxLsEZscjyL2 s00Enz0M8t55BswXGLnvXdGbpgg+EYY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686275922; x=1717811922; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=mpVamIpHuf/gQT+r5lR2dxcikhasXCd2orfPB6DhhTE=; b=AqXY2FoTK4egkZyTO0Ier+2BwaB6OcA98MD9TG43zbc2zV116+AE/af1 /+6AJQrWfAFvWfxm20UDwhlloD6kjqu/ndS+J3D72+w/xeu3EvkhC7waf C9Hv4Qd8f/32UwvqZNE6vnULFzNLCtHMwe+0eVirDTo8MdRtzuDoX+d2n z8NKPZ+DSxRv/NtArD3oybR1uCbWJt4yTytqhgvNS7DPb91fmeXvRFbVi GRKrcZB6qEC3y+Ws1MnLpwJMcZFyFD+qWfhBNGj85FpD5xg5v3RCWMdAp +UcU7c/61g3ExmPqzapmiY7Xcay9kNhp4VQNLMmJ9yHxKAWdwAdACtX84 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="347136073" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="347136073" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 18:58:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="743316061" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="743316061" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2023 18:58:33 -0700 From: "Huang, Ying" To: Suren Baghdasaryan Cc: akpm@linux-foundation.org, willy@infradead.org, hannes@cmpxchg.org, mhocko@suse.com, josef@toxicpanda.com, jack@suse.cz, ldufour@linux.ibm.com, laurent.dufour@fr.ibm.com, michel@lespinasse.org, liam.howlett@oracle.com, jglisse@google.com, vbabka@suse.cz, minchan@google.com, dave@stgolabs.net, punit.agrawal@bytedance.com, lstoakes@gmail.com, hdanton@sina.com, apopple@nvidia.com, peterx@redhat.com, david@redhat.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, pasha.tatashin@soleen.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Ming Lei Subject: Re: [PATCH v2 1/6] swap: remove remnants of polling from read_swap_cache_async References: <20230609005158.2421285-1-surenb@google.com> <20230609005158.2421285-2-surenb@google.com> Date: Fri, 09 Jun 2023 09:57:25 +0800 In-Reply-To: <20230609005158.2421285-2-surenb@google.com> (Suren Baghdasaryan's message of "Thu, 8 Jun 2023 17:51:53 -0700") Message-ID: <877csdpfcq.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Queue-Id: A0DA280007 X-Rspam-User: X-Stat-Signature: xfoibrckhgpukoxqik3bj9miqjjt7191 X-Rspamd-Server: rspam01 X-HE-Tag: 1686275922-910923 X-HE-Meta: U2FsdGVkX1/ebnAWM4skbOel3VCMArxN+hRiva3FmpSSa7Q4qkB380GGyb5bgzp30buR3ynpzKBV4XS8pKI3MOnVFx6xHlJWrdo+8B7B0MknCOSJtEhl1K65RLV3Dknx8yStJjynUeyDxSUiN3Ko2KM86EQAg6hIbM4dNUJjz7bBPKTWpYIYak6S7NwQ5TddEP5hDIRJV5isOOvMJWySu1uUD8dgO/EL+G6iu2CU1KGZixFZq9cIOQ5BqL+Up7c8qsUK4UTz3VO5C4unHpG1vQOuVfIRvD0by2frsfez5M7VDwxetjQsuahXNnII1NYE3VKBvgxquC2T12daKfXaO7M7r8pn7kI2kMEebmG0DuJgTFDRYo20VYDovO0gIkSe5kTXZ7v2brp4PBrRqVzvDYePfX60uFrj6mc0MiLhTNprL6cpSKiYBaON1Jzp7G8HUbO9RPzn6iRjdBsm1cQRZ53/+0vxOQ6wt9sd29+O7+lEyNQ5Q8Xs4KaA2L+y8dVX8eLElNAloxwCnqA4z1qqFrj/VTPDJ+3Uhh5/o4aKdTyj2OOgGBA0J/LZ/Z0hgLyIAwh9O6tFMAu0+klZJCmeD7HETm8u/JBeZhXpR3jBjxlWSK0pVGYGiO+NAp5k8FBB5SiG0TA1xQiWntvagwliriljnMXCssWEAqvJjEO+Id3jDmQSlcHgoniSpCXc9JxVSRuXicmOr/1GnXkniSnp0Ge00uzeh+PMGW5Ni4kCQ6kNlMo9O83kJSf4Rmdv8pc9/0axdygHd3MVzrJgoYJEb6d5LGINq2Z1UmBtN/a9J1vFzS+8vD9JpHrPGOAJqojh70tq01KuQabFcxIHKyKqPhgyWlwrLjF0Qntq3MbvLZsnta1cWwjwnewGHUoK/fBRIZT9WVVg+N+PGNb2Bb7BuLfngp0gmWJdSY6SPom5L+Y+6N7Md1WbclmCsnUaYkuGurMVDdujOrgXdOeYXCj sLLFO6Qo O6Ov08QjtO+EN5GzhnketAMAcZ4KrSl9E3DmoMQdORqZt8RIdMfBpv0x2N7zb+DZSECoVvEGNyiA6BUN3nKtJR9LitHOp6ClWdPxmWEe/eQZwVIeBIu2dWTIe4pY8A/sAQh20oSteHJ1oC9J6Dw2gMDXsNubD7zEFSM2HFas3hTXzQRIfV6fmp8Of1SaC/PNNfsLau8iqTvwiKHXVbguYmzsuhVrHlOUgGQY4hvq5xG3ZboJjr/vXY57LNA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: + Ming Lei for confirmation. Suren Baghdasaryan writes: > Commit [1] introduced IO polling support during swapin to reduce > swap read latency for block devices that can be polled. However later > commit [2] removed polling support. Therefore it seems safe to remove > do_poll parameter in read_swap_cache_async and always call swap_readpage > with synchronous=false waiting for IO completion in folio_lock_or_retry. > > [1] commit 23955622ff8d ("swap: add block io poll in swapin path") > [2] commit 9650b453a3d4 ("block: ignore RWF_HIPRI hint for sync dio") > > Suggested-by: Huang Ying > Signed-off-by: Suren Baghdasaryan Looks good to me! Thanks! Reviewed-by: "Huang, Ying" > --- > mm/madvise.c | 4 ++-- > mm/swap.h | 1 - > mm/swap_state.c | 12 +++++------- > 3 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/mm/madvise.c b/mm/madvise.c > index b5ffbaf616f5..b1e8adf1234e 100644 > --- a/mm/madvise.c > +++ b/mm/madvise.c > @@ -215,7 +215,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, > continue; > > page = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE, > - vma, index, false, &splug); > + vma, index, &splug); > if (page) > put_page(page); > } > @@ -252,7 +252,7 @@ static void force_shm_swapin_readahead(struct vm_area_struct *vma, > rcu_read_unlock(); > > page = read_swap_cache_async(swap, GFP_HIGHUSER_MOVABLE, > - NULL, 0, false, &splug); > + NULL, 0, &splug); > if (page) > put_page(page); > > diff --git a/mm/swap.h b/mm/swap.h > index 7c033d793f15..8a3c7a0ace4f 100644 > --- a/mm/swap.h > +++ b/mm/swap.h > @@ -46,7 +46,6 @@ struct folio *filemap_get_incore_folio(struct address_space *mapping, > struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > struct vm_area_struct *vma, > unsigned long addr, > - bool do_poll, > struct swap_iocb **plug); > struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > struct vm_area_struct *vma, > diff --git a/mm/swap_state.c b/mm/swap_state.c > index b76a65ac28b3..a3839de71f3f 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -517,15 +517,14 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > */ > struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > struct vm_area_struct *vma, > - unsigned long addr, bool do_poll, > - struct swap_iocb **plug) > + unsigned long addr, struct swap_iocb **plug) > { > bool page_was_allocated; > struct page *retpage = __read_swap_cache_async(entry, gfp_mask, > vma, addr, &page_was_allocated); > > if (page_was_allocated) > - swap_readpage(retpage, do_poll, plug); > + swap_readpage(retpage, false, plug); > > return retpage; > } > @@ -620,7 +619,7 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, > struct swap_info_struct *si = swp_swap_info(entry); > struct blk_plug plug; > struct swap_iocb *splug = NULL; > - bool do_poll = true, page_allocated; > + bool page_allocated; > struct vm_area_struct *vma = vmf->vma; > unsigned long addr = vmf->address; > > @@ -628,7 +627,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, > if (!mask) > goto skip; > > - do_poll = false; > /* Read a page_cluster sized and aligned cluster around offset. */ > start_offset = offset & ~mask; > end_offset = offset | mask; > @@ -660,7 +658,7 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, > lru_add_drain(); /* Push any new pages onto the LRU now */ > skip: > /* The page was likely read above, so no need for plugging here */ > - return read_swap_cache_async(entry, gfp_mask, vma, addr, do_poll, NULL); > + return read_swap_cache_async(entry, gfp_mask, vma, addr, NULL); > } > > int init_swap_address_space(unsigned int type, unsigned long nr_pages) > @@ -825,7 +823,7 @@ static struct page *swap_vma_readahead(swp_entry_t fentry, gfp_t gfp_mask, > skip: > /* The page was likely read above, so no need for plugging here */ > return read_swap_cache_async(fentry, gfp_mask, vma, vmf->address, > - ra_info.win == 1, NULL); > + NULL); > } > > /**