From patchwork Tue Nov 20 08:54:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10690001 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 CC4BD13BB for ; Tue, 20 Nov 2018 08:55:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDF9D2991D for ; Tue, 20 Nov 2018 08:55:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B25AE29A1B; Tue, 20 Nov 2018 08:55:34 +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 19BAF2991D for ; Tue, 20 Nov 2018 08:55:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C09E66B1F3B; Tue, 20 Nov 2018 03:55:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B97416B1F3D; Tue, 20 Nov 2018 03:55:25 -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 AA8EF6B1F3E; Tue, 20 Nov 2018 03:55:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 6B8406B1F3B for ; Tue, 20 Nov 2018 03:55:25 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id 143so861224pgc.3 for ; Tue, 20 Nov 2018 00:55:25 -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=J/davdIr9aFJVTfezpF/Y/QLdXdVJX1ZEu2mHZJ8AaQ=; b=eJA0zX9cSzcUyo5YPP8nPG5VFudyRhxd6ap3JY59uiNwnsrsZrMPDFmO48tJo24OWC axAKDBP3omEQLRX8HbdWKApqHrEhEmm1KYK18muO//eARJRt9SDCCDo00iMppbBtPIUs Dt250YGq1SkxeGV8a0KmaxDE7lyDPx5y91Nd4s014hm2jaURrozAsqi6/Ry5iTF9c8Zp Q0gbdyWzPMoEtXwqMs1bVZiFXujEGWhdyYhGZHrNVC8InFY8teJhBmhlBENr13pFTkJr PsIYiIMxZjEY8HbxkB35LYerAd+2zcNSDVQJXHlpaUxpm0spsIxoEnfm0DvDvE2ZCxpz p9xw== 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: AA+aEWYEii7ZydJqs4i0nF4eM2C9eT9aokXIklmBgZL7szdBb9gVaO8G gb0gfaDvlTkQKV8Mqy9Q5zsUtLEMJKrA6LfTmuu/L19+8q+EEwvMDufQcUzSyh12csTZ632rruP 54K4w/fVFctvZUdv/0pX4fjgXh+WyQ3CGGIBpxsSS8CNK7f4PHZ68t/tf53lfylfeyQ== X-Received: by 2002:a17:902:714c:: with SMTP id u12mr1324144plm.234.1542704125104; Tue, 20 Nov 2018 00:55:25 -0800 (PST) X-Google-Smtp-Source: AFSGD/Wamcm/JOR2E1pd/+C0xyLIW0JhICA0fpqq/u2XabTZRwFSozJvrOoj4rJOHG6gRaNyS3nT X-Received: by 2002:a17:902:714c:: with SMTP id u12mr1324075plm.234.1542704123970; Tue, 20 Nov 2018 00:55:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542704123; cv=none; d=google.com; s=arc-20160816; b=KX683F9WWAzsRrg0nRrJCycsgIzuIXiZb9gq792ZDQ2pHfmWAHTuNM3+2rHowIwwbC O5HKC9XaW3f6YAV7bXiRl3D26Nv4UKGUO1VCtyYgnq/7325GS72++7OtIZ53JS4qmTjg Do9J85vXTNhMeiPnXGOzHNY6txjx5tf82fpzcMEvwTGelkGDomVwgNZVg87SCixIKyj2 CVHYyjOv0Ti6CSJUR0JApNl6/OrTAtd62V73bXDtLnH2W6XYcC1/MBHBaFmCdurb1vhE GsPO33kFojd521FUJMuHwq7Kkf6Xw8PYhfGCZO0czKmTyPI6oqrP0IcxMIwYLAabN3aW GJiw== 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=J/davdIr9aFJVTfezpF/Y/QLdXdVJX1ZEu2mHZJ8AaQ=; b=NVM7qPQVJdvXx8T70HRS1cuGTlfvZS0rC9dkJGmSazUMk/wqTIDD/2asdq8CyeJAMK YVPrkG5om3vXYSjUrshJI5B0OJhslGA565ieZEzLkVBBMfLpQgDAJmIp/IrjC58h76Qb ZqoWMi9xBLLh+EixxbALtf8FWXB7Zsm7zWx7UJ0GbJqazitEQ7SGJQeP46ybUr3wiAuq E0hFD2yfr1K6JMAnLEAB18QtBGkThX26xwT4QxnAdQ+AqIaqn6IyAabeFBZBm4NVyDVH UWAGPYecW7bjfvYe4KtOPmw/mVIlZF3eCw311/zFDO+f9sPo7VHJYn6bfr/A4fajLIEv x2LQ== 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 b15si24149550plm.431.2018.11.20.00.55.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 00:55:23 -0800 (PST) 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 fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 00:55:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,256,1539673200"; d="scan'208";a="106105838" Received: from yhuang-mobile.sh.intel.com ([10.239.197.245]) by fmsmga002.fm.intel.com with ESMTP; 20 Nov 2018 00:55:20 -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 -V7 RESEND 10/21] swap: Support to count THP swapin and its fallback Date: Tue, 20 Nov 2018 16:54:38 +0800 Message-Id: <20181120085449.5542-11-ying.huang@intel.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181120085449.5542-1-ying.huang@intel.com> References: <20181120085449.5542-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 561f3fb3d888..d3ee25ffeaaf 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1724,8 +1724,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 d4d1c89bcddd..8fd1f3ef83c4 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 83b30edc2f7f..80a731e9a5e5 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1265,6 +1265,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",