From patchwork Mon Jun 19 05:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 13284008 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 1CD5CEB64D9 for ; Mon, 19 Jun 2023 05:58:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 419A18D0002; Mon, 19 Jun 2023 01:58:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C9F88D0001; Mon, 19 Jun 2023 01:58:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 290358D0002; Mon, 19 Jun 2023 01:58:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 168818D0001 for ; Mon, 19 Jun 2023 01:58:12 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DF25780421 for ; Mon, 19 Jun 2023 05:58:11 +0000 (UTC) X-FDA: 80918441982.20.37E6109 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf05.hostedemail.com (Postfix) with ESMTP id 0C79C100009 for ; Mon, 19 Jun 2023 05:58:09 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=JQQfI02E; dmarc=pass (policy=reject) header.from=digitalocean.com; spf=pass (imf05.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=jglauber@digitalocean.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687154290; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=HrlL+BdDDMCHPlpiqgd7BagbHF5+QnXLM/eoRrhffjw=; b=CqhkXXk/soIcmR7X3xZCAViRzwry49dC6kioARi85yQ4T5TGOV7re1zdi2c7VMbpqGaIlY 0Kv0akKcdV6Y+74J/+66JHJG2gLeAkzq/H/t+CmcKJEntakwqgW57dwS8EoThs5u9Mpnlp h4VXnz69t1VV1FbmsPms1FzkX0dy23c= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=JQQfI02E; dmarc=pass (policy=reject) header.from=digitalocean.com; spf=pass (imf05.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=jglauber@digitalocean.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687154290; a=rsa-sha256; cv=none; b=JWxglRO+VD3xwyONFXoyab3Jg0PnWbASj0dbkC65XLs8JcPtTaetWWRX4HXsdWeu6C6+Uf vug1E/JFnRl5oUced+FsqAd+/kNQiFzSkHk14ht7yrXmx39QBX2/iHovFu1IPKr0g7gwKT GSp7ZKoGbVf93KUogxkrsqoPmXF0/jg= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b50394a7f2so16001705ad.1 for ; Sun, 18 Jun 2023 22:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=digitalocean.com; s=google; t=1687154289; x=1689746289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HrlL+BdDDMCHPlpiqgd7BagbHF5+QnXLM/eoRrhffjw=; b=JQQfI02E/0uIDKwMsgUWVgb8+jY6IwmniqxVhT9/IhAsUk9U3lQ+O2pXnr7+SmTLCp Tp5/BoExKS0X2z3j60E9sjkRLFdBd0R1Gpu1uIHnSs4vBNl1gV7xzqkTAeaE99yl1h34 oGAB/cSTCRtO2vt/SI+fJKsST3OTU+DyErM0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687154289; x=1689746289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HrlL+BdDDMCHPlpiqgd7BagbHF5+QnXLM/eoRrhffjw=; b=ScK5ltedOHIugwcDZqVbR0itG0T2A/OCGbcJ8vIyuhPFSTX7Nb2GD/mG+3WdJbTynF 2EBXiUClITwUX7bkLliO/hlA+5BkZijyVhlfzU5H+M43FcTvVaECI1TSpOEnNIj9SjWM FO+vAoIOl+00qXCUI7++iNlbXa012Y/QJnlxvAqdF2FDdEYN4StuErZeO4ERoFXCFCpA 7WjaUOq/ld9f8yDblDOk4Q1/oGbI2eHbxZ33YLd1WRh/f5qnxK3cwLNGUsyBxjEVwOVo LfrU9TUC78qth7OmBj+MYfG3sbIpsTnC5OBjl+ARjx/oyjcu5cAPZi6Xmn6Wd9VgH/dT y4Dw== X-Gm-Message-State: AC+VfDzafb9E0g749AxQrj3L8A25YjHnG4WlMAkWTMbeTlz1VoVulU86 0Dez+P+KVf1fCxRZ7jaRXeb9bQ== X-Google-Smtp-Source: ACHHUZ430EgqLN8QRZoHICne/+B0YkTFuQ/CtdV3NfVaoGyRY6Kil5C6+PvIELt9JIWPwYqL0r1APQ== X-Received: by 2002:a17:902:c942:b0:1b0:7c3c:31f7 with SMTP id i2-20020a170902c94200b001b07c3c31f7mr8566821pla.28.1687154288719; Sun, 18 Jun 2023 22:58:08 -0700 (PDT) Received: from ika.internal.digitalocean.com ([2a02:8070:8e85:8a0:6016:eca3:bea:a7da]) by smtp.gmail.com with ESMTPSA id f13-20020a170902ce8d00b001b0358848b0sm12936489plg.161.2023.06.18.22.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 22:58:08 -0700 (PDT) From: Jan Glauber To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jan Glauber Subject: [PATCH] mm: Fix shmem THP counters on migration Date: Mon, 19 Jun 2023 07:57:35 +0200 Message-Id: <20230619055735.141740-1-jglauber@digitalocean.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0C79C100009 X-Stat-Signature: bepa3nkftbgfb59jncjtfurd9yhqramx X-Rspam-User: X-HE-Tag: 1687154289-118596 X-HE-Meta: U2FsdGVkX1/0Uz/tMtSxfvyu4V93AzfPM0YSAazrMvjMF0vqqrqJ+z1Ax0RwqI8AAzOTLh+jIeN7yRPw1zgj7e1pi8q7v5LL5bvu2zPPLulw/uY37G14VTx+9ZucVzt1TD/c4kuRBD8HotuxvmSwTuW9LNt7+EJrhdHfvxT8u+ov+N1BZWpONrwCltKE5zff8Uf5PRErGfXOAAtj/XCIVE/xPHvwaU5e2zAqMPnafavoxDuyk/+rrflYpQJVjNlB8gA/jEdOol70dMb5Hq73cREt5zNdgyNr2CYPe7BE6kOR3mLoihOX8j0RF7Qr+tdWvauSmQrc/8GuBo7Y3E3EYDQUwUBcz0GzY3vPlsCELkZ5J0Zy+IBSML61uhIAAmZDWlAudgUoqW/JInGSoRSl/UdgeS1eTI778kdmmNVr7tJhtT3Kxp0MsaQJDdETylqOdpSzU3IoUUcPzQstekw/JRodCRSfHqIyE30gFBlJMkN0Ctl6UX8vf3ydxzbmrI82ugiXYVtyU7U4hRyTH+DhzLEnquwTx3TYLiu+mYZHtqMw9HjV4p4TzlKjyWYEJQ9kxtcQUI6jjlLz+L/fKID/DTrBacmk9InYMSMwBGko5dDZ8Ruusns7y+OFehbXAoi50iQ+qLDBSj8UsAqeeNB4rp88g2kd9m9ai8+PxoBnlRjESeCWdE8iVEm2BKrV+hCe+m47gcRcpN7MO4frsua3q8x9m45d5z/1GvO8GB9nXUASTT//DNHoYoGl2KFqzx06LwlzaCh+4SWctjAP4f0Q1OlyFKKOCBR8wV+yrBpr+bkRUyhtyFFMNd8yt2ExVqkVvm3ADS3CNxChhLk7FHoe5IR0V2SJv3qxPSKVHNuPAYiKBTJRv8yTQybHy4FgOHYtr87nHKHFW3oZX6xWcNnyPlE4dZzm4Y7+AAHBLoeqZXr8SSJxAm1e1n6EkAnsC8PoBD+unEQe9zcscQcZE7n E97QBaP9 5vMhESj9fCXzo8jlCA595SAdmPhGzwV60zs/J8NqbiC5rT/9xT/tBkpaGkqIJlj15JnDS5sqHKsffx6M9g3+y6RTJ9FERSyHpwvTL2HW0008wtOVZ2lFhU82wXgKIUuW+mwjMJeS1L4NS+gWL1EOBbxUDDtzrCvseWQGJXn1ErW79UVWuMikVOidyBxyuCA1iQSHFum7Sh3JqFzkNsiAJhrAQZpES1JxFqgt80ZqpOhKJUWl8jfTZbGX0uctbtvSJE/1gZxb7mdVTeQ/0VwTNMQSyDcOBMNnUztNqkJ0nUNr6Ecd3xrATjDaombf0pXcDBXvQqSwKDRttm5C8ZS4pu3Ia1QVDoqCJc563kKVdASAN62Fnb/AVc6YZwpdPwBkswspGWBqVz8/wplY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000021, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The per node numa_stat values for shmem don't change on page migration for THP: grep shmem /sys/fs/cgroup/machine.slice/.../memory.numa_stat: shmem N0=1092616192 N1=10485760 shmem_thp N0=1092616192 N1=10485760 migratepages 9181 0 1: shmem N0=0 N1=1103101952 shmem_thp N0=1092616192 N1=10485760 Fix that by updating shmem_thp counters likewise to shmem counters on page migration. Signed-off-by: Jan Glauber --- mm/migrate.c | 5 +++++ 1 file changed, 5 insertions(+) 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); + } } #ifdef CONFIG_SWAP if (folio_test_swapcache(folio)) {