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=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 24499C433E3 for ; Thu, 6 Aug 2020 18:49:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4EEC020855 for ; Thu, 6 Aug 2020 18:49:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KOXH41yn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EEC020855 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5E80E6B0003; Thu, 6 Aug 2020 14:49:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 599C76B0005; Thu, 6 Aug 2020 14:49:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4610E6B0007; Thu, 6 Aug 2020 14:49:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id 31FF46B0003 for ; Thu, 6 Aug 2020 14:49:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EB940181AEF10 for ; Thu, 6 Aug 2020 18:49:33 +0000 (UTC) X-FDA: 77121032226.07.baby80_2a0bfa826fb9 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id C476B1803FFC1 for ; Thu, 6 Aug 2020 18:49:33 +0000 (UTC) X-HE-Tag: baby80_2a0bfa826fb9 X-Filterd-Recvd-Size: 4337 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 6 Aug 2020 18:49:33 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id r4so17606970pls.2 for ; Thu, 06 Aug 2020 11:49:33 -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; bh=pS0WhU6WE8IYcQCnD1IwwP5QRHOYUjKqdATKfccEtHE=; b=KOXH41ynmycekcDeMi9gZeiIS5eCKt3SCoMwlCTMHjb0JpMnOqc3vJoLKZfbX8BXQr +3PK+ex/1iKo64nx4cSsOP5WPAwB0IyatsYFDCoO+55h81UKK7NZaFiMcBxxzHrqQxBk Xs5oyToQ2QSy0+wGe2oHcxlBRe6wC+noBPy0KvzKOif6UfoF/BnNskrZ6PkmxeCtEB0a 3sNMPnigY0YoWJ749k7h6SGS/vlxyKNNSnoET7InWc8gdyT18CjBAOX5TVmkR3LbRAr0 Od0zuuJVaeIfNMukviws18DKLGd0vHBywboPjulRboLJswDBKsJbiHDasQ8Ev/SeRSBH RuIA== 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; bh=pS0WhU6WE8IYcQCnD1IwwP5QRHOYUjKqdATKfccEtHE=; b=sWNrtTRDSBrvWHzm4+ORAJeJ1lIdCHW74nycrH2hRdadbg1TxkZWYaS0fz5ijhqA96 7nKI1WVsu6goufOZe7NylWhXzxTE1fT+LdeJL+io/SmysYCtbWczxVUKFAYXWUIZq7Vv nJmbgUhIIaQi0Z29dCSuDeZevCHXHcLF+MiKlbpcBOLKhJiOX7LiC4S3DZUMBPptw05p eSvaG1KFnQZL8rF2eqvQLtcVrHxQnjAHsjsjgCay79/sCq2qBnqfMZLPr/lwFqmjtVOe Qe2YIcYwKvit4PiaSjzIlUMQp5moFtspmKlLWxT5M1pt3Yr410rf1HkZV8s1gjNdRQ9M 3BTQ== X-Gm-Message-State: AOAM533PnKwL3hw/ecEaaEYn8Xe9eMu/RIOD78pe62txz2gIX6f4tFfe iYT5aM6IwcuJhB8F0zAQVAXnsWGiLQ== X-Google-Smtp-Source: ABdhPJyxuBozs6QXnWSecAuONMVWxvd4dNJdBV1f4bZFBqG27ANykG47lkr6oIrXUy60PoNvNI93sw== X-Received: by 2002:a17:902:bb82:: with SMTP id m2mr8992381pls.115.1596739772043; Thu, 06 Aug 2020 11:49:32 -0700 (PDT) Received: from ip-172-31-41-194.ap-northeast-1.compute.internal (ec2-52-199-21-241.ap-northeast-1.compute.amazonaws.com. [52.199.21.241]) by smtp.gmail.com with ESMTPSA id u24sm9096730pfm.20.2020.08.06.11.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 11:49:31 -0700 (PDT) From: nao.horiguchi@gmail.com To: linux-mm@kvack.org Cc: mhocko@kernel.org, akpm@linux-foundation.org, mike.kravetz@oracle.com, osalvador@suse.de, tony.luck@intel.com, david@redhat.com, aneesh.kumar@linux.vnet.ibm.com, zeil@yandex-team.ru, cai@lca.pw, naoya.horiguchi@nec.com, linux-kernel@vger.kernel.org Subject: [PATCH v6 01/12] mm,hwpoison: cleanup unused PageHuge() check Date: Thu, 6 Aug 2020 18:49:12 +0000 Message-Id: <20200806184923.7007-2-nao.horiguchi@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806184923.7007-1-nao.horiguchi@gmail.com> References: <20200806184923.7007-1-nao.horiguchi@gmail.com> X-Rspamd-Queue-Id: C476B1803FFC1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Naoya Horiguchi Drop the PageHuge check, which is dead code since memory_failure() forks into memory_failure_hugetlb() for hugetlb pages. memory_failure() and memory_failure_hugetlb() shares some functions like hwpoison_user_mappings() and identify_page_state(), so they should properly handle 4kB page, thp, and hugetlb. Signed-off-by: Naoya Horiguchi Signed-off-by: Oscar Salvador Reviewed-by: Mike Kravetz --- mm/memory-failure.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git v5.8-rc7-mmotm-2020-07-27-18-18/mm/memory-failure.c v5.8-rc7-mmotm-2020-07-27-18-18_patched/mm/memory-failure.c index fe53768e0793..3d2d61f1c6e9 100644 --- v5.8-rc7-mmotm-2020-07-27-18-18/mm/memory-failure.c +++ v5.8-rc7-mmotm-2020-07-27-18-18_patched/mm/memory-failure.c @@ -1382,10 +1382,7 @@ int memory_failure(unsigned long pfn, int flags) * page_remove_rmap() in try_to_unmap_one(). So to determine page status * correctly, we save a copy of the page flags at this time. */ - if (PageHuge(p)) - page_flags = hpage->flags; - else - page_flags = p->flags; + page_flags = p->flags; /* * unpoison always clear PG_hwpoison inside page lock -- 2.17.1