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=-6.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,USER_AGENT_GIT 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 2F17AC33CA3 for ; Sat, 11 Jan 2020 09:59:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBEA72077C for ; Sat, 11 Jan 2020 09:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736776; bh=HIFgJAD1bqTpIP40iXmXuL5OzcjYdUclAnMKce2y3oE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZdFWFhTUH5L1gzdk0YeM9XxhmnvODH/g7je9hQxEatNtrtw/UnP8F9Naa6v1FwsaT jBtUyk6q9FjsuO9wKLx4ezrxhfgfcCN7uv3d1ay9lNy2aVI52Se4SGhS6xfb2ULDfi 4a/aIj989YXMDrriIIwv1nRh5am7DwwgZ/aqS0UI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729332AbgAKJ7f (ORCPT ); Sat, 11 Jan 2020 04:59:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:54262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728768AbgAKJ7d (ORCPT ); Sat, 11 Jan 2020 04:59:33 -0500 Received: from localhost (unknown [62.119.166.9]) (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 D5DCC2084D; Sat, 11 Jan 2020 09:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736773; bh=HIFgJAD1bqTpIP40iXmXuL5OzcjYdUclAnMKce2y3oE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JvQ3w0WbhEEN+SywXZte2j7Nc4j81o80jckpti/9xiybg40kZ56Z4cXVdtPMYSza/ gA3RfOjfYNI+arWCvm6s436TpRIB4YzUxfnWLjSgG+xz00V3Jr08K/Pfv58Tex7EMF WHulImLI2ydaHyeTiip4GQFDxBMeLSlnNzKlcq9Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chanho Min , Jinsuk Choi , Sergey Senozhatsky , Minchan Kim , Andrew Morton , Linus Torvalds Subject: [PATCH 4.9 21/91] mm/zsmalloc.c: fix the migrated zspage statistics. Date: Sat, 11 Jan 2020 10:49:14 +0100 Message-Id: <20200111094851.756485766@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chanho Min commit ac8f05da5174c560de122c499ce5dfb5d0dfbee5 upstream. 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 Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/zsmalloc.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -2138,6 +2138,11 @@ int zs_page_migrate(struct address_space 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;