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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F268EC433F5 for ; Tue, 7 Sep 2021 11:59:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D2FD610FF for ; Tue, 7 Sep 2021 11:59:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6D2FD610FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A75466B0071; Tue, 7 Sep 2021 07:59:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A250F6B0072; Tue, 7 Sep 2021 07:59:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93A59900002; Tue, 7 Sep 2021 07:59:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id 85CEC6B0071 for ; Tue, 7 Sep 2021 07:59:46 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4DAA9299AF for ; Tue, 7 Sep 2021 11:59:46 +0000 (UTC) X-FDA: 78560633172.08.15D748E Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf25.hostedemail.com (Postfix) with ESMTP id 19BD6B000184 for ; Tue, 7 Sep 2021 11:59:45 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id f11-20020a17090aa78b00b0018e98a7cddaso1921931pjq.4 for ; Tue, 07 Sep 2021 04:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=sYUQ9F7l7pmPrz+Pc22jn/gSKABFcngIahIwWGKuByQ=; b=ErIck/odkkfkqV9XKixNXrZJAZN2wyxh9z+s4tqf2BzncxxX1s7V8LHRMoNZAuuhGI 32VJxdL0snxOcbDUVmgaRe9HArcAc0cXkz8LCbiSloI1onDtz9Fw0Z+QU1rOsmGnTaR/ Y1MjId5gUVHKb3jNllnSoJMCWZSndhcOoZ4OddkUxlTpA21h8w9t+qt/iID4lKUW+D8r 7ZUx4iHmkFDaJFSWMrcOUzhukiNRJXVx8atVXnsbEQBK5Oxjw+lOmkQ0xMGeBV1UOdPJ dCmg9vh+clk5XqzEAh019QGfj4WvSdFrm9x47Tsn6lCuNz+eW+1B3DLT4joWdWPUgkeP 4DDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=sYUQ9F7l7pmPrz+Pc22jn/gSKABFcngIahIwWGKuByQ=; b=tHlwQUjfLHQrx1foaJl4fRareMC6mWT0hii7nRNbGaTfUXGyXHffKQb22F8JdEdUbO BhOsCH+NUGll+YIwO7zPNcFW7D/MtwgOdLtlGD24IJgSMNvyhxkfreEZJaxds8U1bkS9 m20YiT5wg7kovcOTZ99cfsih+kculEeVHcXyHOd9KZ+8UKDMz7ekTN/k4bwyE51z5wWY 6iJcEQltshErusbhJJPkgti/ejRD7RPRDUg29yhEJzTlIuAd9XgGThRwojx/uBCY/PUx fAFd5pOumIc0j4x6NMStDcoHx9XJp7ivRjdAlwR6cdg6ZE3sKIcZmn2gpULP549R7Tsj jZIw== X-Gm-Message-State: AOAM531Ba+VEmF49+K1AC3Ro2Bff1dBR8L2wTl+EM6Qbu5tIgIEx4NDZ x6OzKfaFYFQ1IsUnsTctaJg= X-Google-Smtp-Source: ABdhPJwVtSRTduJSH6W2JVWrqJgeIYP/47FiFiiAbpAgDOhcco4Mssx19K03DA+Cu6bpqlgRUNX5Ew== X-Received: by 2002:a17:902:e793:b0:138:f941:e2d7 with SMTP id cp19-20020a170902e79300b00138f941e2d7mr14680711plb.67.1631015985002; Tue, 07 Sep 2021 04:59:45 -0700 (PDT) Received: from bj03382pcu.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id x75sm13660290pgx.43.2021.09.07.04.59.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Sep 2021 04:59:44 -0700 (PDT) From: Huangzhaoyang To: Andrew Morton , Minchan Kim , Zhaoyang Huang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm : bail out from psi memstall after submit_bio in swap_readpage Date: Tue, 7 Sep 2021 19:59:28 +0800 Message-Id: <1631015968-9779-1-git-send-email-huangzhaoyang@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Rspamd-Queue-Id: 19BD6B000184 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="ErIck/od"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of huangzhaoyang@gmail.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=huangzhaoyang@gmail.com X-Rspamd-Server: rspam01 X-Stat-Signature: e6kg5qzobumiowijpauqtmrzx4qibkbp X-HE-Tag: 1631015985-874761 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: From: Zhaoyang Huang It doesn't make sense to count IO time into psi memstall. Bail out after bio submitted. Signed-off-by: Zhaoyang Huang --- mm/page_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/page_io.c b/mm/page_io.c index c493ce9..1d131fc 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -423,6 +423,7 @@ int swap_readpage(struct page *page, bool synchronous) count_vm_event(PSWPIN); bio_get(bio); qc = submit_bio(bio); + psi_memstall_leave(&pflags); while (synchronous) { set_current_state(TASK_UNINTERRUPTIBLE); if (!READ_ONCE(bio->bi_private)) @@ -433,7 +434,7 @@ int swap_readpage(struct page *page, bool synchronous) } __set_current_state(TASK_RUNNING); bio_put(bio); - + return ret; out: psi_memstall_leave(&pflags); return ret; -- 1.9.1