From patchwork Fri Jun 30 02:04:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13297511 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 E1B38EB64DD for ; Fri, 30 Jun 2023 02:04:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B9EA8D0003; Thu, 29 Jun 2023 22:04:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61AD88D0001; Thu, 29 Jun 2023 22:04:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46DEB8D0003; Thu, 29 Jun 2023 22:04:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2E0708D0001 for ; Thu, 29 Jun 2023 22:04:45 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E51C5C0759 for ; Fri, 30 Jun 2023 02:04:44 +0000 (UTC) X-FDA: 80957770488.09.2B12550 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf24.hostedemail.com (Postfix) with ESMTP id 2A4DC18001C for ; Fri, 30 Jun 2023 02:04:42 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=rvyDGGah; spf=pass (imf24.hostedemail.com: domain of 3OjieZAYKCE89B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3OjieZAYKCE89B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688090683; 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=T+U3NPNy+xyAlbM+feS8QAyMObapdpoy5/9PcF9TKLI=; b=kfvxSIACVAmtpdjw9ZxuKTCzUtS9jXHCLn7eIY483MTBKr25iBm61WJvg69IjDOIio0oun 2Fxzr8BDqzEvKT3pZ6+hIM4Q0lJyK7CvAIb24nc22R45+koyGNCsYNCc2UoVt8KfcnaVF2 6OdUyw3ELVrDLyvA6X1UABKVY4A10HE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688090683; a=rsa-sha256; cv=none; b=PhLluaWRdexxVacyV/ADw47UHQQjO3Kx+e4QyFYM0lxVSDNebqr0J96m7ZBXh/GEUoYq2E 0UTuxt9rNTIYyjH0HQ3LvXzJgYKEBprNsCrAu/9t8w4/zdPdlbGB7q8mfbzvZOnjy1cQ2u jRhM0k/VGisiMXvgwFjUv0AWcYLb7Wg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=rvyDGGah; spf=pass (imf24.hostedemail.com: domain of 3OjieZAYKCE89B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3OjieZAYKCE89B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-565ba5667d5so11746967b3.0 for ; Thu, 29 Jun 2023 19:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688090682; x=1690682682; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=T+U3NPNy+xyAlbM+feS8QAyMObapdpoy5/9PcF9TKLI=; b=rvyDGGahsbSARiQKNJBvs5NaGYjXW8NZzm9dcWursQkpPyYTW87vOp0jaL/v9wFn72 bVCnSMsCL0Uww5Cz2gl4BTCbB3YOvEPgid/Pz/LzO8PDWuvfrJ2G8Jiylai9nQSwghqV XTPn7m5a6XLji4dmREhc1FM19R1MCvpV3tbEnuzVLNravKUeqSKCb2E7NDFaKDZgK3oA 59VRX6qKLr9O5DBQxMvgWTxqC8FOrrGsqmH7OYYKLdSnJ0MiFxDdJVnxpCvmqod/rmwQ xQnRBu3/xHvFBzDvleXzw2kra/qngRMyB/qMKcD/nmpoEBHDjoyDF9TWDoyXcI8GVjIk 1b0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688090682; x=1690682682; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T+U3NPNy+xyAlbM+feS8QAyMObapdpoy5/9PcF9TKLI=; b=OUv9Wmtc8320KiLN8lq9Vx/waXqu8yeWq16fRydTs0F1q0BTaA+0zwa2oPd6H9sQYh T637IPfgTRYjaJVgUzT9c6/9yEgB5+WNXBd+J6qde50MxRU6SuFTEHs6kom6++aF5E6g 0Yv51WDtSn1O3HR2p/89qB7oy60onWMkmyV22jLeJ8bVT2Bf/pW21rv0q1fiC6aHQ+e5 56E6Ma2Wjeslb8MS9nKpWzT91+7XUT61dWJ90QsWAScnQ9qrKPhtTNpalwMLK+/i9oq4 JjQqtC5CxVVkbXa6p+DiTzyaTSRQk1f+2CeQceDi82E06fslr+vkYmXHDWfVVcmlw5kx O2yw== X-Gm-Message-State: ABy/qLZJmQRoKaHDmHySd4H0jWQvzQoDWvgdfdLfWobnfFE5K4iBf5lW h0aJtvWdsexDsqcTClxAR7NktDbD+jA= X-Google-Smtp-Source: APBJJlFHuVnY9FeKGILHpU4FVRKk28e82VnRW+1SQlAaSM9Gd4WVwIdiE5OHAJvPzkmeNDyyPG7JbAA7D7A= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:1f11:a3d0:19a9:16e5]) (user=surenb job=sendgmr) by 2002:a0d:db8a:0:b0:576:f208:4d91 with SMTP id d132-20020a0ddb8a000000b00576f2084d91mr8639ywe.4.1688090682204; Thu, 29 Jun 2023 19:04:42 -0700 (PDT) Date: Thu, 29 Jun 2023 19:04:30 -0700 In-Reply-To: <20230630020436.1066016-1-surenb@google.com> Mime-Version: 1.0 References: <20230630020436.1066016-1-surenb@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230630020436.1066016-2-surenb@google.com> Subject: [PATCH v6 1/6] swap: remove remnants of polling from read_swap_cache_async From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: 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, ying.huang@intel.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, surenb@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Christoph Hellwig X-Stat-Signature: qgcozwtjnooyjjkpb66swuark7rqs6aj X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2A4DC18001C X-Rspam-User: X-HE-Tag: 1688090682-547812 X-HE-Meta: U2FsdGVkX18uIqtKIQ8BQrpEz2AYyXenF7aUmK9ile4xfQCiSIdtcTtyofJMMGfJ9cQp+mhrXd2yHS9HPgezucERCbUN1591ZM8fr+6zvRydRWsgimmmXTm3Yexx/Knpum1sW/8lcMhNwTcOVEzi9vN87pXej3oLt0kT0czZPrbw+SW+LSM+HW4e2K/fD5JiShCzThHoZnbVtMCUqYJH1hV4XZzUXu4P0dSO2J/tQlfdclKxfA8PAdJ/Coxp5xJQOovXV+XpHWUhT8Bh6WCrmzOeT2cNDUsLJ9nnVYSQdjr23rU5f05qFK5OX12anzzJCI/vMqi/MaKe7UvQ/8Pl8WCVmKZjrjGdIRakk/ALvV7W+tMQurT/GbcsCpjr+NJrzeP5Ax45Egqvij3Xwlm9UodFFJzm/XfwsRrpZq6MfgpBCtFRL+yAYM1kelrmTvzfGIN9q+uy9+ZyT+CDvXBCfeMZ4PoQwy1sYR8ld8SEpYWYPyUu2hbeSasXhNMHf5Ub2OTItI152y/cCmML5ZsbDVk63UfjTv/OSY55PC1tSUJkeP7IHUEK32UysRwDucuIdH7U455bT2Bcpioy91R0ztWQQju1ZYsMckwv6tmoaDrQmVuS6ZfIGM36F5VhyiMyyRjqsQ1XXOY8h1KPfRi3YKBliDg+jhyIU3BRoWpielXaN/mxWaJ3ya7QzHsjODRttL/Vj3P5QNVaPGAlcp2/ZoRW4lFrFb2T+CDH2U2+ImtCDUFQy8FTc2KqCRWCnnolXYuK1l2xkFK30gLkZ4tz2Qv8K3lA9/SWajOhEOjgj2CbJNCTLjdm3atoN5n0ZGZRfWF+NGDI/ZBzJC2QerKi6XDL4BbLNFFUBiFqryNKQzS3+2FcgIAMDdDgYCAUukdugpCk1bQOZYhdVKYL+tNgiBxVui6FOj1BF2/FAvmHaRoqrDyFxbPBAlrf9N0F2gc8+mE95m3mC4ejJ6X+cFA qAG0FDCW uO6UY6MiYbSHmq6uJ/sGd8+KJqcUPCCfzWkayxVJlGbDeNJWVQ4coZ/E9kcEzY+z6pBmcLiDLDccvP6cpm8AaRyrz7JT/oOVpwuLlRm3qUirFjwbSkTAuGYwk2RpIL19gSW4Pwerdg35nYKgoB+DKrlJTmHuDLejVSwFeh3REmBSZ+Te3SCsYDsPNkNd3Nx2NThAh8Tloh5ySAqFa0/1KZ68HXocFTtOZYk+FH18rDjHx6Ad12tFWB9G8wEFFgybSCv41dnY2Q/2cu/H/QGA+xg03qItahbfS3wk4Fc3JSfjO9XKbtptZVk+J6KnrJUnrKHn/16mQQRWmktkBcVnmKSr5Z2G3PuNmaK/nFNUDNHPxG6jJTG52F+zCgl6UAHSPMb2qgunAqUmbt39+eb2z2RD1RxlbNidxdUeYuQsj1517onMEsz4UFix0RGPmf6TM8Ii1RZUk2Y9rZQjyGPGfGxpbNiUjWIKTjpVbG1r9wkPgd2EDa2vw9rCenrbHe0GdfqXJBLkv5sQp6wkANzl57a4eXS6XG/6ofN7tD2B2P+36gcF08OEGtj5tHwoucQKE7mKcNEgOwL6+HsCRpQsWQao4s0sXMvBzaNndSYDamu+0UQ5/0Fzkf7lHSKxXn1pJ6q5I0zVYjHEsYxLl+4xxB1mQf+eb/bb2czIoOJa7BIwk4VKHt9ZcawqnzQ== 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: Commit [1] introduced IO polling support duding 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 Reviewed-by: "Huang, Ying" Reviewed-by: Christoph Hellwig --- 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 886f06066622..ac6d92f74f6d 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -218,7 +218,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, ptep = NULL; page = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE, - vma, addr, false, &splug); + vma, addr, &splug); if (page) put_page(page); } @@ -262,7 +262,7 @@ static void shmem_swapin_range(struct vm_area_struct *vma, rcu_read_unlock(); page = read_swap_cache_async(entry, mapping_gfp_mask(mapping), - vma, addr, false, &splug); + vma, addr, &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 f8ea7015bad4..5a690c79cc13 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -527,15 +527,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; } @@ -630,7 +629,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; @@ -638,7 +637,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; @@ -670,7 +668,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) @@ -838,7 +836,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); } /**