From patchwork Fri Dec 7 05:41:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10717459 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 462B8109C for ; Fri, 7 Dec 2018 05:42:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 334B12EC7A for ; Fri, 7 Dec 2018 05:42:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 272B12EC81; Fri, 7 Dec 2018 05:42:01 +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.9 required=2.0 tests=BAYES_00,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 8B15C2EC7A for ; Fri, 7 Dec 2018 05:42:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 594806B7EA2; Fri, 7 Dec 2018 00:41:58 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 520926B7EA4; Fri, 7 Dec 2018 00:41:58 -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 3719C6B7EA5; Fri, 7 Dec 2018 00:41:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id E1F3D6B7EA2 for ; Fri, 7 Dec 2018 00:41:57 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id d3so1812594pgv.23 for ; Thu, 06 Dec 2018 21:41:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=y0/sVC3bmQURZWvLIXSzWUkmUi9dLD3cA/MNYt+cBb4=; b=PQPvti3kU7bzJcq/Kld+fCCq84aAu2nAZYfl7+OGBKCMfIRiAxxkVXwNgLM9MeKQtj vLm9jNz4hnNyqWkT4V6Gxyi+inj+fSOkDJqntXcigQ6QYS20CSb3K3PnTv3p1/Q8CnGe bMQM6NvN/kyqFSyVe62j/JHHr8OsUo+yg+m/tQs3W1p13Zru/o/Pud3Pjk64V+a3LVxy puF83jauIawUgJ/0kmpw1fL1oWmm00Au/VFOjeugDMYEvV7PTNhGwrjTsC+YdpfE/bWL a/1EDX/mt3lI7GCdncE/5UFdflTvJaP5BfgYieeC4wYEdZcwbL/a1HzGty61figQoCQo cIOQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWYEQulZlcD72HC6WNvSJzTityHEkE1I+xJgFGejrxy35mLMSx6j 4YTul8Teqq6H+qgBQSUSlY0tnfRpjGBmyiZnM7BjoKN4gDmz8WSpYWVSOYNiPuSK57z9I4brykT yrd95Szy+Zwvao6tiWo9Sf0ze5PD0SZaDmI0lHCvSEAA/EYTh0rf2LeWEj5SrsamaEA== X-Received: by 2002:a62:b15:: with SMTP id t21mr992324pfi.136.1544161317560; Thu, 06 Dec 2018 21:41:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/XWy0Nyokll7AXRddzYVMgLwL19kcZV9gcJTPvrfPVR55w9qSIzlUC68urzMJ2JATMLA633 X-Received: by 2002:a62:b15:: with SMTP id t21mr992276pfi.136.1544161316363; Thu, 06 Dec 2018 21:41:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544161316; cv=none; d=google.com; s=arc-20160816; b=SLJOSnMnfeElt+xt8VcRwb+RwaIr9uiSXXb2NRDVgpMAziTk+Ut//OBiQHtez/HeQr Kp7lGJmlI6pKCc7U7i0tq/d+YolqhLM6onSLz2z73usMZQVghnagq3EIJGuJe9ZfkAiR LGuGo/ca2Wk+aBPB/LWP0APmRsXeHJhQNc1cMBY8066mb4FKKPYeJTE4YyuyiYBpIMrT Sh8fCcsg0jKnxIm7Zf3d1K4/Ept90yxi+7QgPeoGFtdrrItfJjwfCPYmOC4Acz9lGCN/ Z6kVM+PDYu52W4sdWtWuJiVwPRfNnYar7uYjUKWf9q+AGb7sNVq7RxoyaAzNWuFmmrVA gumQ== 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; bh=y0/sVC3bmQURZWvLIXSzWUkmUi9dLD3cA/MNYt+cBb4=; b=sC+vX1sWc/CxoQ+sLSKJycfUTAOX95G8jUJKhd103J0Mf18EAD9TJy9e+aaP8Rn7hr wBKG6ZSiLuetyTxgUABc5nHHKCeYR5P/U3J/r75unyCS5WHOg37xSd3joigbvFrayARU XMqQW17Hi/DLKC+wAbRDuVu1sencTv4hoHDjwJ1tXkRszv4lWaU6csJbARnfGYikPYPk ZzGqj3AFRhPzyUqlLIqtBkc7yaRaX8LUbV33V5ANWomt7eLvzlp8h4MggS4KqqX4mwsv wuSpuPlC6Y6di0q3GsG2AmCMnFAIoT60Y+LIP/UOePPJZ9QHsLZakdJ59MuzYwsYyScl 1tTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga05.intel.com (mga05.intel.com. [192.55.52.43]) by mx.google.com with ESMTPS id cf16si2126256plb.227.2018.12.06.21.41.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 21:41:56 -0800 (PST) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) client-ip=192.55.52.43; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Dec 2018 21:41:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,324,1539673200"; d="scan'208";a="105567268" Received: from yhuang-mobile.sh.intel.com ([10.239.196.133]) by fmsmga007.fm.intel.com with ESMTP; 06 Dec 2018 21:41:53 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , "Kirill A. Shutemov" , Andrea Arcangeli , Michal Hocko , Johannes Weiner , Shaohua Li , Hugh Dickins , Minchan Kim , Rik van Riel , Dave Hansen , Naoya Horiguchi , Zi Yan , Daniel Jordan Subject: [PATCH -V8 10/21] swap: Support to count THP swapin and its fallback Date: Fri, 7 Dec 2018 13:41:10 +0800 Message-Id: <20181207054122.27822-11-ying.huang@intel.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181207054122.27822-1-ying.huang@intel.com> References: <20181207054122.27822-1-ying.huang@intel.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 2 new /proc/vmstat fields are added, "thp_swapin" and "thp_swapin_fallback" to count swapin a THP from swap device in one piece and fallback to normal page swapin. Signed-off-by: "Huang, Ying" Cc: "Kirill A. Shutemov" Cc: Andrea Arcangeli Cc: Michal Hocko Cc: Johannes Weiner Cc: Shaohua Li Cc: Hugh Dickins Cc: Minchan Kim Cc: Rik van Riel Cc: Dave Hansen Cc: Naoya Horiguchi Cc: Zi Yan Cc: Daniel Jordan --- Documentation/admin-guide/mm/transhuge.rst | 8 ++++++++ include/linux/vm_event_item.h | 2 ++ mm/huge_memory.c | 4 +++- mm/page_io.c | 15 ++++++++++++--- mm/vmstat.c | 2 ++ 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 7ab93a8404b9..85e33f785fd7 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -364,6 +364,14 @@ thp_swpout_fallback Usually because failed to allocate some continuous swap space for the huge page. +thp_swpin + is incremented every time a huge page is swapin in one piece + without splitting. + +thp_swpin_fallback + is incremented if a huge page has to be split during swapin. + Usually because failed to allocate a huge page. + As the system ages, allocating huge pages may be expensive as the system uses memory compaction to copy data around memory to free a huge page for use. There are some counters in ``/proc/vmstat`` to help diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 7661abe5236e..24867b771ae0 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -89,6 +89,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, THP_ZERO_PAGE_ALLOC_FAILED, THP_SWPOUT, THP_SWPOUT_FALLBACK, + THP_SWPIN, + THP_SWPIN_FALLBACK, #endif #ifdef CONFIG_MEMORY_BALLOON BALLOON_INFLATE, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3bb2df7f5f84..c674deb643d6 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1723,8 +1723,10 @@ int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) /* swapoff occurs under us */ } else if (ret == -EINVAL) ret = 0; - else + else { + count_vm_event(THP_SWPIN_FALLBACK); goto fallback; + } } delayacct_clear_flag(DELAYACCT_PF_SWAPIN); goto out; diff --git a/mm/page_io.c b/mm/page_io.c index 5bdfd21c1bd9..4da5e2083893 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -348,6 +348,15 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, return ret; } +static inline void count_swpin_vm_event(struct page *page) +{ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + if (unlikely(PageTransHuge(page))) + count_vm_event(THP_SWPIN); +#endif + count_vm_events(PSWPIN, hpage_nr_pages(page)); +} + int swap_readpage(struct page *page, bool synchronous) { struct bio *bio; @@ -371,7 +380,7 @@ int swap_readpage(struct page *page, bool synchronous) ret = mapping->a_ops->readpage(swap_file, page); if (!ret) - count_vm_event(PSWPIN); + count_swpin_vm_event(page); return ret; } @@ -382,7 +391,7 @@ int swap_readpage(struct page *page, bool synchronous) unlock_page(page); } - count_vm_event(PSWPIN); + count_swpin_vm_event(page); return 0; } @@ -401,7 +410,7 @@ int swap_readpage(struct page *page, bool synchronous) get_task_struct(current); bio->bi_private = current; bio_set_op_attrs(bio, REQ_OP_READ, 0); - count_vm_event(PSWPIN); + count_swpin_vm_event(page); bio_get(bio); qc = submit_bio(bio); while (synchronous) { diff --git a/mm/vmstat.c b/mm/vmstat.c index 18de2ca87533..37638638b9bb 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1266,6 +1266,8 @@ const char * const vmstat_text[] = { "thp_zero_page_alloc_failed", "thp_swpout", "thp_swpout_fallback", + "thp_swpin", + "thp_swpin_fallback", #endif #ifdef CONFIG_MEMORY_BALLOON "balloon_inflate",