From patchwork Fri Nov 9 06:47:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 10675371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A79D213BF for ; Fri, 9 Nov 2018 06:47:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 979BF2DD3D for ; Fri, 9 Nov 2018 06:47:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BFE22DD52; Fri, 9 Nov 2018 06:47:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 185A62DD3D for ; Fri, 9 Nov 2018 06:47:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FD876B069E; Fri, 9 Nov 2018 01:47:45 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 08A106B06A0; Fri, 9 Nov 2018 01:47:44 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D55096B06A1; Fri, 9 Nov 2018 01:47:44 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 897486B069E for ; Fri, 9 Nov 2018 01:47:44 -0500 (EST) Received: by mail-pf1-f199.google.com with SMTP id b88-v6so789332pfj.4 for ; Thu, 08 Nov 2018 22:47:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:sender:from:to:cc:subject:date :message-id:in-reply-to:references; bh=Ow8luW8HYDT6HHVRhv0uM4c/Zk3Ha3snWz7rsKYzHxE=; b=pK08dqRYeyjmbH8uCwzbPJ2TBGBvIYgTMIvb2kmwAO6xUZ+bGZGmHtNYHV5rlXNmtS MYrtPghdVrWK+ISihzB87KY7u4cXHAXSFZrB12oCWNgqQk5ByWiEKlJUV5xMxMs2+EVh BQNDdN6ozYfejrL3azt+nTH1AWsCdD7OBe/9rVuxMOFyb1V7eqtQ9FS1X4H7heMLSoL7 ckSgwmKp59S2VeZ8TDuMzuiyiXXvPtd7iSmtET14Za8wbm2lh8ptndAqImJGfyrfBAa9 mNtPmy6QsG4OnR6I4gZq9Mhz+SP/UD09qbjcNdQ8+ozL0W9Dtu8XjtBKVM093WMgHOu7 8IXg== X-Gm-Message-State: AGRZ1gIwIR6EahPfaaeoEneCzIHli9OjRG6CVFB7sWdIhRoaEvFheb9O Rn4uO0eSVmqUJkGX7yXvnLlpTF8byUcDGs8KNo0k5pFVHrxHG5EjEY6AEQ1JUs57xHubsggnWxS VOWHxVTiRV8NOnNe0iuVgTnRr2Ps320v59z4KgMCM1q2GsBfnXbdsxCHmYyh5T9GVH/86OcD9KB BszW7NOohy+j0dUDYubYhRY0/SroypAWePiSlbVcjDBdPt2oRXI/HYFLknEVtGIkPPxfRzSnyz/ kmrIM9iTvH/TFGpEBXau/5DKlUU9U8iSjgHd2QvE2Y1GlWAgmAg3iNKqIOZ9RSzUJuZKGTggImG RcKbeEI/RvEu9igLkroda5kXtY4+5JNRzuU0t1tr3CRn94f8GYSEYQeG8tLnHuIx7Bx80/HklA= = X-Received: by 2002:a17:902:7c94:: with SMTP id y20-v6mr7709941pll.218.1541746064218; Thu, 08 Nov 2018 22:47:44 -0800 (PST) X-Received: by 2002:a17:902:7c94:: with SMTP id y20-v6mr7709904pll.218.1541746063104; Thu, 08 Nov 2018 22:47:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541746063; cv=none; d=google.com; s=arc-20160816; b=KoYBgEUvdrWXvf78qyu+paDLYQnAZeyfx3DnA6y8jKhO0IND4XWRCFdI4DxsrlliKT AuuA1qy9oa5JtnvShtqmbuJDxRdRouqT4OH25ARfLgdN3Zy6U3b7rdCJlbA3UT66qkzM 5tgH8SOHcO5SJWKFCfHToUyp8c/NOKIEuA8sJc3Iu22PZ8CnvMgYNtWIC94mbl/qjR9i NrjMV+sls2gVf2I+A2GN7N9lk1P5WVuygKMp+mc1nKYuTibLVLp1yV+cMcw1jeX9hn7j vVq9kGjLKu7Xr58UNyyVQLsMQmJ8ykYtMibMkL4cpqUHSG/d4eGGHfyr2liyy88EkNay R4vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=Ow8luW8HYDT6HHVRhv0uM4c/Zk3Ha3snWz7rsKYzHxE=; b=nAinrKuQBuyTha5nLbuLM4bQFlBd2CrIJG3WIa7GON+YmzoNExsj9krv9BypJU1TfV FtmwZCRpoaLoBlrncQnpwfmZ58Vq4aRr2HS15KH7rXSavAB70HNYvf/6VeGtRHH0DTCa JdWx1e3+l3J0ViTJOBEPandGGMqGY4YRdpQgcLz9lUh/mjlHuRpxalhIqfdYJsO50zXi 2I0lIFAuSe69vWxxdddM6cjx94VYSKKDxT+U9pkT7Q6CtmoL2iVBFg+ksqI49C48t7fX Li94Ia9RFkylyLd7oGrUlQwNHxc7tsuJH1CPfwM10zi3Zp8DfXr0epcKi4fR8shkcfzO e/kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BtY6fS79; spf=pass (google.com: domain of nao.horiguchi@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=nao.horiguchi@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q73-v6sor6655314pfi.33.2018.11.08.22.47.42 for (Google Transport Security); Thu, 08 Nov 2018 22:47:43 -0800 (PST) Received-SPF: pass (google.com: domain of nao.horiguchi@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BtY6fS79; spf=pass (google.com: domain of nao.horiguchi@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=nao.horiguchi@gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ow8luW8HYDT6HHVRhv0uM4c/Zk3Ha3snWz7rsKYzHxE=; b=BtY6fS79qUSUdw6odCyXzhzKyXYHFlr6NvBRMERuhh1hDraSjt9j2yKUwAcdCPoBwL InSqNelUnjXxU+6LCXKn7SpGfYcMOG8yE0yARiFGYBiswQdpIsZku38c9uJ/vm3IgUqg El054i/6UGk31S6MC8S7A5Dbe5tiS/gpatKTvbg/xY5q54NvWEh/JQFtj8njQioFGNoq L4nccfR2A0zdLaA1zV3E6Zgxku7jh1iE6AsS3fS39drBeYdcH8I/iOrrGIKmSzDU2Dze OO57mO51BTtIBzSC7NigXa0I1iivpaNXjMINi4rgfDjDA4ATYjyguXdO9xAgkb55jrIU lQfA== X-Google-Smtp-Source: AJdET5cxtRfw2ZsPktJ3kZ8sESWDSkNL6zBg8GtYQZpKC+5MmuXfzJ+4cSys4HwvLnrVSpRIDXh2/w== X-Received: by 2002:a62:34c5:: with SMTP id b188-v6mr8125043pfa.65.1541746062460; Thu, 08 Nov 2018 22:47:42 -0800 (PST) Received: from www9186uo.sakura.ne.jp (www9186uo.sakura.ne.jp. [153.121.56.200]) by smtp.gmail.com with ESMTPSA id c70-v6sm6808355pfg.97.2018.11.08.22.47.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 22:47:41 -0800 (PST) From: Naoya Horiguchi To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Michal Hocko , Andrew Morton , Mike Kravetz , xishi.qiuxishi@alibaba-inc.com, Laurent Dufour Subject: [RFC][PATCH v1 06/11] mm: hwpoison: remove MF_COUNT_INCREASED Date: Fri, 9 Nov 2018 15:47:10 +0900 Message-Id: <1541746035-13408-7-git-send-email-n-horiguchi@ah.jp.nec.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1541746035-13408-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1541746035-13408-1-git-send-email-n-horiguchi@ah.jp.nec.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Now there's no user of MF_COUNT_INCREASED, so we can safely remove all calling points. Signed-off-by: Naoya Horiguchi --- include/linux/mm.h | 7 +++---- mm/memory-failure.c | 16 +++------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git v4.19-mmotm-2018-10-30-16-08/include/linux/mm.h v4.19-mmotm-2018-10-30-16-08_patched/include/linux/mm.h index 22623ba..f85b450 100644 --- v4.19-mmotm-2018-10-30-16-08/include/linux/mm.h +++ v4.19-mmotm-2018-10-30-16-08_patched/include/linux/mm.h @@ -2725,10 +2725,9 @@ void register_page_bootmem_memmap(unsigned long section_nr, struct page *map, unsigned long nr_pages); enum mf_flags { - MF_COUNT_INCREASED = 1 << 0, - MF_ACTION_REQUIRED = 1 << 1, - MF_MUST_KILL = 1 << 2, - MF_SOFT_OFFLINE = 1 << 3, + MF_ACTION_REQUIRED = 1 << 0, + MF_MUST_KILL = 1 << 1, + MF_SOFT_OFFLINE = 1 << 2, }; extern int memory_failure(unsigned long pfn, int flags); extern void memory_failure_queue(unsigned long pfn, int flags); diff --git v4.19-mmotm-2018-10-30-16-08/mm/memory-failure.c v4.19-mmotm-2018-10-30-16-08_patched/mm/memory-failure.c index 11e283e..ed347f8 100644 --- v4.19-mmotm-2018-10-30-16-08/mm/memory-failure.c +++ v4.19-mmotm-2018-10-30-16-08_patched/mm/memory-failure.c @@ -1094,7 +1094,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags) num_poisoned_pages_inc(); - if (!(flags & MF_COUNT_INCREASED) && !get_hwpoison_page(p)) { + if (!get_hwpoison_page(p)) { /* * Check "filter hit" and "race with other subpage." */ @@ -1290,7 +1290,7 @@ int memory_failure(unsigned long pfn, int flags) * In fact it's dangerous to directly bump up page count from 0, * that may make page_ref_freeze()/page_ref_unfreeze() mismatch. */ - if (!(flags & MF_COUNT_INCREASED) && !get_hwpoison_page(p)) { + if (!get_hwpoison_page(p)) { if (is_free_buddy_page(p)) { action_result(pfn, MF_MSG_BUDDY, MF_DELAYED); return 0; @@ -1331,10 +1331,7 @@ int memory_failure(unsigned long pfn, int flags) shake_page(p, 0); /* shake_page could have turned it free. */ if (!PageLRU(p) && is_free_buddy_page(p)) { - if (flags & MF_COUNT_INCREASED) - action_result(pfn, MF_MSG_BUDDY, MF_DELAYED); - else - action_result(pfn, MF_MSG_BUDDY_2ND, MF_DELAYED); + action_result(pfn, MF_MSG_BUDDY_2ND, MF_DELAYED); return 0; } @@ -1622,9 +1619,6 @@ static int __get_any_page(struct page *p, unsigned long pfn, int flags) { int ret; - if (flags & MF_COUNT_INCREASED) - return 1; - /* * When the target page is a free hugepage, just remove it * from free hugepage list. @@ -1906,15 +1900,11 @@ int soft_offline_page(struct page *page, int flags) if (is_zone_device_page(page)) { pr_debug_ratelimited("soft_offline: %#lx page is device page\n", pfn); - if (flags & MF_COUNT_INCREASED) - put_page(page); return -EIO; } if (PageHWPoison(page)) { pr_info("soft offline: %#lx page already poisoned\n", pfn); - if (flags & MF_COUNT_INCREASED) - put_hwpoison_page(page); return -EBUSY; }