From patchwork Fri Jun 22 03:51:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10481151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91D0860532 for ; Fri, 22 Jun 2018 03:55:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 839C228F91 for ; Fri, 22 Jun 2018 03:55:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7840428F98; Fri, 22 Jun 2018 03:55:51 +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 CFB4E28F94 for ; Fri, 22 Jun 2018 03:55:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D0DF6B026F; Thu, 21 Jun 2018 23:55:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 27F056B0271; Thu, 21 Jun 2018 23:55:39 -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 0FA156B0272; Thu, 21 Jun 2018 23:55:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id AE9796B0271 for ; Thu, 21 Jun 2018 23:55:38 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id 70-v6so2966518plc.1 for ; Thu, 21 Jun 2018 20:55:38 -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=7W/gjDPilR7o52DkKxrS6wTt1nuXq1TogMgCxHF5e9A=; b=fY40t4kjXVHz8T6rVm2aWozPpGj/3+pwjU5HqEUK9lzLafVcfEd2QyT3J3uOq6uAiW 7qcUGomm2/3qm5e7T2Gnj6XlKa/x0TaUBtSp9Oba7A2gD9wJBsbl4Lv4etF/4GJx+C6L Jh7N5GZfH/3I0mHEG5ExcGduSmivv9Dzu78uJ0qjsoQskd9hdeVedeu3YeLZ7TG54wiE DZo6JV4ohqCUJwK2V8lpM2Hk0AXk0lwit6akudjdvzCDZlKSjRz4M6AA5rYEmR4O0xVT ixdzR1YzxHqkyEIktC9BiP8UmLS7Qi/6IM2VPnbMjFkA6gisRpKiSqZBxjsRDqRekLea TraQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 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: APt69E3OyhDmHblj3gTqn6F4L+tIBGr1E8ouAKW1FXPIZBTV5/PAggfP yHS6z78HmJ37SDlT4BntjZLtGMmg97C3nTTmmiMq8eF4ikcHeMCXUYP735S9w2cW/W5hd3Q408t kej38iTqXdNukazpNPcZuOcF1LMIqubLPGX0dFYCf1WYBoyA0NGFbWFInPDWTQTfmBQ== X-Received: by 2002:a62:d9c5:: with SMTP id b66-v6mr30096871pfl.41.1529639738375; Thu, 21 Jun 2018 20:55:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLAgq/mxMb+BKRctCnbg2ymAOTNK+D+ZGteWqVPWSYarfk8dLGW2gQTzMj0WREdmuD4XMqG X-Received: by 2002:a62:d9c5:: with SMTP id b66-v6mr30096830pfl.41.1529639737289; Thu, 21 Jun 2018 20:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529639737; cv=none; d=google.com; s=arc-20160816; b=Kt+R+qM7ku7bdLiJyxaL7BnUo9q3tD0yRtlmRhLZd7MLpa9fHnlE3W+0DVdGy1t8bT sF74KbfNdIKCbzd0A59ec33TprCNjzvmODkzM+02C71NMLkd8b0BMI4JazuzNL1LfGoP 6mNcP8TQ2c1u4iSkmqLXAqaskPUOnEKIb8DUg+4RQt34xnrnfHwyD7hOGgySi2KP3HgM z1/2d2ZdLb6LpoeXMdw0AqwU6BaN+FCnSJiIkFq4ftkoEDrvlY16mrP8iCyjLM0vWqSa onA/z1/LJ3afVLeKYUSEvEhPGSex9eVEH02VpL4cZ8QIPIIOpnKLNB9cQ+t9Sv6yGglG 5ihg== 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 :arc-authentication-results; bh=7W/gjDPilR7o52DkKxrS6wTt1nuXq1TogMgCxHF5e9A=; b=iDCywT5aofFatfZrXLJycxK2Fx41xozhCiLB6budZnRll2UWu/eiJEVhDRKNj10bLq qcqTQNXceVX3dCIyOhEimHnojG9pXUSrMp5i9XIIG2zR1FyX2Bdtukpwhq0dZJa0pmwY dfGMnT/jf8sMrTMxs3TyepYgZSR5bSeAys5FAR/e1Rv/1q9zoPArgF+tmUio9DgEi67R oBG0H6tJdN1xKze1FoV1/teslYo1at0hA4LSPEJ1eqGzqnE6nhqml91BMuoSyyDqfoeZ zrY29KzbvlU62s65K9V80IzQYG21E4ifJYtYOemdepep6Y2dPJ2UI/Dtw6oWtyfoGT0e tqCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id n61-v6si6160066plb.256.2018.06.21.20.55.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 20:55:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 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 fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jun 2018 20:55:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,255,1526367600"; d="scan'208";a="65335146" Received: from wanpingl-mobl.ccr.corp.intel.com (HELO yhuang6-ux31a.ccr.corp.intel.com) ([10.254.212.200]) by fmsmga004.fm.intel.com with ESMTP; 21 Jun 2018 20:55:33 -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 -mm -v4 10/21] mm, THP, swap: Support to count THP swapin and its fallback Date: Fri, 22 Jun 2018 11:51:40 +0800 Message-Id: <20180622035151.6676-11-ying.huang@intel.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180622035151.6676-1-ying.huang@intel.com> References: <20180622035151.6676-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 From: Huang Ying 2 new /proc/vmstat fields are added, "thp_swapin" and "thp_swapin_fallback" to count swapin a THP from swap device as a whole 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 5c7f010676a7..7b438548a78e 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 ac79ae2ab257..8d49a11e83ee 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1664,8 +1664,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 b41cf9644585..96277058681e 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -347,6 +347,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; @@ -370,7 +379,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; } @@ -381,7 +390,7 @@ int swap_readpage(struct page *page, bool synchronous) unlock_page(page); } - count_vm_event(PSWPIN); + count_swpin_vm_event(page); return 0; } @@ -400,7 +409,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 75eda9c2b260..259c7bddbb6e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1263,6 +1263,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",