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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE254EB64DA for ; Mon, 19 Jun 2023 10:00:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F32E68D0002; Mon, 19 Jun 2023 06:00:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE3598D0001; Mon, 19 Jun 2023 06:00:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DAABD8D0002; Mon, 19 Jun 2023 06:00:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CD1508D0001 for ; Mon, 19 Jun 2023 06:00:10 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 917488064A for ; Mon, 19 Jun 2023 10:00:10 +0000 (UTC) X-FDA: 80919051780.22.BF4EC02 Received: from mail-ua1-f41.google.com (mail-ua1-f41.google.com [209.85.222.41]) by imf10.hostedemail.com (Postfix) with ESMTP id 9E05CC000C for ; Mon, 19 Jun 2023 10:00:08 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=ZMmIY4Gs; spf=pass (imf10.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.222.41 as permitted sender) smtp.mailfrom=jglauber@digitalocean.com; dmarc=pass (policy=reject) header.from=digitalocean.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687168808; a=rsa-sha256; cv=none; b=0WwncPNPcKqRXuV4zpXpZ6zDFjnriJ2tkv7XXm1TiWXlujrHKxsxBfyyRHxSSyy2YuRXEY b8zL4hfHzeOrOd0hJZCVUqeLl2HxLP8iDDqM79+ejy9TqbLM6xGkuBSJ3O9dVGNaUh+EYE H3Z+x8wVkB4SllwF4gdvBGIg5duYmJQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=ZMmIY4Gs; spf=pass (imf10.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.222.41 as permitted sender) smtp.mailfrom=jglauber@digitalocean.com; dmarc=pass (policy=reject) header.from=digitalocean.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687168808; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9p7FofhOgo4o8xJoUkYlya9Am0Z2gkjtgVa0P0WA0yE=; b=K12lV8dDY7gR2vsVSpB2IkADE0PQKvHjbZVDr3+8wtKHxZJIO+eAi3cij5H0i8+NVmlK3W VXKwqEMw1dQyltWO4SziwTVF7cmykm3X+nPvTcHj6jTQkyHYehbFndhmOULPkWih34wbpx r3r37ujNZSwD4RxtCJ/ENBb/Sjl4txM= Received: by mail-ua1-f41.google.com with SMTP id a1e0cc1a2514c-78f6a9800c9so364245241.3 for ; Mon, 19 Jun 2023 03:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=digitalocean.com; s=google; t=1687168807; x=1689760807; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9p7FofhOgo4o8xJoUkYlya9Am0Z2gkjtgVa0P0WA0yE=; b=ZMmIY4GsjR28e+RJM8bZjYqn/iaHib0G48iRsWLT9ROuNRzajMm9xBvhASU7Fqxpdc b3m5WONkSCmRdds1WdHr11eBdiVc0VO8kt6dZ9I4n/EiDqTvi1986yUqxaFsbtCgcjrm bZl6SAcdcPkqUgfeJomBeUQrv6c1mXVrKVEqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687168807; x=1689760807; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9p7FofhOgo4o8xJoUkYlya9Am0Z2gkjtgVa0P0WA0yE=; b=jpRhjQ9l/JlOKuJR3bZIroNyYPFQk9Zj2Oqdx4tqcdtehU5zEF2OdcK/icyjoKWUNi adJkSTT4PtUNV9QI+SPJQagwDYHjDKnX8savJEEeyLYiKwL0RHRFymaS3JF7oUMVVa/j wnAqkbUQ/1wjSy51+CoEJ29RlH+3zLXfBKLeUDXeJUpv54llQ1n0CtcSWuKSJoY+1zTT 8Q8fufVL6CvVrUdFRP7LRvTmNzh6eBNHFg0740KBccKmTJVqZChFtqiwTCPYVr8rE+Kt Es9hZQEjbAqGfu6hFgrgBuyP5hTizT4PlGgM+qGA1Do43YKLEwIl6TROLaTcZuhJCdsK +3GA== X-Gm-Message-State: AC+VfDx1LCytfSvppuS93nupno8pKf05KlmKAre+ICyo0rdkgrsVE2Ma hhpsg6BHFlJUhL7iNhGy7EdZ0OFvWxaJelStTGJbig== X-Google-Smtp-Source: ACHHUZ4n6IiRwxpBP9krb4zJr7VYTpIzcYpKlkVTMh131ETFiFVqYxJ/LP3ed88qd/50AGwggI02kzMIZ5CvmUTaAsw= X-Received: by 2002:a67:ba17:0:b0:43f:4f93:3d29 with SMTP id l23-20020a67ba17000000b0043f4f933d29mr2376168vsn.21.1687168807702; Mon, 19 Jun 2023 03:00:07 -0700 (PDT) MIME-Version: 1.0 References: <20230619055735.141740-1-jglauber@digitalocean.com> In-Reply-To: From: Jan Glauber Date: Mon, 19 Jun 2023 11:59:56 +0200 Message-ID: Subject: Re: [PATCH] mm: Fix shmem THP counters on migration To: Baolin Wang Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: multipart/alternative; boundary="00000000000075aea505fe7899e0" X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 9E05CC000C X-Stat-Signature: ni41qc1eocfkrqzix4qu965579c9s5bj X-Rspam-User: X-HE-Tag: 1687168808-999854 X-HE-Meta: U2FsdGVkX1+0ggFVUTbDZWjkbzWxyIQBn5NHYdPYbxczg1gNpmAkme2XllMRmOIKWOl8uj7d++hNgkL+3qfsWLppDmrdROC4Us2o0AcxMGk2E2xfYb1ykQzBqns5uSPZ9E2yAgwfyLc9Hl8b3Cmu70FN+0uVj6xWYeN8tb/X/ynuQPWb8ieHZmXc19jOv5gLLDUTpfFP/XeChGjVfAiVhDMXZMhCSzdUi2XS3hZRrUf2YPeWbGgysiORsAPeTgFMDeTxmPjLbN5m9rN4nKqi1ZPfqChjY53HKXl8x8HIoE424F3/gxXtN8PxrXEVrwZriLXjDWL154JSXmZj4SIDcDcYzGy90zDwcDzaH9MeTeOisWMhXuR10HGCOWMxiP+tQRtDn9B88FMnUYAb3b/i0fggZG4wwhWqhHVcyAaSZG5ZI/2RzsveMX6Z0mQATq+JAqbJvqL1b1vrxEqf0Vqj403ErglLit0WTCtJofaEsAdV4zKNdfYLFmKZLCyww2O+2tEuMiAu8UTt7fbKqIX93axDeavAqhE2D641g1Ivim3VwjbMSmE1udYEflwquwBY6JAJWaprNxs+GuXVBUyqBH/qN0jZESeQHGJMPosgpMhZ0AAnggKWpAWlwfvtPDqq+tHLyyUeBEr7dqZzilYG1Rx4QgW5A3aZtr3J5cY0RlgoUCoJWVQoc+sPeJvPINdtpuJuijp4F6uZ90xCGs5me6Zx/aZuebyny4wZfqY1DcjZTep+FTpFBzE9C0ilr2sXPEkd9GSlheTgG6elBXPiOz43r2dw2aVgRKmux0kEV8rIsKAvq1EWIlycuu0AQpfcxAgQdKkyl9EqJiksIniIehcoJw2a98Gg0ElW5Eja34lPnD7JgHVjnjW5cwg0DUZidS1oDiW5Bn1VLzbWF0+Ha6MHXNnR3tvNTRpAA4JKuf8AGHiQW+CNAS4nyBt+9+QAeD5OaEoW8TH3YB6N8lT D15MxEdE l4+/LR3rSrcKYvojBJNCDK8fPKcssNFNsrCeT2gyeW9Um5SB14TakyAuVhWBIB1Rfee4V4Bv5i9tr9e2DfgSRDTeAYeT/zTeO5yXaefxX2JvvkvTZRdpBPgflKT5p25CbgLcP3Bl9Rn7hI/jcuWNxqoZVB4plx5qPtPJfMDzQ6DPSlHSwo8HNinls4HsMwxxfvL6JpDBX63gyiS+yx5K2Z8cyXMG9B5Y1eM8XiOpQvLeHTcyex/l3q4EOBkN+nRY7rWYhREquMEuhhNFr7FlhE43WsTtq4RlbNoWpeSM/jL2QWLtOMoCl8cdhcw4XOPE4/pytFZVZ9qoAPPu9gr1llZdOrjUHJqjC1lBzqzpjAgx3EbWd2VdyACGnAg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000563, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: --00000000000075aea505fe7899e0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jun 19, 2023 at 8:40=E2=80=AFAM Baolin Wang wrote: > > > diff --git a/mm/migrate.c b/mm/migrate.c > > index 01cac26a3127..d2ba786ea105 100644 > > --- a/mm/migrate.c > > +++ b/mm/migrate.c > > @@ -492,6 +492,11 @@ int folio_migrate_mapping(struct address_space > *mapping, > > if (folio_test_swapbacked(folio) && > !folio_test_swapcache(folio)) { > > __mod_lruvec_state(old_lruvec, NR_SHMEM, -nr); > > __mod_lruvec_state(new_lruvec, NR_SHMEM, nr); > > + > > + if (folio_test_transhuge(folio)) { > > + __mod_lruvec_state(old_lruvec, > NR_SHMEM_THP, -nr); > > + __mod_lruvec_state(new_lruvec, > NR_SHMEM_THP, nr); > > Should be NR_SHMEM_THPS. > Sorry, was testing the change on another system. Will send a new patch. --Jan --00000000000075aea505fe7899e0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Jun 19, 2023 at 8:40=E2= =80=AFAM Baolin Wang <b= aolin.wang@linux.alibaba.com> wrote:

> diff --git a/mm/migrate.c b/mm/migrate.c
> index 01cac26a3127..d2ba786ea105 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@ -492,6 +492,11 @@ int folio_migrate_mapping(struct address_space *m= apping,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (folio_test_s= wapbacked(folio) && !folio_test_swapcache(folio)) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0__mod_lruvec_state(old_lruvec, NR_SHMEM, -nr);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0__mod_lruvec_state(new_lruvec, NR_SHMEM, nr);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (folio_test_transhuge(folio)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__mod_lruvec_state(old_lruvec, NR_SHMEM_= THP, -nr);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__mod_lruvec_state(new_lruvec, NR_SHMEM_= THP, nr);

Should be NR_SHMEM_THPS.

Sorry, was testing the chan= ge on another system. Will send a new patch.

--Jan=
--00000000000075aea505fe7899e0--