From patchwork Sat Jan 4 20:59:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 234446 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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=no 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 E1776C33C8C for ; Sat, 4 Jan 2020 20:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7CFF24653 for ; Sat, 4 Jan 2020 20:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578171578; bh=HuPWhhHrqeSWiUh121GEnd8YYpBsCHJV6q9ZOlF5gqI=; h=Date:From:To:Subject:List-ID:From; b=PAEIfacB0aNmXqwX5xZ51jhktz072Bdcz/hz8aXdVBfOWaSjTny733h/p8O7tlVOW zZI98Wq8bFVAnqItFJXyCzv5f82SU8nPUXH/yv2kc1+5RxYLu8F762yfltkH5Zhj7k 2o4aYhmv9ug9LEsWDN6WuRV8rdypBB8YfBkjcpk8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726240AbgADU7i (ORCPT ); Sat, 4 Jan 2020 15:59:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:36374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726135AbgADU7h (ORCPT ); Sat, 4 Jan 2020 15:59:37 -0500 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3636824654; Sat, 4 Jan 2020 20:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578171577; bh=HuPWhhHrqeSWiUh121GEnd8YYpBsCHJV6q9ZOlF5gqI=; h=Date:From:To:Subject:From; b=I0Hh+tJhU3x3XdeoiQDMD4PF6NJzu/VzscqM5bvQTtml7ryeAGycUcc6l2LFUYCGW MmdI2r6wip6dQ1DAvz91ely/3TPQ7KkiNzf0KyNfK28rleZfNFDrz5iSu/AK/AfDN8 Fg7I2zSRyCDwecmTHgsVvsXClx0L5SAupxomena4= Date: Sat, 04 Jan 2020 12:59:36 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, chanho.min@lge.com, jjinsuk.choi@lge.com, linux-mm@kvack.org, minchan@kernel.org, mm-commits@vger.kernel.org, sergey.senozhatsky@gmail.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 02/17] mm/zsmalloc.c: fix the migrated zspage statistics. Message-ID: <20200104205936.KQJRwCAg-%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chanho Min Subject: mm/zsmalloc.c: fix the migrated zspage statistics. When zspage is migrated to the other zone, the zone page state should be updated as well, otherwise the NR_ZSPAGE for each zone shows wrong counts including proc/zoneinfo in practice. Link: http://lkml.kernel.org/r/1575434841-48009-1-git-send-email-chanho.min@lge.com Fixes: 91537fee0013 ("mm: add NR_ZSMALLOC to vmstat") Signed-off-by: Chanho Min Signed-off-by: Jinsuk Choi Reviewed-by: Sergey Senozhatsky Acked-by: Minchan Kim Cc: [4.9+] Signed-off-by: Andrew Morton --- mm/zsmalloc.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/mm/zsmalloc.c~mm-zsmallocc-fix-the-migrated-zspage-statistics +++ a/mm/zsmalloc.c @@ -2069,6 +2069,11 @@ static int zs_page_migrate(struct addres zs_pool_dec_isolated(pool); } + if (page_zone(newpage) != page_zone(page)) { + dec_zone_page_state(page, NR_ZSPAGES); + inc_zone_page_state(newpage, NR_ZSPAGES); + } + reset_page(page); put_page(page); page = newpage;