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.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6A2B5ECE597 for ; Thu, 17 Oct 2019 17:38:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3487B222BE for ; Thu, 17 Oct 2019 17:38:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uuCh3XES" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3487B222BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C134C8E0019; Thu, 17 Oct 2019 13:38:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9BB38E0003; Thu, 17 Oct 2019 13:38:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3C888E0019; Thu, 17 Oct 2019 13:38:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id 7D6AB8E0003 for ; Thu, 17 Oct 2019 13:38:49 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 386C31263 for ; Thu, 17 Oct 2019 17:38:49 +0000 (UTC) X-FDA: 76053986778.15.night53_8725c81495f60 X-HE-Tag: night53_8725c81495f60 X-Filterd-Recvd-Size: 4440 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Oct 2019 17:38:48 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id t20so4752207qtr.10 for ; Thu, 17 Oct 2019 10:38:48 -0700 (PDT) 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=uOK2In+JS6+ijshXF5nAA99W1PMr9sBNxGluOxOXzi4=; b=uuCh3XEScaE3T62TSiu5ATyLc9RPyHX//i2RdT5uipINc2JME+kjezfxPT5qXOOT+T SqXru3niTSd0K4iWHeqOhBqSv2GEOEkr2tlphd5r6jFCIVCFU3LI0hjcP3rsUsJWXTjd kaxiaaOomOiX4tanoXZrdMuHIKLSZ9sn+JHGjuQWVqLvVrNCloAk7yEg7a2Dn0PEIfbH V387Hllfv6leTVpSNKRz3+ZiAN9f3aQSCd6/zEJH3vK1wG/nkY76+qAGZ7NmjQpdmppi VIHpvBkQSSYiytW3RpgdREPdMav0oGlqUJizkUW8ITYt/0SRYJZ9Jy0MYkPcjYDMsNSc wnIQ== 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=uOK2In+JS6+ijshXF5nAA99W1PMr9sBNxGluOxOXzi4=; b=IWOkeN/B6AtpDK+XauFmQ+zrM6eV9g8pzzDddI33bNOozzq5bGwkhXKss3vGKejaYn 08veFQVtY4ejsbbDi/+mwP5bEalNy8rbiIQposwLrKkmxtDfbv5tbNBLFMSNi3gcHxFd 7K4WRuWEgaEJKQxXKe1MQPZePMHfmJWgAN/oZ/VufgsPzL97Fnl0B9iMeA7SRjkQBZ1T m3ML9Ovq5rh+DDqIwhxp/CgazpV7tmB+hpOESl6BWwDmTROJ2ekjy6JW1MV4ELU31bW5 3n6P5r8Yk+1dc2UszVKpXVhazhL8kfuWKeJonqAVBTcGlbjZg5EQ+YB5hyP+06qHRO6/ isyA== X-Gm-Message-State: APjAAAVExLJ0telj0zL4CE7oHKYITNJNLIdSKKkHPkjZbfb6dJ+RBqke mtnPFT6qUbYknp+/ahaagF74VNWyQJfYStrcQhOV+iPudKE= X-Google-Smtp-Source: APXvYqwrjvtHBSvL7dF5DK/8UEcy4NYLqcGwCPSuxjfJwjMt2yDlohIbB2Ydyq0qUv+ktsib6onmSislBcYribUrb6c= X-Received: by 2002:ac8:6ede:: with SMTP id f30mr4967779qtv.205.1571333928188; Thu, 17 Oct 2019 10:38:48 -0700 (PDT) MIME-Version: 1.0 References: <20191017164223.2762148-1-songliubraving@fb.com> <20191017164223.2762148-3-songliubraving@fb.com> In-Reply-To: <20191017164223.2762148-3-songliubraving@fb.com> From: Yang Shi Date: Thu, 17 Oct 2019 10:38:37 -0700 Message-ID: Subject: Re: [PATCH v2 2/5] mm/thp: fix node page state in split_huge_page_to_list() To: Song Liu Cc: Linux Kernel Mailing List , Linux MM , Andrew Morton , matthew.wilcox@oracle.com, kernel-team@fb.com, william.kucharski@oracle.com, "Kirill A. Shutemov" Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Oct 17, 2019 at 9:42 AM Song Liu wrote: > > From: "Kirill A. Shutemov" > > Make sure split_huge_page_to_list() handle the state of shmem THP and > file THP properly. > > Fixes: 60fbf0ab5da1 ("mm,thp: stats for file backed THP") > Signed-off-by: Kirill A. Shutemov > Tested-by: Song Liu > Signed-off-by: Song Liu Acked-by: Yang Shi > --- > mm/huge_memory.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index c5cb6dcd6c69..13cc93785006 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2789,8 +2789,13 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > ds_queue->split_queue_len--; > list_del(page_deferred_list(head)); > } > - if (mapping) > - __dec_node_page_state(page, NR_SHMEM_THPS); > + if (mapping) { > + if (PageSwapBacked(page)) > + __dec_node_page_state(page, NR_SHMEM_THPS); > + else > + __dec_node_page_state(page, NR_FILE_THPS); > + } > + > spin_unlock(&ds_queue->split_queue_lock); > __split_huge_page(page, list, end, flags); > if (PageSwapCache(head)) { > -- > 2.17.1 > >