From patchwork Fri Nov 9 06:47:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 10675373 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 CAB49109C for ; Fri, 9 Nov 2018 06:47:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB0692DD3D for ; Fri, 9 Nov 2018 06:47:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE3F82DD52; Fri, 9 Nov 2018 06:47:53 +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 0881A2DD3D for ; Fri, 9 Nov 2018 06:47:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF14C6B06A2; Fri, 9 Nov 2018 01:47:47 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 988096B06A0; Fri, 9 Nov 2018 01:47:47 -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 716AC6B06A3; Fri, 9 Nov 2018 01:47:47 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 0B4346B06A2 for ; Fri, 9 Nov 2018 01:47:47 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id a72-v6so766576pfj.14 for ; Thu, 08 Nov 2018 22:47:47 -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=zosYmZIH/bMZx2kLa53kE3x2OPdcSq6ez0a9bP/tt24=; b=F0NG0JmQ3/uaL42CwtheHib0KRPpi8GsyxESAvXvhryYy/VBvB8v4erIP8adCD0P6v olKvG9SFVGyFJb/jPFoYgqPbGA4kr7efTzJWkW57/G7dCKTczV56Rfzhb4TPAH2pLL+O 4BUIplg/SwiiW/hJeMQWsWJIWPyl6+CDJiSMlddb1tkCZu6cN7F23LlTRf+V6OTCmSD1 1e1hpm8Rr7rTnrB8qAZTer8sWSempfvUx+HwxUv2gJzC486M9LsH6fS+5mrt4qFcj1Wi FkvXu4zOQy2IlEZONcJcvt6ViToliKxGKz0HeRbQzO0toBLsX5F4ja+9hvXizkI0KNeI roIA== X-Gm-Message-State: AGRZ1gJy71bfZgReeHAT2X5wANZSXehaBrOf+tn6z+L5SRc8LmVvg4Yg iKQPKoLXMwPxE8pgtjht4AsAJUWdFTEZIhUYg2hrB1pNyysvEEVW3MiE2XQmdUQBqDyxEvXpQo2 02K1vhfNxLEQ02lo131ZDrgnOBXL+gFG6z8brdxvi1DW3oPbt7Z4GzPxneYdcH8TDynWubgyhm5 8mj0751QZfcb1PQqZM2JbEu6eLTDEE9DpIYambZjuWBytEbQT6LHKhbDavHrVYrgCxvs/CzH0Ji zoQbkyWmhcJ4fH4ydp0Bc6poQT9k2Gzkv3/5e2IfmXMKVVPrgFNhs5rnF8EtMTLA9BK5DeUiENi AJS20t4aIQjoSCEUzfP8AuJDGQEJTXqjTrtr6iJXVNBgwHgueLrkDzifBk/+EpgBkuj6EdF3VQ= = X-Received: by 2002:a65:42c2:: with SMTP id l2-v6mr6176465pgp.139.1541746066668; Thu, 08 Nov 2018 22:47:46 -0800 (PST) X-Received: by 2002:a65:42c2:: with SMTP id l2-v6mr6176425pgp.139.1541746065197; Thu, 08 Nov 2018 22:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541746065; cv=none; d=google.com; s=arc-20160816; b=ZieQpyHZcvBDBedD+uJ9X+deZr23J0qNQL3maW9B66LobK3S0asNc4vz2H2IQnaZU/ 9aGtjttCs8+sNs37+V2DaKCVEW0e1Z25Uj6ssPP3ZZb5D901TEXF8cJuROR2FWOZFg2Z /rZ6q5Uwv+0l9cMz3ZQhE5PSHflAduotHR3pOu5IubGjknKQ3vQcSJW+mp/DeXTpNQq2 rgP+zIS+jNVSO6/jgSk63DsfITVzXxwMucKCeKovAD/kOfTz2uL9q9pR4p4b+nB0rJNa y2X0IVKvlYtd+a5dCtirZnuIFsGBPlX9US0ob267KnHiuSZ41Ym3thcZlX/6CXQLDLWK Mahg== 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=zosYmZIH/bMZx2kLa53kE3x2OPdcSq6ez0a9bP/tt24=; b=0P+jPjqk0RJnLbcEA22gGDhiKyzqor4GaG1kVjBKfi5Jjoe9k7vlTmILfQYYBVoxEs MWeXdJMgdLdVIH7gtO5DyTh181EKoFy8SlRaS2+8ipbrrNsbBPTQR+Yo2CNxZPArpKqJ jB8ua8DrqIY3GWkdmS4EBh4G5yti8sS42usz0Qgw4tOk7/Yx/RYPAip75WFM8YhQkjbc NOuaKjqoi24MDM2r62G/A8OZ+cWD1NVU0hgLrDeu689rDvYU/Hq3KeoYjgZ1ZWn1ZcTx u1Tm5nG+iBT97EUHlLWi/tl/8cIrRTJK6v7F4FMCcbdMiySBg9P3UaKsEG1NBRcBENUL 9FaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QwyMpnn9; 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 t78-v6sor8132087pfa.32.2018.11.08.22.47.45 for (Google Transport Security); Thu, 08 Nov 2018 22:47:45 -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=QwyMpnn9; 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=zosYmZIH/bMZx2kLa53kE3x2OPdcSq6ez0a9bP/tt24=; b=QwyMpnn9c+6gRddzOcen8u+RU89eMBYJSP0wvwfeKtViwuqu/oqR624Hi0FCCd5scq Nqo1jwYwCU+YTFBY5GWLyY0bu5tqBIG1L3uAlFT2u7sZQGqL7oLfXLUgtphEhVoy1x1k 5Pjib0hIlc2NILlQVMGs0xSyX5J9/w2AZT8szVR+3SOOprVcnJu93AUnlRGqgUmGMTHa MUU+o/GxHCR2lOwjfotjqwT2Q9NBiRBbMTyUMsR5szQ3PgfQIv67GQPjLAJc85XwLsgY oQ5C0ROwHR2LdlrDgtmifzQ1wZeYKP+xG3/NtjcgYW4euG1/v4TW7nxiLOoekbUEXqum 7WOA== X-Google-Smtp-Source: AJdET5cEO3P9TCk3E/SJ1+7RvyDFXdw4xMpccPJrqiypjxfdL6CGqC6goMUHPyet7uFuMIq3r2SceQ== X-Received: by 2002:a62:571b:: with SMTP id l27-v6mr7842901pfb.209.1541746064720; Thu, 08 Nov 2018 22:47:44 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 22:47:44 -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 07/11] mm: remove flag argument from soft offline functions Date: Fri, 9 Nov 2018 15:47:11 +0900 Message-Id: <1541746035-13408-8-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 The argument @flag no longer affects the behavior of soft_offline_page() and its variants, so let's remove them. Signed-off-by: Naoya Horiguchi --- drivers/base/memory.c | 2 +- include/linux/mm.h | 2 +- mm/madvise.c | 2 +- mm/memory-failure.c | 27 +++++++++++++-------------- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git v4.19-mmotm-2018-10-30-16-08/drivers/base/memory.c v4.19-mmotm-2018-10-30-16-08_patched/drivers/base/memory.c index 0e59856..4a554a5 100644 --- v4.19-mmotm-2018-10-30-16-08/drivers/base/memory.c +++ v4.19-mmotm-2018-10-30-16-08_patched/drivers/base/memory.c @@ -548,7 +548,7 @@ store_soft_offline_page(struct device *dev, pfn >>= PAGE_SHIFT; if (!pfn_valid(pfn)) return -ENXIO; - ret = soft_offline_page(pfn_to_page(pfn), 0); + ret = soft_offline_page(pfn_to_page(pfn)); return ret == 0 ? count : ret; } 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 f85b450..6c496da 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 @@ -2738,7 +2738,7 @@ extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; extern void shake_page(struct page *p, int access); extern atomic_long_t num_poisoned_pages __read_mostly; -extern int soft_offline_page(struct page *page, int flags); +extern int soft_offline_page(struct page *page); #ifdef CONFIG_MEMORY_FAILURE /* diff --git v4.19-mmotm-2018-10-30-16-08/mm/madvise.c v4.19-mmotm-2018-10-30-16-08_patched/mm/madvise.c index 9fa0225..86453f3 100644 --- v4.19-mmotm-2018-10-30-16-08/mm/madvise.c +++ v4.19-mmotm-2018-10-30-16-08_patched/mm/madvise.c @@ -660,7 +660,7 @@ static int madvise_inject_error(int behavior, pr_info("Soft offlining pfn %#lx at process virtual address %#lx\n", pfn, start); - ret = soft_offline_page(page, 0); + ret = soft_offline_page(page); if (ret) return ret; continue; 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 ed347f8..869ff8f 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 @@ -1482,7 +1482,7 @@ static void memory_failure_work_func(struct work_struct *work) if (!gotten) break; if (entry.flags & MF_SOFT_OFFLINE) - soft_offline_page(pfn_to_page(entry.pfn), entry.flags); + soft_offline_page(pfn_to_page(entry.pfn)); else memory_failure(entry.pfn, entry.flags); } @@ -1615,7 +1615,7 @@ static struct page *new_page(struct page *p, unsigned long private) * that is not free, and 1 for any other page type. * For 1 the page is returned with increased page count, otherwise not. */ -static int __get_any_page(struct page *p, unsigned long pfn, int flags) +static int __get_any_page(struct page *p, unsigned long pfn) { int ret; @@ -1642,9 +1642,9 @@ static int __get_any_page(struct page *p, unsigned long pfn, int flags) return ret; } -static int get_any_page(struct page *page, unsigned long pfn, int flags) +static int get_any_page(struct page *page, unsigned long pfn) { - int ret = __get_any_page(page, pfn, flags); + int ret = __get_any_page(page, pfn); if (ret == 1 && !PageHuge(page) && !PageLRU(page) && !__PageMovable(page)) { @@ -1657,7 +1657,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) /* * Did it turn free? */ - ret = __get_any_page(page, pfn, 0); + ret = __get_any_page(page, pfn); if (ret == 1 && !PageLRU(page)) { /* Drop page reference which is from __get_any_page() */ put_hwpoison_page(page); @@ -1669,7 +1669,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) return ret; } -static int soft_offline_huge_page(struct page *page, int flags) +static int soft_offline_huge_page(struct page *page) { int ret; unsigned long pfn = page_to_pfn(page); @@ -1730,7 +1730,7 @@ static int soft_offline_huge_page(struct page *page, int flags) return ret; } -static int __soft_offline_page(struct page *page, int flags) +static int __soft_offline_page(struct page *page) { int ret; unsigned long pfn = page_to_pfn(page); @@ -1815,7 +1815,7 @@ static int __soft_offline_page(struct page *page, int flags) return ret; } -static int soft_offline_in_use_page(struct page *page, int flags) +static int soft_offline_in_use_page(struct page *page) { int ret; int mt; @@ -1847,9 +1847,9 @@ static int soft_offline_in_use_page(struct page *page, int flags) mt = get_pageblock_migratetype(page); set_pageblock_migratetype(page, MIGRATE_ISOLATE); if (PageHuge(page)) - ret = soft_offline_huge_page(page, flags); + ret = soft_offline_huge_page(page); else - ret = __soft_offline_page(page, flags); + ret = __soft_offline_page(page); set_pageblock_migratetype(page, mt); return ret; } @@ -1873,7 +1873,6 @@ static int soft_offline_free_page(struct page *page) /** * soft_offline_page - Soft offline a page. * @page: page to offline - * @flags: flags. Same as memory_failure(). * * Returns 0 on success, otherwise negated errno. * @@ -1892,7 +1891,7 @@ static int soft_offline_free_page(struct page *page) * This is not a 100% solution for all memory, but tries to be * ``good enough'' for the majority of memory. */ -int soft_offline_page(struct page *page, int flags) +int soft_offline_page(struct page *page) { int ret; unsigned long pfn = page_to_pfn(page); @@ -1909,11 +1908,11 @@ int soft_offline_page(struct page *page, int flags) } get_online_mems(); - ret = get_any_page(page, pfn, flags); + ret = get_any_page(page, pfn); put_online_mems(); if (ret > 0) - ret = soft_offline_in_use_page(page, flags); + ret = soft_offline_in_use_page(page); else if (ret == 0) ret = soft_offline_free_page(page);