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.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT autolearn=ham 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 6273EC10F05 for ; Mon, 1 Apr 2019 18:20:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32E002146E for ; Mon, 1 Apr 2019 18:20:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="yYWfiYjk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729297AbfDASUz (ORCPT ); Mon, 1 Apr 2019 14:20:55 -0400 Received: from mail-yb1-f196.google.com ([209.85.219.196]:39187 "EHLO mail-yb1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728697AbfDASUz (ORCPT ); Mon, 1 Apr 2019 14:20:55 -0400 Received: by mail-yb1-f196.google.com with SMTP id b88so3884136ybi.6 for ; Mon, 01 Apr 2019 11:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=xawSNcb89Uo6X8oCMqaGeyypJgFbGg80AqgpmSx6PNw=; b=yYWfiYjksvzCycCvVISWrOF1si2tzoUTbtYRIO3Q25hQ3L8PVGgWzkv+A3Ik4Y7NNH V0oGUi2/jMXGFY7kaU1DmwQxMkpGlw6Dg1lwsBlmL/4u0/6HyOe2S/NddX8hbhEQn8RB QYOLiBL2R+6jrYtYEwQLS5JPOa0nq8qW/nrez2scZlWrPP1oQqeEG9db5heWgMskCn1q EGrTHOE4zVQgN+HJ3TjT4Q+Rz85tSAXJuWLGteK0d1Iq0HJw1I+c4z3r9cg6u5Lb8pMt +Gy1OIxomtJFU0V/FTUvs3StyivwFtk/wBRkg82gxhTwhzwnbYqHH6wzrjRAZ4bXV5tb YHQQ== 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=xawSNcb89Uo6X8oCMqaGeyypJgFbGg80AqgpmSx6PNw=; b=c16OCPdnLg2F6baYW8+89/h+EKAuYHIWsX21HBUVfXg01RChL1fiXX+3K5lvM2baO2 obyQ5lCDrX38RV5xYAwtrJTyoqB6DEEAgPnpRSo9UU+r2U1I2CdgZElwf0UeVhDfyKH2 aQ8S2AQRTXD3lNiE5wUzjAkWpIQ5q0nNLRBlv8wmIFjuo4nDlv4oFTmIxzC5lSDEmIfx FGT4exKHZ9AUjBehC0eYEC4HJspG3tYsEoWmOM5S8b3wn33Cf+LQlWN/FK29W8Ygfdfb h9Vlkx/VxbZRgAsAAWdQBRCko87IAGQRfmSCAIkLSEEomZHDqDL2PkJYHADSxxbkU+f6 mImg== X-Gm-Message-State: APjAAAXkGv7twBqjP1N4FwxqL+yYzhfUDFYJvNPALiuMfR5her9zeXi6 QWtKqVY3DvlBN1EgatwxoPvw/Stw3+w= X-Google-Smtp-Source: APXvYqxl+K7Jjs97IcKCD8eAX5F/SrbeGuLebrgoG7sE8UJcNFGJoN4oL+ZPoJmgFfzdICWPWphMRw== X-Received: by 2002:a25:99c3:: with SMTP id q3mr54775170ybo.263.1554142846659; Mon, 01 Apr 2019 11:20:46 -0700 (PDT) Received: from localhost ([2620:10d:c091:200::2:8ed4]) by smtp.gmail.com with ESMTPSA id d9sm7226304ywd.23.2019.04.01.11.20.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Apr 2019 11:20:45 -0700 (PDT) Date: Mon, 1 Apr 2019 14:20:44 -0400 From: Johannes Weiner To: Greg Thelen Cc: Andrew Morton , Roman Gushchin , Michal Hocko , Vladimir Davydov , Tejun Heo , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2] writeback: use exact memcg dirty counts Message-ID: <20190401182044.GA3694@cmpxchg.org> References: <20190329174609.164344-1-gthelen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190329174609.164344-1-gthelen@google.com> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Mar 29, 2019 at 10:46:09AM -0700, Greg Thelen wrote: > @@ -3907,10 +3923,10 @@ void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages, > struct mem_cgroup *memcg = mem_cgroup_from_css(wb->memcg_css); > struct mem_cgroup *parent; > > - *pdirty = memcg_page_state(memcg, NR_FILE_DIRTY); > + *pdirty = memcg_exact_page_state(memcg, NR_FILE_DIRTY); > > /* this should eventually include NR_UNSTABLE_NFS */ > - *pwriteback = memcg_page_state(memcg, NR_WRITEBACK); > + *pwriteback = memcg_exact_page_state(memcg, NR_WRITEBACK); > *pfilepages = mem_cgroup_nr_lru_pages(memcg, (1 << LRU_INACTIVE_FILE) | > (1 << LRU_ACTIVE_FILE)); Andrew, just a head-up: -mm has that LRU stat cleanup series queued ("mm: memcontrol: clean up the LRU counts tracking") that changes the mem_cgroup_nr_lru_pages() call here to two memcg_page_state(). I'm assuming Greg's fix here will get merged before the cleanup. When it gets picked up, it'll conflict with "mm: memcontrol: push down mem_cgroup_nr_lru_pages()". "mm: memcontrol: push down mem_cgroup_nr_lru_pages()" will need to be changed to use memcg_exact_page_state() calls instead of the plain memcg_page_state() for *pfilepages. Thanks