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=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT 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 451FFC169C4 for ; Sun, 3 Feb 2019 06:21:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00C8A2083B for ; Sun, 3 Feb 2019 06:21:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=android.com header.i=@android.com header.b="fG0rb3LA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726924AbfBCGVT (ORCPT ); Sun, 3 Feb 2019 01:21:19 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43369 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726466AbfBCGVT (ORCPT ); Sun, 3 Feb 2019 01:21:19 -0500 Received: by mail-pg1-f196.google.com with SMTP id v28so4871264pgk.10 for ; Sat, 02 Feb 2019 22:21:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zxEjaYy+JsHVGX0Na5H2IIsv1IZR8sj0qq1XGIVMrvc=; b=fG0rb3LAqiMpw7kMFwZ2BqmN+BqjEcdKYjEwk+719BDaGX2DDF+Ly5rzNkp3AqyhKn UJM5r/O0RYpLzy126uMJFnu8UwXBcCWc0Y8cMCrywuAhOH2V+K7epx1tX+HJHZkbgQki QdZoDwDErh7q9JtPlJVEwkawEhLWhCJtOFaGQu6maez7E0WLOaqwE1RuUq7/GmLLL2Lq Mhcg0zty16Xbe0JfAYrZXt6wMjt/vT1Mh5+t88nK4tE+tKnY8+pPdm2AHV+8F+R5iYoL SJ87J5Z61dYAPfFoxLu3Z6HxkKut4q//qDX8IVL/JYLBXW468qmOg3nIAlKLd68g8kvB U8sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zxEjaYy+JsHVGX0Na5H2IIsv1IZR8sj0qq1XGIVMrvc=; b=eZU+RirbEt9pyfnJCINxodYJ+wL2CXbMIxlOcePFfGdwLFzQMachGWwbVZ0S/BOg8C mbEUARJJuDwwgmjSOX20kvDRBV9yiKHgUSgTp9/BjuDj3pui9VygwyaECYv2UFH/oFIp hSBPS9dv3W8muzK9qMNqBbxTiOXM0SEI/NOXQnvSdLSNymxjnsfHwvC8r1heeUB8tBYr 54z6c3qnP5hB3nohrExB+Ba16vn30HRjiFi2f2VVjVxFArGKKbY+m9qjOhfV9+uWnmri xNf9dhm3E6DrRsCwYOOdFYtANEduDSuj6Cbm+Q6Fl5CQFNDu/kta/8mmEGBEfnxAYsSb DFOQ== X-Gm-Message-State: AHQUAua5pSQAAsB9d6pxG62tBtMoi5rZgO8NwI4I0ZNvyaHJx/pBzEtF +Z7A0Kml/y2V0A2Pn22euzJOTA== X-Google-Smtp-Source: AHgI3IZOb1aucWJvwRr4/Z8hFCdTydsb5pBrcyfqrHvEkfsKKkIxmY54b19zR7PSqeLyrCvPB3v7Xg== X-Received: by 2002:a65:448a:: with SMTP id l10mr8595082pgq.387.1549174878794; Sat, 02 Feb 2019 22:21:18 -0800 (PST) Received: from localhost (c-73-170-36-70.hsd1.ca.comcast.net. [73.170.36.70]) by smtp.gmail.com with ESMTPSA id y12sm18425995pfk.70.2019.02.02.22.21.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Feb 2019 22:21:18 -0800 (PST) Date: Sat, 2 Feb 2019 22:21:14 -0800 From: Sandeep Patil To: Vlastimil Babka Cc: Andrew Morton , adobriyan@gmail.com, avagin@openvz.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@android.com, dancol@google.com Subject: Re: [PATCH] mm: proc: smaps_rollup: Fix pss_locked calculation Message-ID: <20190203062114.GC235465@google.com> References: <20190121011049.160505-1-sspatil@android.com> <20190128161509.5085cacf939463f1c22e0550@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Jan 29, 2019 at 04:52:21PM +0100, Vlastimil Babka wrote: > On 1/29/19 1:15 AM, Andrew Morton wrote: > > On Sun, 20 Jan 2019 17:10:49 -0800 Sandeep Patil wrote: > > > >> The 'pss_locked' field of smaps_rollup was being calculated incorrectly > >> as it accumulated the current pss everytime a locked VMA was found. > >> > >> Fix that by making sure we record the current pss value before each VMA > >> is walked. So, we can only add the delta if the VMA was found to be > >> VM_LOCKED. > >> > >> ... > >> > >> --- a/fs/proc/task_mmu.c > >> +++ b/fs/proc/task_mmu.c > >> @@ -709,6 +709,7 @@ static void smap_gather_stats(struct vm_area_struct *vma, > >> #endif > >> .mm = vma->vm_mm, > >> }; > >> + unsigned long pss; > >> > >> smaps_walk.private = mss; > >> > >> @@ -737,11 +738,12 @@ static void smap_gather_stats(struct vm_area_struct *vma, > >> } > >> } > >> #endif > >> - > >> + /* record current pss so we can calculate the delta after page walk */ > >> + pss = mss->pss; > >> /* mmap_sem is held in m_start */ > >> walk_page_vma(vma, &smaps_walk); > >> if (vma->vm_flags & VM_LOCKED) > >> - mss->pss_locked += mss->pss; > >> + mss->pss_locked += mss->pss - pss; > >> } > > > > This seems to be a rather obscure way of accumulating > > mem_size_stats.pss_locked. Wouldn't it make more sense to do this in > > smaps_account(), wherever we increment mem_size_stats.pss? > > > > It would be a tiny bit less efficient but I think that the code cleanup > > justifies such a cost? > > Yeah, Sandeep could you add 'bool locked' param to smaps_account() and check it > there? We probably don't need the whole vma param yet. Agree, I will send -v2 shortly. - ssp