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 AFA09C433F5 for ; Fri, 29 Apr 2022 14:26:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 443666B0075; Fri, 29 Apr 2022 10:26:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CB636B0078; Fri, 29 Apr 2022 10:26:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21E926B007B; Fri, 29 Apr 2022 10:26:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 113106B0075 for ; Fri, 29 Apr 2022 10:26:17 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DA2C6857 for ; Fri, 29 Apr 2022 14:26:16 +0000 (UTC) X-FDA: 79410141552.02.4C06AB8 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf17.hostedemail.com (Postfix) with ESMTP id EDA3A40065 for ; Fri, 29 Apr 2022 14:26:06 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id z21so6672819pgj.1 for ; Fri, 29 Apr 2022 07:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vFKncaOnZsj36cgCwXssHtw7cbUchdfW5A7RWCFJ7yM=; b=384bTYX2aM/rqOGE6WsCJQTNL79rpvqSB6FFLpieETQcCxe4bkBKp3PHUHUxNhGhBo OrC6RI3a38E7/HAdvIsG2Nx7qmS/7xcqwk7vWCA5UVqzgxMigOT6e3Q7uvtShMtOKPhZ Dfl9S51N5BM2lNMJezk08BE3w7BAmiHm4hQovg3Nfff5bgR/a1IcZKzIEZocPr6M4cWT tTwGHrEkexmAVVtXROujq+AAOYxOHFDuFGQowUZNSrbib6zdEHTwi99oa7f5rhvg0SjQ vRqAubqjuzBzIPstt3HbFWYAeZANPNmKIQt315JO5dEt5JBW/hE0iyb4eV+zoVgoO9gF V5wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vFKncaOnZsj36cgCwXssHtw7cbUchdfW5A7RWCFJ7yM=; b=RHRQuAw+7s11fbxJRQaqj24Rq3Un9ToFJ8HFDn8/r6Qz2ZP4i9AzfTqjDL0528IXb4 /VIUVyBQCU0u5N+z9lvhGtUIFfuAGeZ/sgvq3skD5MSc59HUmY6L3rf0FtjlOvaEh/9D s5vxp2L7dRNm9VvUcbjFlpHKLJVTCqulGIFhlrVAYvvnNfvpUSzzjHUrCfNELVgZmtlu raPZqOloMG20BNMD3Iima3ceEZtPFe997EoyPXTweL/uDWmdIi/bUd2RCzvNvGe4N9/b kQpW2p1mBcg9Al5NhAFEY6kU3oRdvC/0J3ZTU6C27j2jpeqHa0k5Nd0HEI4+AYOw3Jb3 oMWg== X-Gm-Message-State: AOAM530Au/ydQFiZD1C6Ev5NYMtWxbs9sbynEhKMBPmIVhO8qFvMj4Xz 1qq6UdVwBPjmGreRhlSrO3bN/Q== X-Google-Smtp-Source: ABdhPJxtVXUSLrycX5o3L/8LudOkLIuOG0tXjRQVn3FboK4JXL4Qvwb1lBd4ZuJ6uq6RVmuwiX/grw== X-Received: by 2002:a05:6a00:2391:b0:50a:3ea9:e84d with SMTP id f17-20020a056a00239100b0050a3ea9e84dmr40345445pfc.21.1651242375308; Fri, 29 Apr 2022 07:26:15 -0700 (PDT) Received: from always-x1.www.tendawifi.com ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004fae885424dsm3494734pfx.72.2022.04.29.07.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 07:26:14 -0700 (PDT) From: zhenwei pi To: akpm@linux-foundation.org, naoya.horiguchi@nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, zhenwei pi , Wu Fengguang Subject: [PATCH 3/4] mm/memofy-failure.c: optimize hwpoison_filter Date: Fri, 29 Apr 2022 22:22:05 +0800 Message-Id: <20220429142206.294714-4-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429142206.294714-1-pizhenwei@bytedance.com> References: <20220429142206.294714-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EDA3A40065 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=384bTYX2; spf=pass (imf17.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspam-User: X-Stat-Signature: 3tyixxi6m1qs3hzjsqketd6rfurzcwsa X-HE-Tag: 1651242366-181101 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: In the memory failure procedure, hwpoison_filter has higher priority, if memory_filter() filters the error event, there is no need to do the further work. Cc: Wu Fengguang Signed-off-by: zhenwei pi --- mm/memory-failure.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ece05858568f..a6a27c8b800f 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1800,6 +1800,11 @@ int memory_failure(unsigned long pfn, int flags) goto unlock_mutex; } + if (hwpoison_filter(p)) { + res = -EOPNOTSUPP; + goto unlock_mutex; + } + try_again: res = try_memory_failure_hugetlb(pfn, flags, &hugetlb); if (hugetlb) @@ -1937,15 +1942,6 @@ int memory_failure(unsigned long pfn, int flags) */ page_flags = p->flags; - if (hwpoison_filter(p)) { - if (TestClearPageHWPoison(p)) - num_poisoned_pages_dec(); - unlock_page(p); - put_page(p); - res = -EOPNOTSUPP; - goto unlock_mutex; - } - /* * __munlock_pagevec may clear a writeback page's LRU flag without * page_lock. We need wait writeback completion for this page or it -- 2.20.1