From patchwork Tue Aug 10 20:29:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12429423 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 EF688C43214 for ; Tue, 10 Aug 2021 20:29:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 95EAB60F13 for ; Tue, 10 Aug 2021 20:29:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 95EAB60F13 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 1BDD88D0005; Tue, 10 Aug 2021 16:29:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 146E48D0003; Tue, 10 Aug 2021 16:29:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F038A8D0005; Tue, 10 Aug 2021 16:29:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id D0CBD8D0003 for ; Tue, 10 Aug 2021 16:29:44 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 7F306182D5C84 for ; Tue, 10 Aug 2021 20:29:44 +0000 (UTC) X-FDA: 78460311888.19.1CF4319 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf11.hostedemail.com (Postfix) with ESMTP id 3B258F003FCB for ; Tue, 10 Aug 2021 20:29:44 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id f3so12285696plg.3 for ; Tue, 10 Aug 2021 13:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hZjOsueYpGQZhP7Bl+kpLTfQ5nGKWlyBAih7CetRBqo=; b=d27jbU5RObYQHtJTomYK15bAtbSLjYnuuQGarNydT4VQfGjI3fgRutZKx9f9jnFgZF XdyptNt76rJ9ZDeUXc93+a+9ULz6cwZaJP7mqbiwyhRztgT2voZK8ZesrQxSEaWvhNVp Nt26APxgTiBvC3UogJ4qu3swuHbFNuQ6MSQiS8R6S0STbxDpN7o2ZxjAv/p5aEDY7zN3 /Ahn/SVMsrbmC04xT6dyAZJs0RcjIfYG00VI5iRObuZwKJU6itBqmlPX5YKjuVzbeg3M uXlRpbtBhUhaPrE8i+i1w48acx8Ncvc9zR+h5mxZ+IKZmuJ029grf5jaipsfEv8mSxtJ tVdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hZjOsueYpGQZhP7Bl+kpLTfQ5nGKWlyBAih7CetRBqo=; b=VRrNJVVfC1dkLc5ooDubIvfELJvPk8txRhkVrOwkcfsTMleUTvnGshX5FG6+3KmdPT mMjjuqxZ/hIoaCckHfC4ZOn8opulSkFPZrGDCBjr024Co8ggC6XpGWi0SGuxOGP6ZEB3 L0/0xVuQBe4uzEmcXAuxXuSaD2AcdQfH6HD2E+kBEEQhd0bYNyOmKVTmWRsXmng4IcVC sz7eXIh6/R7Ch0YiWWlKRjrGOXXDcsMtTaghZcNXLED4d+2YfahLdIU3SZZwpUjF+4j6 JjFWIdtvMugdZr9v+VZdTdBjMnfMylA3kq41JrmBVrafS6M6wTJGikNfMAYrCqKxwkPX YNlg== X-Gm-Message-State: AOAM530fk6nGP/OBu4ybMxpTFXu1A67+fVL4ASTG/nROf4Eo15/EiAXy 60EhjJPhi8a6NuTU2LE5gDY= X-Google-Smtp-Source: ABdhPJwxeNtymkuQhLsqn6aJPUCztLEhhXqt/9LBl9cBwT9fLTENQbvFeFkGhVctnCs6SIZMzlNn1w== X-Received: by 2002:a62:e40d:0:b029:3ab:42cd:d156 with SMTP id r13-20020a62e40d0000b02903ab42cdd156mr24870896pfh.81.1628627383473; Tue, 10 Aug 2021 13:29:43 -0700 (PDT) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id e12sm24697145pfc.214.2021.08.10.13.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 13:29:42 -0700 (PDT) From: Yang Shi To: hughd@google.com, ying.huang@intel.com, linmiaohe@huawei.com, Andrew Morton Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] Revert "mm: swap: check if swap backing device is congested or not" Date: Tue, 10 Aug 2021 13:29:36 -0700 Message-Id: <20210810202936.2672-3-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210810202936.2672-1-shy828301@gmail.com> References: <20210810202936.2672-1-shy828301@gmail.com> MIME-Version: 1.0 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=d27jbU5R; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of shy828301@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Stat-Signature: affacip8gdp4uf8cg9fpexdwcm78n1yh X-Rspamd-Queue-Id: 3B258F003FCB X-Rspamd-Server: rspam01 X-HE-Tag: 1628627384-314878 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: Due to the change about how block layer detects congestion the justification of commit 8fd2e0b505d1 ("mm: swap: check if swap backing device is congested or not") doesn't stand anymore, so the commit could be just reverted in order to solve the race reported by commit 2efa33fc7f6e ("mm/shmem: fix shmem_swapin() race with swapoff"). The fix was reverted by the previous patch. Suggested-by: Hugh Dickins Cc: "Huang, Ying" Cc: Miaohe Lin Signed-off-by: Yang Shi Acked-by: Hugh Dickins --- mm/swap_state.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 1a29b4f98208..8d4104242100 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -628,13 +628,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, if (!mask) goto skip; - /* Test swap type to make sure the dereference is safe */ - if (likely(si->flags & (SWP_BLKDEV | SWP_FS_OPS))) { - struct inode *inode = si->swap_file->f_mapping->host; - if (inode_read_congested(inode)) - goto skip; - } - do_poll = false; /* Read a page_cluster sized and aligned cluster around offset. */ start_offset = offset & ~mask;