From patchwork Wed May 23 08:26:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10420599 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 BD2A460327 for ; Wed, 23 May 2018 08:27:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFA0A28E3F for ; Wed, 23 May 2018 08:27:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A42B628E5F; Wed, 23 May 2018 08:27:07 +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 1544D28E3F for ; Wed, 23 May 2018 08:27:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 102E16B026A; Wed, 23 May 2018 04:27:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 08ECC6B026B; Wed, 23 May 2018 04:27:00 -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 E95336B026C; Wed, 23 May 2018 04:26:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id A9CC86B026A for ; Wed, 23 May 2018 04:26:59 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id h15-v6so2125822pgv.7 for ; Wed, 23 May 2018 01:26:59 -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=oCqUxNfBvjsfmkTYQ8uj+iEGnlh/pJUIEEspQhZPr7o=; b=MqdRin/6ZDr1NC5PCv7OF6DbGO9d/MXj0dzntCeoJS154oT9IKVLHxZFfUNxJPy55x V9iFB3N+ECi4QwRQ5FzVcSG4EiKIOh/4yvUWhc+424j1SzAd8eDh6d6tAJpWhRqn8nPr k8gGeiCxunx6fi5CMZZpPkwd269O/926cbjks4+47eZ6CHaOPaGuKcsi8Khwvc1uWlLe Oc+YhHT5alp8ovovrr+Z13DE3lk1MpP8jAt31MGpnyfaUbPTCHh7Eb1brMp7tmdR1wLV YGIpWrFdjoUtSlZQC9/GlVwb3CEpQceLCDod8VIY5787nIBlI4T6aEUFy7xojWqnYXbI Wz8g== 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: ALKqPwde2sp9WlH+Izw1yaRJTzEUtcWMtDbmJdN5+Sz7+A2TJXhcwlPP JM3nSdyaPBlZQW3hTX5xXsUSo5FJaJV5BnlwvgOG2t1vGxMCs/DE11sKMZzMujI9pXKQe35Q6TY Wc1vrtkazcvn5bTAW5MC64AmA7Asijy5pAlS7X292rgZamT9IqXD36FXNsPt4m3ifDg== X-Received: by 2002:a62:2197:: with SMTP id o23-v6mr1953138pfj.202.1527064019372; Wed, 23 May 2018 01:26:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZptnJj3l3LusWz4M8cNcp1gMxhds91onsqLh1gDStu5cQrTfdwgK3qh/ag5PKTRGXBe2mJN X-Received: by 2002:a62:2197:: with SMTP id o23-v6mr1953089pfj.202.1527064018587; Wed, 23 May 2018 01:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527064018; cv=none; d=google.com; s=arc-20160816; b=ngbxouR0lcic8ECC2gzHicnsuiJU9UyT9R0SXKJlDDQe68CIQREhhf/JLOIE3FakKM vcMSaKcPSN7d+sKUJrHLHDcLiXeAeK2zWMpEvug6I3+6bxtJp+jnKx3NyDa7TWzNeYYP l1OfWouMO2J6xo3n1w8Mr+QaWTYgHNBRtW/36VgsySuP9MsI7ZNGHuKw3bKZympWK7/T 5hmQeR2A9oEOPQpQZx6bOhUfk6y7tHciY4ERpvS5JrJdydRyTniGiBfEhznVYTxMObNs ch3Yv1ZqsvNInB9fcqj2NLcB+BQ0UvaJ1GJDtiCfMqr+k4l03sev/QWZSRLwEUU0e0jP uIQA== 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=oCqUxNfBvjsfmkTYQ8uj+iEGnlh/pJUIEEspQhZPr7o=; b=CbFnzTxFeWCBc9eEKdz6oNxe7kZ3KfY1OA43RubTnGF+qiyGQ8BzilxTm/Pvg8smet DRPf7cX/FnEj8VpOzar7VZJ6qx+JGt8RZcpPRQSuqRUvfkOmqdvONcN5WQP5Gew8vqz/ ciblpHxmOwpKeWt1KwKVAyz5AWAIQI4EbttcuFG2VCeo12GV1EYJ08DIz5rwjDiDzxKJ /6rmTlO7dWr/KqBUeFH6SgzDuHmY7Nu/JHjTmKLsRddlkDjiOKHVd+4lQlcVtZFT/z4D yi+qbdDpx+Hqnj9znqbCCIVb9g81hYix9FEjDVFdQnUb70b4Lkm4AZn5Xcl1Ier5iBea 84rQ== 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 y16-v6si17687140pfm.140.2018.05.23.01.26.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 01:26:58 -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 fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2018 01:26:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,432,1520924400"; d="scan'208";a="57726089" Received: from yhuang6-ux31a.sh.intel.com ([10.239.197.97]) by fmsmga001.fm.intel.com with ESMTP; 23 May 2018 01:26:55 -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 Subject: [PATCH -mm -V3 10/21] mm, THP, swap: Support to count THP swapin and its fallback Date: Wed, 23 May 2018 16:26:14 +0800 Message-Id: <20180523082625.6897-11-ying.huang@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180523082625.6897-1-ying.huang@intel.com> References: <20180523082625.6897-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 --- Documentation/vm/transhuge.rst | 10 +++++++++- include/linux/vm_event_item.h | 2 ++ mm/huge_memory.c | 4 +++- mm/page_io.c | 15 ++++++++++++--- mm/vmstat.c | 2 ++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Documentation/vm/transhuge.rst b/Documentation/vm/transhuge.rst index 2c6867fca6ff..a87b1d880cd4 100644 --- a/Documentation/vm/transhuge.rst +++ b/Documentation/vm/transhuge.rst @@ -360,10 +360,18 @@ thp_swpout piece without splitting. thp_swpout_fallback - is incremented if a huge page has to be split before swapout. + is incremented if a huge page is split before swapout. 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 is 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 8303fa021c42..c2437914c632 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",