From patchwork Mon Jul 23 11:19:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 10539999 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 9800490E3 for ; Mon, 23 Jul 2018 11:19:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84D5228600 for ; Mon, 23 Jul 2018 11:19:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7894F28609; Mon, 23 Jul 2018 11:19:59 +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=unavailable 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 11D3A28608 for ; Mon, 23 Jul 2018 11:19:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96B5A6B0007; Mon, 23 Jul 2018 07:19:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 746436B0266; Mon, 23 Jul 2018 07:19:53 -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 598676B000A; Mon, 23 Jul 2018 07:19:53 -0400 (EDT) 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 EDFC06B0008 for ; Mon, 23 Jul 2018 07:19:52 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id j4-v6so136562pgq.16 for ; Mon, 23 Jul 2018 04:19:52 -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=nlFl8omVkHqTPGxhjkyVGbAgCc7XIVdRzoqDMnvmdGM=; b=bcCpAqUM6zyq2WKoX4duA6jWaSlrxA0HOx5d1dgM72WwieUd8V9CmMR4no7YDYoeGj yjjF0p09LNTCfJ5xDhcpr1ekx9q+xs9Pq/jZ6TxwXqji2R3zd94eSOPnBuiZ5+fbHUiF 6cGSSi2UbSSHFX6za22fQMWIVIyKXfmjMEoRNeIdOksQR4imA5ytVJMKss9U9w+WIDVD QipmQYu6lPg4ZDMIsE24jxTX8GL/khNMHRz0VS1c2aYXClozPiedPSi2EBPD5LiLHBPH sA18JOn77urgBEoxcxXGyLsI2tdn/4NTfdpjEEpkyM77r6De0/R3zEn34Kr5minivi5a oPjg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Gm-Message-State: AOUpUlE0KuPf66OvQ8w2gOAXkqlThJQkx47PbzQr0IseBzestO/iPM5V 2n8dATlxJcd3vrHO12R7g5FYUuzKEDV/IxmMagn5SnRZa/06xBwoSv3F7WKSarweoqrz3mgt7MF pJmlyHWNuJNrGckWHJ5V+ACNE+jXAKfhsaUTX9ra604+3JesZpSe64Gw229f8iJ+OjA== X-Received: by 2002:a62:4add:: with SMTP id c90-v6mr12896972pfj.23.1532344792674; Mon, 23 Jul 2018 04:19:52 -0700 (PDT) X-Google-Smtp-Source: AAOMgpde29L3GuBcfW/tC7q5uGDGwCbpQRLvbjBlsXc811LbpQZBBNgBJFpYcjei0QXqTPQ9BVl1 X-Received: by 2002:a62:4add:: with SMTP id c90-v6mr12896938pfj.23.1532344791826; Mon, 23 Jul 2018 04:19:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532344791; cv=none; d=google.com; s=arc-20160816; b=kHE0dtOcnrEarnc01G0bBQIhs+PPJIBkkR8tAGC+wV6KR8i9ZilKz+DQIjSGqJdufv YbXrqsltr9jDivCaUziDYVWDhVwn9aH6hs6uMajahBjU0TXEMy2JY0YHuZplrUvngy50 SZPF9W7egWnrZCFT0PRi/2HwQQwsYbC3Aipvp3YiWVMepTfiVe16FYKyOwN0Bt+ClfHB 5L24x5JIhRv99IJDkXJmF6kpjGzccR0lmBtif2qhCW6iSEzXUsAYw4STUhffd+JOJbvv 0uWRX+e2zQj3bX8nrA51kzCIxGh6QXr5iMQNDvqbi6SCTsGPbWs6/hChIL13hm/n55RD ITSg== 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=nlFl8omVkHqTPGxhjkyVGbAgCc7XIVdRzoqDMnvmdGM=; b=lANc6sX5VdSfBtb/dJ/7cZ+vquTFXqsm4P4a6HvInRendS9az5vGFiaiBkCbTTgr0q OXk8/DoaPOgIVrjFEfOSMNR2Bq7O2f8Gjwwu85Br5dn03mjvecaTN5tY6+rejAwDZZ6F Ya5CFnis8vMIVDi0o0LvrSKI5ixWLCGRJVfyVf/DKnxevBsl60aIvTrx77CRMhMSMfEz WdKSo1E+4oXATCfPj0lbQgphOe5yXQUIIicvDcON3EjJmmrNAh2EncfG7ULCeq0V7EHN 4fb3iAHVXccteomOKpsymN1KF+EnG1GRzxBa9xcBolt4NrM22wzsS8iD3TzFFX6/gbWf WcAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id d1-v6si8739483pfk.166.2018.07.23.04.19.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 04:19:51 -0700 (PDT) Received-SPF: pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id E453BAEDB; Mon, 23 Jul 2018 11:19:49 +0000 (UTC) From: Vlastimil Babka To: Andrew Morton Cc: Daniel Colascione , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Alexey Dobriyan , linux-api@vger.kernel.org, Vlastimil Babka Subject: [PATCH 3/4] mm: proc/pid/smaps: factor out common stats printing Date: Mon, 23 Jul 2018 13:19:32 +0200 Message-Id: <20180723111933.15443-4-vbabka@suse.cz> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180723111933.15443-1-vbabka@suse.cz> References: <20180723111933.15443-1-vbabka@suse.cz> 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 To prepare for handling /proc/pid/smaps_rollup differently from /proc/pid/smaps factor out from show_smap() printing the parts of output that are common for both variants, which is the bulk of the gathered memory stats. Signed-off-by: Vlastimil Babka --- fs/proc/task_mmu.c | 51 ++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d2ca88c92d9d..1d6d315fd31b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -747,6 +747,32 @@ static void smap_gather_stats(struct vm_area_struct *vma, #define SEQ_PUT_DEC(str, val) \ seq_put_decimal_ull_width(m, str, (val) >> 10, 8) + +/* Show the contents common for smaps and smaps_rollup */ +static void __show_smap(struct seq_file *m, struct mem_size_stats *mss) +{ + SEQ_PUT_DEC("Rss: ", mss->resident); + SEQ_PUT_DEC(" kB\nPss: ", mss->pss >> PSS_SHIFT); + SEQ_PUT_DEC(" kB\nShared_Clean: ", mss->shared_clean); + SEQ_PUT_DEC(" kB\nShared_Dirty: ", mss->shared_dirty); + SEQ_PUT_DEC(" kB\nPrivate_Clean: ", mss->private_clean); + SEQ_PUT_DEC(" kB\nPrivate_Dirty: ", mss->private_dirty); + SEQ_PUT_DEC(" kB\nReferenced: ", mss->referenced); + SEQ_PUT_DEC(" kB\nAnonymous: ", mss->anonymous); + SEQ_PUT_DEC(" kB\nLazyFree: ", mss->lazyfree); + SEQ_PUT_DEC(" kB\nAnonHugePages: ", mss->anonymous_thp); + SEQ_PUT_DEC(" kB\nShmemPmdMapped: ", mss->shmem_thp); + SEQ_PUT_DEC(" kB\nShared_Hugetlb: ", mss->shared_hugetlb); + seq_put_decimal_ull_width(m, " kB\nPrivate_Hugetlb: ", + mss->private_hugetlb >> 10, 7); + SEQ_PUT_DEC(" kB\nSwap: ", mss->swap); + SEQ_PUT_DEC(" kB\nSwapPss: ", + mss->swap_pss >> PSS_SHIFT); + SEQ_PUT_DEC(" kB\nLocked: ", + mss->pss_locked >> PSS_SHIFT); + seq_puts(m, " kB\n"); +} + static int show_smap(struct seq_file *m, void *v) { struct proc_maps_private *priv = m->private; @@ -791,28 +817,9 @@ static int show_smap(struct seq_file *m, void *v) seq_puts(m, " kB\n"); } - if (!rollup_mode || last_vma) { - SEQ_PUT_DEC("Rss: ", mss->resident); - SEQ_PUT_DEC(" kB\nPss: ", mss->pss >> PSS_SHIFT); - SEQ_PUT_DEC(" kB\nShared_Clean: ", mss->shared_clean); - SEQ_PUT_DEC(" kB\nShared_Dirty: ", mss->shared_dirty); - SEQ_PUT_DEC(" kB\nPrivate_Clean: ", mss->private_clean); - SEQ_PUT_DEC(" kB\nPrivate_Dirty: ", mss->private_dirty); - SEQ_PUT_DEC(" kB\nReferenced: ", mss->referenced); - SEQ_PUT_DEC(" kB\nAnonymous: ", mss->anonymous); - SEQ_PUT_DEC(" kB\nLazyFree: ", mss->lazyfree); - SEQ_PUT_DEC(" kB\nAnonHugePages: ", mss->anonymous_thp); - SEQ_PUT_DEC(" kB\nShmemPmdMapped: ", mss->shmem_thp); - SEQ_PUT_DEC(" kB\nShared_Hugetlb: ", mss->shared_hugetlb); - seq_put_decimal_ull_width(m, " kB\nPrivate_Hugetlb: ", - mss->private_hugetlb >> 10, 7); - SEQ_PUT_DEC(" kB\nSwap: ", mss->swap); - SEQ_PUT_DEC(" kB\nSwapPss: ", - mss->swap_pss >> PSS_SHIFT); - SEQ_PUT_DEC(" kB\nLocked: ", - mss->pss_locked >> PSS_SHIFT); - seq_puts(m, " kB\n"); - } + if (!rollup_mode || last_vma) + __show_smap(m, mss); + if (!rollup_mode) { if (arch_pkeys_enabled()) seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma));