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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 99A7DC433DB for ; Mon, 28 Dec 2020 17:32:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6601B229C4 for ; Mon, 28 Dec 2020 17:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727731AbgL1RcB (ORCPT ); Mon, 28 Dec 2020 12:32:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726848AbgL1RcA (ORCPT ); Mon, 28 Dec 2020 12:32:00 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D96B7C0613D6; Mon, 28 Dec 2020 09:31:19 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id x16so15082505ejj.7; Mon, 28 Dec 2020 09:31:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=L6jMggetbrrUEJcKxjzuL9oTosulpOnPLZ2l3XhwKRs=; b=sTNImozLG8IUJ7j7UwjMpqjYlF4QAZZpCW/LSq75Vt0RO1PNnl+NlthpsCUNTS+oEY Oji8WEtUKftUwXdtwbJzUQPnMJGy3Jv4UTXDo6EiV5zRGfTHvxEXGd0GtAD2rOKX8c5J Hb+ec3q1e8ssIeDfVC+hOSCnKd/LiTdq5ZP5h0pMDXO9SKgijrI7UZ5fld2y3w48q7Zu jByVPXR06kOSCI7JBI4qkUv+/ASVdjPP6ai0lrfqwJxiRxO9jtHe8mYAzbmh6RlHdJ+M HL8UADYYuHy/ja4ArNgBGG15iWstN9HGqBT7aEtva3IvIKH77bETrMrW+u+s9Q6mS4/B 6E3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=L6jMggetbrrUEJcKxjzuL9oTosulpOnPLZ2l3XhwKRs=; b=XHq3H/o4/5aJ/sHFlRuP+6BtmSb+8f1xFpQ7X4gVhfF3VQMpWdSx0dSLerjD1NqPB2 a0dKhZFfk2is6ORbon6uMJrZb6qVafBxNQEXxuxTJdgDzoUnqxKWBZVp36LAiWxcJYV2 ruY7upC1HTPATrbS1cQgvisiDgYz0WQzWO5yRaLgAay/079mJgwAgMwhJhEZuMDDFXW4 4B94JX9ZXiiFhqxqQiqzp+euBAu4yXjCvfFSuNXpK1XATVss7gYk9+L+SKsSkRfKZtdA 9abOqys0nr3KLpbMHmoHPmol8WxLgCCKV5Nzp9rqhmAypg4avc22gBVl/PY+SzanNRPI bAIg== X-Gm-Message-State: AOAM5309KyWPf2c/znQHbM1JTY1v3k6bL/FtEV7zQfk0Ncx7CwqUsw2e VB45dpT6z5MgGXqH8/g3E1HVduWLCCyL5u5igQQ= X-Google-Smtp-Source: ABdhPJwnGEJ77oSQj1FpVI6e1CvKlbyKgsHA+UHCeVILPPWIBeIAH1mKdtiFuhAXf57/MP63eN9cjUHniQLXulXtYgc= X-Received: by 2002:a17:906:b04f:: with SMTP id bj15mr41116505ejb.383.1609176677425; Mon, 28 Dec 2020 09:31:17 -0800 (PST) MIME-Version: 1.0 References: <20201227181310.3235210-1-shakeelb@google.com> In-Reply-To: <20201227181310.3235210-1-shakeelb@google.com> From: Yang Shi Date: Mon, 28 Dec 2020 09:31:05 -0800 Message-ID: Subject: Re: [PATCH 1/2] mm: memcg: fix memcg file_dirty numa stat To: Shakeel Butt Cc: Muchun Song , Naoya Horiguchi , Andrew Morton , "Kirill A . Shutemov" , Johannes Weiner , Roman Gushchin , Cgroups , Linux MM , Linux Kernel Mailing List , stable Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Dec 27, 2020 at 10:13 AM Shakeel Butt wrote: > > The kernel updates the per-node NR_FILE_DIRTY stats on page migration > but not the memcg numa stats. That was not an issue until recently the > commit 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface > for cgroup v2") exposed numa stats for the memcg. So fixing the > file_dirty per-memcg numa stat. > > Fixes: 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface for cgroup v2") > Signed-off-by: Shakeel Butt > Cc: Acked-by: Yang Shi > --- > mm/migrate.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index ee5e612b4cd8..613794f6a433 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -500,9 +500,9 @@ int migrate_page_move_mapping(struct address_space *mapping, > __inc_lruvec_state(new_lruvec, NR_SHMEM); > } > if (dirty && mapping_can_writeback(mapping)) { > - __dec_node_state(oldzone->zone_pgdat, NR_FILE_DIRTY); > + __dec_lruvec_state(old_lruvec, NR_FILE_DIRTY); > __dec_zone_state(oldzone, NR_ZONE_WRITE_PENDING); > - __inc_node_state(newzone->zone_pgdat, NR_FILE_DIRTY); > + __inc_lruvec_state(new_lruvec, NR_FILE_DIRTY); > __inc_zone_state(newzone, NR_ZONE_WRITE_PENDING); > } > } > -- > 2.29.2.729.g45daf8777d-goog > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Shi Subject: Re: [PATCH 1/2] mm: memcg: fix memcg file_dirty numa stat Date: Mon, 28 Dec 2020 09:31:05 -0800 Message-ID: References: <20201227181310.3235210-1-shakeelb@google.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=L6jMggetbrrUEJcKxjzuL9oTosulpOnPLZ2l3XhwKRs=; b=sTNImozLG8IUJ7j7UwjMpqjYlF4QAZZpCW/LSq75Vt0RO1PNnl+NlthpsCUNTS+oEY Oji8WEtUKftUwXdtwbJzUQPnMJGy3Jv4UTXDo6EiV5zRGfTHvxEXGd0GtAD2rOKX8c5J Hb+ec3q1e8ssIeDfVC+hOSCnKd/LiTdq5ZP5h0pMDXO9SKgijrI7UZ5fld2y3w48q7Zu jByVPXR06kOSCI7JBI4qkUv+/ASVdjPP6ai0lrfqwJxiRxO9jtHe8mYAzbmh6RlHdJ+M HL8UADYYuHy/ja4ArNgBGG15iWstN9HGqBT7aEtva3IvIKH77bETrMrW+u+s9Q6mS4/B 6E3Q== In-Reply-To: <20201227181310.3235210-1-shakeelb@google.com> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Shakeel Butt Cc: Muchun Song , Naoya Horiguchi , Andrew Morton , "Kirill A . Shutemov" , Johannes Weiner , Roman Gushchin , Cgroups , Linux MM , Linux Kernel Mailing List , stable On Sun, Dec 27, 2020 at 10:13 AM Shakeel Butt wrote: > > The kernel updates the per-node NR_FILE_DIRTY stats on page migration > but not the memcg numa stats. That was not an issue until recently the > commit 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface > for cgroup v2") exposed numa stats for the memcg. So fixing the > file_dirty per-memcg numa stat. > > Fixes: 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface for cgroup v2") > Signed-off-by: Shakeel Butt > Cc: Acked-by: Yang Shi > --- > mm/migrate.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index ee5e612b4cd8..613794f6a433 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -500,9 +500,9 @@ int migrate_page_move_mapping(struct address_space *mapping, > __inc_lruvec_state(new_lruvec, NR_SHMEM); > } > if (dirty && mapping_can_writeback(mapping)) { > - __dec_node_state(oldzone->zone_pgdat, NR_FILE_DIRTY); > + __dec_lruvec_state(old_lruvec, NR_FILE_DIRTY); > __dec_zone_state(oldzone, NR_ZONE_WRITE_PENDING); > - __inc_node_state(newzone->zone_pgdat, NR_FILE_DIRTY); > + __inc_lruvec_state(new_lruvec, NR_FILE_DIRTY); > __inc_zone_state(newzone, NR_ZONE_WRITE_PENDING); > } > } > -- > 2.29.2.729.g45daf8777d-goog > >