From patchwork Tue Sep 25 07:13:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10613513 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 5FDBD13A4 for ; Tue, 25 Sep 2018 07:14:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E9AC29B12 for ; Tue, 25 Sep 2018 07:14:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42A5E29B17; Tue, 25 Sep 2018 07:14:12 +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 A4A0429B12 for ; Tue, 25 Sep 2018 07:14:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BAEA8E0071; Tue, 25 Sep 2018 03:14:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 565DE8E0041; Tue, 25 Sep 2018 03:14:06 -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 30A898E0041; Tue, 25 Sep 2018 03:14:06 -0400 (EDT) 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 CCF758E0071 for ; Tue, 25 Sep 2018 03:14:05 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id a18-v6so4950150pgn.10 for ; Tue, 25 Sep 2018 00:14:05 -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=bQwc5LHjLrIPFspSOc5bf5zi7g6qnAKVnaHAPyQPGZw=; b=LyQBfgVRNW19HUMfybHgoK+LfqCVn29RuGhshpY5XhFPNCDkmlBxr8tCK7Xp9PPZuE UPZYM9B/P9c+WtKR+ysbHeN/+ybA5oCwS7HvOiJG2tyDaCZzwLzbHZBh3+DpHDU4i3MW YV7s5ap8zBQdrTZ3cURxtGs7oZtlnmYehr3kbskWePIDODvEUJAfDJoNZhMZDSL6Iqhp w2e/Drkew/iL4WvuqgGBiL8KN4u7nPAocc7VNuCfaTCTjK8FlcgUihxy4SqCIc7jhrpF Bdgtr5n6QET1U3em7Ks53GiPS2IqQ9Mvof7to4IfKQFsChw+vW0F8hyMcesNPXQQ9aJG 0MCA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.20 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: ABuFfohQxwNP2w1vGHPedjaY9Nuc6KM55uCwRw3O3N1F36fpOLBt7y0b yRahZnFVg7L5rTSN4DI2rib2oP5Rmt5s9Dz8i9yaQVNcHGdMOjD69ts4ELYD+mmQzc1fOcETmB+ t0zYZwqR24+SAS+QQ7MfguCuJwX+pwPDWitlmxpI6Il9dVsitz48jRJMjHfKKxmOR4Q== X-Received: by 2002:a63:9246:: with SMTP id s6-v6mr1999315pgn.141.1537859645504; Tue, 25 Sep 2018 00:14:05 -0700 (PDT) X-Google-Smtp-Source: ACcGV6369inE2orEVgPAs+wxrqgCt3rhf7XkaO4cbpG2FYEQ6MsgzNoXU+fvw0C7r2WCDsrbFmRw X-Received: by 2002:a63:9246:: with SMTP id s6-v6mr1999269pgn.141.1537859644728; Tue, 25 Sep 2018 00:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537859644; cv=none; d=google.com; s=arc-20160816; b=XlrVX8hAralP6eDf5u1lHVSkRVo2GOq/mRgmNLpZ8AMIwWbzvgc9EDG03yfESfpaVR SlqaxDUYwHtUSmKCFgB+mY3LtUNYuxNxQ80VK9gdznwXVhyai7rx+dDbANDFSkDXAxrp MmPmV7LvYdNWFLa1Be7ZwfM47Jr3perALVC+40uTXjn8q39iONYqCw8jFW9UH+xclIh2 rh/PErzym7pBZwLJddxgr1ZMjsu/urCuit+YFt38t3wOOS53HaMf3Hzk8JJG9F9EUgCS Q5lEEnmLoSgDj1eMM9IzoBQ5GDqrI+hSb3N+tXjJRznMA9CEQTcFB9XLrDGsY7IQozMt /QGw== 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=bQwc5LHjLrIPFspSOc5bf5zi7g6qnAKVnaHAPyQPGZw=; b=gP5kv4xSp8KsILgNL1MJTsXfM9FP96JRllU0sal+BGDhgVcLY3PaThQIIttKW8b8od OB6dNu/HOqP+H6AQYDwSBDb7YVE8E5axIIe24MiYTyuGLrsi4rGrdU18VG6GmNGDZ+aI gg91BnTYquFM+GD5Howl9CtTEcEfsMOtbhmGZuvGkZS02lZX/Oz+bNsye5PTWczjq5Yl w7v/ox5zWDKrtQbDkSQOb+wzUC41jSJ9HttuBlE6r7Tw0tgnDkzf7Dy21jBXe4ji7Swg J+8vWUeA2uH2I0wBWF9TWPHSYrrvoQzaBKPYI3E3a+7nRaiz6TeEDtbz7VIqRHBAqq5c t8kw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id z127-v6si1787028pgb.455.2018.09.25.00.14.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 00:14:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.20 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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2018 00:14:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,301,1534834800"; d="scan'208";a="89093568" Received: from yhuang-mobile.sh.intel.com ([10.239.198.87]) by fmsmga002.fm.intel.com with ESMTP; 25 Sep 2018 00:13:56 -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 -V5 RESEND 10/21] swap: Support to count THP swapin and its fallback Date: Tue, 25 Sep 2018 15:13:37 +0800 Message-Id: <20180925071348.31458-11-ying.huang@intel.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180925071348.31458-1-ying.huang@intel.com> References: <20180925071348.31458-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 747879cd0e90..6f8676d6cba0 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1668,8 +1668,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 aafd19ec1db4..362254b99955 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 e3fb28d2c923..b954131d9e28 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",