From patchwork Wed Oct 10 07:19:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10634113 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 3ACD113AD for ; Wed, 10 Oct 2018 07:27:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 111E4294F6 for ; Wed, 10 Oct 2018 07:27:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 056AE296AF; Wed, 10 Oct 2018 07:27:40 +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 67F78294F6 for ; Wed, 10 Oct 2018 07:27:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 81DD76B000E; Wed, 10 Oct 2018 03:27:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7A27A6B0266; Wed, 10 Oct 2018 03:27:18 -0400 (EDT) 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 6BF5A6B026A; Wed, 10 Oct 2018 03:27:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 1D4FC6B000E for ; Wed, 10 Oct 2018 03:27:18 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id e24-v6so3025347pga.16 for ; Wed, 10 Oct 2018 00:27:18 -0700 (PDT) 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=xENK5JuD3T4p9vZlZcLFjnr3ZVhqcoc/izsg1VPR/kw=; b=sLaZqaV84la+1qLI1mVxqSES5oS2JM+j/S26JxfQJjWvlc6hsDoYhXQ0NfU2T0/z/P 0ktWPqzUMzig4ekHnMbVznQjAOOJVMtUlbk5TzEebNS3AU4CDq1x6evwpkLYGUFSgBbu 75Ye7/5UhxPhsLW0ipIgal6iSwPVcez6Ar/ehq3YB92pD/tntgRzMd9QUZ6fAioWca4J NR1WcB72w+JqatnyMm2ZYzLGOacMbVI9lnqPHTBrYJWeOlEYHnWuyE5QIL2gwnHGKbPn gQYSWOgeFcr/Nig2slXVPZFaG84Wa8mfjlLyd1AA91gBf1/cl8qx3mSGDs0zkJk5xyzM TLDQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 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: ABuFfogXPEps7rQd32jMp9DXrTVDi4t6HNfcmiD7SJwLF1NAYOj9HD7g COOd/75xtadSQl/hwd5U2lW+Koq6TjSd58SMGLXKCNGvKjJHlBGdwqYNCYaDyOOV4X4nQalteyP 7+uD6u2yQZabPNgs4e2F+j9CJeKKypLz4H/Wr0EG4pG8oXWqAJKF/jsLnF7IAsmLeew== X-Received: by 2002:a63:ef0b:: with SMTP id u11-v6mr28782168pgh.283.1539156437800; Wed, 10 Oct 2018 00:27:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV639c1keYqNnBRUDzPA7QL8Gp/mQqVDrsWnzeNaWHRA/GdiW+DFxW0KhxqC7mEVKXIFuJ60S X-Received: by 2002:a63:ef0b:: with SMTP id u11-v6mr28782127pgh.283.1539156436989; Wed, 10 Oct 2018 00:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539156436; cv=none; d=google.com; s=arc-20160816; b=bIq5BnDAa1yB3/4+po8ymrSK1b3q90zJcB51LuiTV0XxIwjbGcioX+whQkVxSrMYSz 1Ne4GNTmAFHXSIaBfBsUiOurJEZg237CvaWIxrWuVumBPJTaeUpctJaRR4V4GT47n74H YacrdLx+L+CFUt6bIWiz+8cbJ4z7yKJbuqAjmyzL2SVOAleEnmCmJBkoD9yRE25Dd3V1 u9HCCVmgCZ99vqBuHB8yTVWE2ftTV/UrIrCdW0pkdRPvwkJVr5pz4345q2vGeIi6w7Zk l4AAaOTNXEPW9mX01wVIjyyQkbpvyZjUvMd2c+NxbrwaS2qqryuCXrHmAea50ZvgDYh2 HblQ== 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=xENK5JuD3T4p9vZlZcLFjnr3ZVhqcoc/izsg1VPR/kw=; b=Ml+gIInSJZaN5v944QWRwYuc+of6etJfXISYjOBQJdrYInFDAwugmpG9Q5Uxtsw6s7 NOQG2/EvCmECWBVMOcK77QiYJapTN2TNUZ120lw403TABQkMG851qQFl0Uvw0mcF2qgV UxHGaBQsrKw0Om7KHu80vnFBXTHCOa1ASMbnnvyn5F75S8VbTwMdCmFlqF2nAmYkDb7+ MJErv3x5HZgwxcnQ0BcLRc4q5iOYq74K0uiplWKUoAj2/I9Nm8HnnvkyJmz4YGjU7on3 nnANNbT0dX22legL1IG+sIkyRCaf1tVcdwp6ReuTawcZlaWFrxfPJcG6VfdLpA8Tv6X1 TFow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga17.intel.com (mga17.intel.com. [192.55.52.151]) by mx.google.com with ESMTPS id j4-v6si22942674pga.152.2018.10.10.00.27.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Oct 2018 00:27:16 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) client-ip=192.55.52.151; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 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 fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Oct 2018 00:27:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,363,1534834800"; d="scan'208";a="93870015" Received: from yhuang-mobile.sh.intel.com ([10.239.198.87]) by fmsmga002.fm.intel.com with ESMTP; 10 Oct 2018 00:19:21 -0700 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 -V6 10/21] swap: Support to count THP swapin and its fallback Date: Wed, 10 Oct 2018 15:19:13 +0800 Message-Id: <20181010071924.18767-11-ying.huang@intel.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181010071924.18767-1-ying.huang@intel.com> References: <20181010071924.18767-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 47a3441cf4c4..c20b655cfdcc 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -88,6 +88,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 fbc9c9e30992..8efcc84fb4b0 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1715,8 +1715,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 573d3663d846..bcc2da750590 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 d08ed044759d..823856fae136 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1264,6 +1264,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",