From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C87E8C282CE for ; Mon, 27 May 2019 07:06:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C4572075B for ; Mon, 27 May 2019 07:06:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C4572075B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1D3236B000C; Mon, 27 May 2019 03:06:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 185286B0266; Mon, 27 May 2019 03:06:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 073FF6B026B; Mon, 27 May 2019 03:06:33 -0400 (EDT) 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 C23B36B000C for ; Mon, 27 May 2019 03:06:32 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id r191so11166488pgr.23 for ; Mon, 27 May 2019 00:06:32 -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:references:date:in-reply-to:message-id:user-agent :mime-version; bh=IjvW+YkbvO27DjOQA+mjV2z6sA1MYUPuOhkrlDTmSj8=; b=qg3HKpLpE3yjvpaIJxm8k0V9kB9BGW7rjHNmkeh91ajpMo1vJ+4NvytOYL5dXNR5W+ SfGVGQ1oMHGk3VjeWF1OOlUVptpld9jjC0xF5cXACQFNckk6/o+MssWiT3cLU4DeUXFq nGETHueirkHVZzLftQYC8lF2bJGGqEYLaQafDhGaZ0Pgtdk4FWbWtxr9cJsblRCrW4KA Pn5uvCGkW2K9pFJeDb/R1C6g5jX/41s9m8HT9D6DHlhNZRIjnoih0ZI/SNUYBW7vQffA RCC3e0b5CxFb8brrmPBdY26/XHLJdfHlOh4DgSynLHEMELT92JYaSPdVnhLXKafA9uQ2 WMyg== 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: APjAAAUbQJav+RLi2U3X0WVZpGYFqXkbnG+TV1y4mcxXxlTab3dxRp1E wZuhEr8xPkySJqas6g3Zi65CH2D/gFbOkPFI1+9DRdEubzVmTRTON4h4hiCgKVrVqJEvfJ2s05C WoJwO3G2hBagwdbsGgD9VDi+Q6eoWwgJhCMe4+RRvOQEvS9r/hAppOsN0pRJzUO9RTA== X-Received: by 2002:a17:90a:35c8:: with SMTP id r66mr29341745pjb.17.1558940792387; Mon, 27 May 2019 00:06:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDRqDn0r+k6CflfYTJn2LYiBzRCFjzKzlVX5Sonlb6qnx3g5wiYnA2AGEt5F33K/VxxEQF X-Received: by 2002:a17:90a:35c8:: with SMTP id r66mr29341634pjb.17.1558940791496; Mon, 27 May 2019 00:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558940791; cv=none; d=google.com; s=arc-20160816; b=j0SVrop2aGVSIjj5e3SEs+2OWacuiAmJH12K7Oau2Uofx/axN5+NL6UZhiFYdWLrHY cMgAESA+szm8OySLwjEziSvSQX/v70EqtdcHv46vkPCdz4s0CXlsORsJqYPQN1H/4eBG JaPmc+IzNGnL4fqwjRJqTVoiPE+cyTlL6PvICpyTomYpDhQ0Yj98VIKgDZAUHsbCXzWR suGrMJg2j5VTQxI7fztpKojNqLYElEGEFyM2lZl4vDasecIFwW2WIhj0zTZ6IRtoY9AX SFR4gJbCupc9y1dxsV9xs2XBMKhARaws5SDXfVIVudpx2Hxvd/TaEGDGN29ouc+4faqj aTag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from; bh=IjvW+YkbvO27DjOQA+mjV2z6sA1MYUPuOhkrlDTmSj8=; b=RCVUptCSAGegGlvCGItCnXaa2ZJgNjmFd/sMjorYYFLMemN/91c6PdeOT6SxQsnv5b H5qpaVzPCG/xv6w1OASyik1wM+MWy5vRquhH4W320GUv43GZ5OdKyYYgrSPRoVFOHVO9 OfD21py6wRqr6xq7VPww5UDOjaNoejPc6yv39I+SZpVMryzhvsKAUx/NIQudc1mqJ8Tl j8TphoqCpe6Vwp/bkvkDCB32Ca0OEQvdfEaoa7R1J2rLm6TnHXu3KPhWDvLnSrNOMSAX rl0TZny0MfIraVy9RCXCn7YR/3CHxTGIffAEERgfHMg9iIC9WOxYoZFGqu42IQch5eF3 3OMw== 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 g17si16523521pgk.500.2019.05.27.00.06.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 May 2019 00:06:31 -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 orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 May 2019 00:06:30 -0700 X-ExtLoop1: 1 Received: from yhuang-dev.sh.intel.com (HELO yhuang-dev) ([10.239.159.29]) by orsmga005.jf.intel.com with ESMTP; 27 May 2019 00:06:28 -0700 From: "Huang\, Ying" To: Yang Shi Cc: , , , , , , , , , , Subject: Re: [v6 PATCH 2/2] mm: vmscan: correct some vmscan counters for THP swapout References: <1558929166-3363-1-git-send-email-yang.shi@linux.alibaba.com> <1558929166-3363-2-git-send-email-yang.shi@linux.alibaba.com> Date: Mon, 27 May 2019 15:06:27 +0800 In-Reply-To: <1558929166-3363-2-git-send-email-yang.shi@linux.alibaba.com> (Yang Shi's message of "Mon, 27 May 2019 11:52:46 +0800") Message-ID: <87ef4k8jgs.fsf@yhuang-dev.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii 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: Yang Shi writes: > Since commit bd4c82c22c36 ("mm, THP, swap: delay splitting THP after > swapped out"), THP can be swapped out in a whole. But, nr_reclaimed > and some other vm counters still get inc'ed by one even though a whole > THP (512 pages) gets swapped out. > > This doesn't make too much sense to memory reclaim. For example, direct > reclaim may just need reclaim SWAP_CLUSTER_MAX pages, reclaiming one THP > could fulfill it. But, if nr_reclaimed is not increased correctly, > direct reclaim may just waste time to reclaim more pages, > SWAP_CLUSTER_MAX * 512 pages in worst case. > > And, it may cause pgsteal_{kswapd|direct} is greater than > pgscan_{kswapd|direct}, like the below: > > pgsteal_kswapd 122933 > pgsteal_direct 26600225 > pgscan_kswapd 174153 > pgscan_direct 14678312 > > nr_reclaimed and nr_scanned must be fixed in parallel otherwise it would > break some page reclaim logic, e.g. > > vmpressure: this looks at the scanned/reclaimed ratio so it won't > change semantics as long as scanned & reclaimed are fixed in parallel. > > compaction/reclaim: compaction wants a certain number of physical pages > freed up before going back to compacting. > > kswapd priority raising: kswapd raises priority if we scan fewer pages > than the reclaim target (which itself is obviously expressed in order-0 > pages). As a result, kswapd can falsely raise its aggressiveness even > when it's making great progress. > > Other than nr_scanned and nr_reclaimed, some other counters, e.g. > pgactivate, nr_skipped, nr_ref_keep and nr_unmap_fail need to be fixed > too since they are user visible via cgroup, /proc/vmstat or trace > points, otherwise they would be underreported. > > When isolating pages from LRUs, nr_taken has been accounted in base > page, but nr_scanned and nr_skipped are still accounted in THP. It > doesn't make too much sense too since this may cause trace point > underreport the numbers as well. > > So accounting those counters in base page instead of accounting THP as > one page. > > nr_dirty, nr_unqueued_dirty, nr_congested and nr_writeback are used by > file cache, so they are not impacted by THP swap. > > This change may result in lower steal/scan ratio in some cases since > THP may get split during page reclaim, then a part of tail pages get > reclaimed instead of the whole 512 pages, but nr_scanned is accounted > by 512, particularly for direct reclaim. But, this should be not a > significant issue. > > Cc: "Huang, Ying" > Cc: Johannes Weiner > Cc: Michal Hocko > Cc: Mel Gorman > Cc: "Kirill A . Shutemov" > Cc: Hugh Dickins > Cc: Shakeel Butt > Cc: Hillf Danton > Signed-off-by: Yang Shi > --- > v6: Fixed the other double account issue introduced by v5 per Huang Ying > v5: Fixed sc->nr_scanned double accounting per Huang Ying > Added some comments to address the concern about premature OOM per Hillf Danton > v4: Fixed the comments from Johannes and Huang Ying > v3: Removed Shakeel's Reviewed-by since the patch has been changed significantly > Switched back to use compound_order per Matthew > Fixed more counters per Johannes > v2: Added Shakeel's Reviewed-by > Use hpage_nr_pages instead of compound_order per Huang Ying and William Kucharski > > mm/vmscan.c | 47 +++++++++++++++++++++++++++++++++++------------ > 1 file changed, 35 insertions(+), 12 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index b65bc50..378edff 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1118,6 +1118,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, > int may_enter_fs; > enum page_references references = PAGEREF_RECLAIM_CLEAN; > bool dirty, writeback; > + unsigned int nr_pages; > > cond_resched(); > > @@ -1129,7 +1130,10 @@ static unsigned long shrink_page_list(struct list_head *page_list, > > VM_BUG_ON_PAGE(PageActive(page), page); > > - sc->nr_scanned++; > + nr_pages = 1 << compound_order(page); > + > + /* Account the number of base pages even though THP */ > + sc->nr_scanned += nr_pages; > > if (unlikely(!page_evictable(page))) > goto activate_locked; > @@ -1250,7 +1254,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, > case PAGEREF_ACTIVATE: > goto activate_locked; > case PAGEREF_KEEP: > - stat->nr_ref_keep++; > + stat->nr_ref_keep += nr_pages; > goto keep_locked; > case PAGEREF_RECLAIM: > case PAGEREF_RECLAIM_CLEAN: > @@ -1306,6 +1310,15 @@ static unsigned long shrink_page_list(struct list_head *page_list, > } > > /* > + * THP may get split above, need minus tail pages and update > + * nr_pages to avoid accounting tail pages twice. > + */ > + if ((nr_pages > 1) && !PageTransHuge(page)) { > + sc->nr_scanned -= (nr_pages - 1); > + nr_pages = 1; > + } After checking the code again, it appears there's another hole in the code. In the following code snippet. if (!add_to_swap(page)) { if (!PageTransHuge(page)) goto activate_locked; /* Fallback to swap normal pages */ if (split_huge_page_to_list(page, page_list)) goto activate_locked; #ifdef CONFIG_TRANSPARENT_HUGEPAGE count_vm_event(THP_SWPOUT_FALLBACK); #endif if (!add_to_swap(page)) goto activate_locked; } If the THP is split, but the first or the second add_to_swap() fails, we still need to deal with sc->nr_scanned and nr_pages. How about add a new label before "activate_locked" to deal with that? Best Regards, Huang, Ying