From patchwork Mon Oct 5 02:40:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chinwen Chang X-Patchwork-Id: 11816043 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F19496CA for ; Mon, 5 Oct 2020 02:40:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 97E822072D for ; Mon, 5 Oct 2020 02:40:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="tc+mYSo0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97E822072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8DD1A6B006C; Sun, 4 Oct 2020 22:40:58 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 867276B006E; Sun, 4 Oct 2020 22:40:58 -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 732AF8E0001; Sun, 4 Oct 2020 22:40:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0125.hostedemail.com [216.40.44.125]) by kanga.kvack.org (Postfix) with ESMTP id 3F7D66B006C for ; Sun, 4 Oct 2020 22:40:58 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D21DD1EE6 for ; Mon, 5 Oct 2020 02:40:57 +0000 (UTC) X-FDA: 77336319354.17.frogs49_6211582271ba Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id B7719180D0180 for ; Mon, 5 Oct 2020 02:40:57 +0000 (UTC) X-Spam-Summary: 1,0,0,d954fb5486009634,d41d8cd98f00b204,chinwen.chang@mediatek.com,,RULES_HIT:41:355:379:541:800:960:967:973:988:989:1185:1260:1277:1311:1313:1314:1345:1359:1437:1514:1515:1516:1518:1535:1542:1585:1711:1730:1747:1777:1792:2198:2199:2393:2525:2559:2563:2682:2685:2693:2730:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:5007:6119:6261:6653:7875:7903:8957:9025:10004:10400:11026:11232:11473:11658:11914:12043:12291:12296:12297:12438:12521:12555:12683:12895:13255:14181:14394:14721:14877:21080:21365:21451:21627:21990:30003:30054:30070,0,RBL:210.61.82.183:@mediatek.com:.lbl8.mailshell.net-64.100.201.201 62.2.12.100;04ygmhuggu3m8cziwih1ymur4t7omyct6qodoh669o71wo34w3mwgmayqk4csud.a1crsytrfmorb514etwyzgy9yx43cyorww3pm4fyfg8bjtofyx86f5xnk9rcyyw.6-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bu lk,SPF:f X-HE-Tag: frogs49_6211582271ba X-Filterd-Recvd-Size: 6237 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Mon, 5 Oct 2020 02:40:56 +0000 (UTC) X-UUID: 8edc94a3deff432897a72c530d90ee78-20201005 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=qKVKEW5yKCrYo9cZixFWjhvNVCK6HhWdz53vb9XF6gs=; b=tc+mYSo0tX+KgHcbH9zbEM1Bqa2lXXpGTFVqupsgOTe9VGPeI8Kc77LiMpESRd3nkvfT/rGmz/mg4w/z5a7XhVVEAco6bgjBhu/WueIHSyyCxXusfL8YBaSFK40K+6opqON5qjdcXB+NLv4qx8iP7bGV0vVSO3kl3claldhyTzU=; X-UUID: 8edc94a3deff432897a72c530d90ee78-20201005 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 728767042; Mon, 05 Oct 2020 10:40:50 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Oct 2020 10:40:42 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Oct 2020 10:40:42 +0800 From: Chinwen Chang To: Andrew Morton CC: , , Chinwen Chang , Michel Lespinasse Subject: [RESEND, PATCH v4 2/3] mm: smaps*: extend smap_gather_stats to support specified beginning Date: Mon, 5 Oct 2020 10:40:13 +0800 Message-ID: <1601865614-4918-3-git-send-email-chinwen.chang@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1601865614-4918-1-git-send-email-chinwen.chang@mediatek.com> References: <1601865614-4918-1-git-send-email-chinwen.chang@mediatek.com> MIME-Version: 1.0 X-MTK: N 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: Extend smap_gather_stats to support indicated beginning address at which it should start gathering. To achieve the goal, we add a new parameter @start assigned by the caller and try to refactor it for simplicity. If @start is 0, it will use the range of @vma for gathering. Change since v2: - This is a new change to make the retry behavior of smaps_rollup - more complete as suggested by Michel [1] [1] https://lore.kernel.org/lkml/CANN689FtCsC71cjAjs0GPspOhgo_HRj+diWsoU1wr98YPktgWg@mail.gmail.com/ Change-Id: I8652e0ee6c5e93fb56376a68d71ed6cdd8ac10e8 Signed-off-by: Chinwen Chang CC: Michel Lespinasse Reviewed-by: Steven Price --- fs/proc/task_mmu.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index dbda449..76e623a 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -723,9 +723,21 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask, .pte_hole = smaps_pte_hole, }; +/* + * Gather mem stats from @vma with the indicated beginning + * address @start, and keep them in @mss. + * + * Use vm_start of @vma as the beginning address if @start is 0. + */ static void smap_gather_stats(struct vm_area_struct *vma, - struct mem_size_stats *mss) + struct mem_size_stats *mss, unsigned long start) { + const struct mm_walk_ops *ops = &smaps_walk_ops; + + /* Invalid start */ + if (start >= vma->vm_end) + return; + #ifdef CONFIG_SHMEM /* In case of smaps_rollup, reset the value from previous vma */ mss->check_shmem_swap = false; @@ -742,18 +754,20 @@ static void smap_gather_stats(struct vm_area_struct *vma, */ unsigned long shmem_swapped = shmem_swap_usage(vma); - if (!shmem_swapped || (vma->vm_flags & VM_SHARED) || - !(vma->vm_flags & VM_WRITE)) { + if (!start && (!shmem_swapped || (vma->vm_flags & VM_SHARED) || + !(vma->vm_flags & VM_WRITE))) { mss->swap += shmem_swapped; } else { mss->check_shmem_swap = true; - walk_page_vma(vma, &smaps_shmem_walk_ops, mss); - return; + ops = &smaps_shmem_walk_ops; } } #endif /* mmap_lock is held in m_start */ - walk_page_vma(vma, &smaps_walk_ops, mss); + if (!start) + walk_page_vma(vma, ops, mss); + else + walk_page_range(vma->vm_mm, start, vma->vm_end, ops, mss); } #define SEQ_PUT_DEC(str, val) \ @@ -805,7 +819,7 @@ static int show_smap(struct seq_file *m, void *v) memset(&mss, 0, sizeof(mss)); - smap_gather_stats(vma, &mss); + smap_gather_stats(vma, &mss, 0); show_map_vma(m, vma); @@ -854,7 +868,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v) hold_task_mempolicy(priv); for (vma = priv->mm->mmap; vma; vma = vma->vm_next) { - smap_gather_stats(vma, &mss); + smap_gather_stats(vma, &mss, 0); last_vma_end = vma->vm_end; }