From patchwork Mon Jun 19 10:33:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 13284326 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 B9B88C0015E for ; Mon, 19 Jun 2023 10:34:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB1998D0002; Mon, 19 Jun 2023 06:34:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E61A08D0001; Mon, 19 Jun 2023 06:34:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2A4B8D0002; Mon, 19 Jun 2023 06:34:17 -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 C18928D0001 for ; Mon, 19 Jun 2023 06:34:17 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 81BA91A0620 for ; Mon, 19 Jun 2023 10:34:17 +0000 (UTC) X-FDA: 80919137754.18.2523C31 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf10.hostedemail.com (Postfix) with ESMTP id 8355AC000F for ; Mon, 19 Jun 2023 10:34:15 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=BLfZul72; spf=pass (imf10.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.210.182 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=1687170855; 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:in-reply-to:references:references:dkim-signature; bh=heHJUn4iKTJWBTugyrbKjkbfR9J6JddpcED//kDefoo=; b=M+cWLnD6lv99JuyIAud9H3e4bOtHepRiftYxk4lSW+ds0S80i3w+K2y/tbCU9rqdaPfMTZ ABuEbxq9Ie5+eMhofoVhLcPTUHig8BkDxwSgfITonOoApfb+o7XDt5Qt+gU6ZTBEyhtSxA LzK7b59488rDxbIRwvRsmO0InDYMaZk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687170855; a=rsa-sha256; cv=none; b=InRvSiq6DMoSXZuD4JmYwaVt0NeMuKc139MfGm1WwDn5vGseTVjVyjEeF1oImEeBB2YSqy IT6smTeZOHkFdpa0bigICC8YFkPG2BgJGGniLETmRkJYn4AGPiZ9KODd9j9RxWwZ4kofzY LOMA9TjnXoFsv49edwnvMGs3sThDFBY= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=digitalocean.com header.s=google header.b=BLfZul72; spf=pass (imf10.hostedemail.com: domain of jglauber@digitalocean.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=jglauber@digitalocean.com; dmarc=pass (policy=reject) header.from=digitalocean.com Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-668709767b1so845040b3a.2 for ; Mon, 19 Jun 2023 03:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=digitalocean.com; s=google; t=1687170854; x=1689762854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=heHJUn4iKTJWBTugyrbKjkbfR9J6JddpcED//kDefoo=; b=BLfZul72ZubCd1bVTnuTMDkkvnVOopE/JjTBvj0IonhU2MMIEEDOvBcOkUFRelOLtX o7uOZ5+5a1AOHhUCzyurcDpg9q8dfBwoTN47MmfIAQXFdM2yaZdRpUd3hvZvfFTpYgf2 6qf+jDUF8Vb0c3fx+8BTZ+Ba6+sNnTt881iyA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687170854; x=1689762854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=heHJUn4iKTJWBTugyrbKjkbfR9J6JddpcED//kDefoo=; b=aAp9QeWDLTtGe9sGrHL43AZ04ndgkahPV4F0bPS1UTjkK1Rm0R6msiL9dU0NlpevrR 6/Z2DqmK5ov5a4alNhrZoW8+4jcwMffcKQyxw9QnPrxSxaLsodEIAoVR1ZHdsNYshZYX 0fthQIG/Z2Tus9AsdwsDe6Cq/kEYSuVsY+lLPu+ZaTIpgXn1gHmv9sHP/OB5fi0XehoD K0PPA5Vw6hOu3m7V1Unwi/Lt0foSfXpkgcmRINCgXm3I4LrDj+mIh47UgzcgIX+61+A9 vbQGjrEvzy5GM3AnKE/a4o5AvOwPL3Zn1fjddT25dww3rcvaCuLk82XRiinOZK7yRurf vceg== X-Gm-Message-State: AC+VfDz8rxAd7ryiTnFBPz28gxMZOMzR1307QsLaiFO9a35XMs07W7ns lvAxhNMggy8QyLiV3sTT4U0QGg== X-Google-Smtp-Source: ACHHUZ7wH+w2GaVwSuxTonZVh2X/ubMhbGd2L6gkQVrSDHS5jCns9CtbX3GUOtqZ0/aFmtuGCXxMFw== X-Received: by 2002:a05:6a00:1343:b0:643:857d:87a3 with SMTP id k3-20020a056a00134300b00643857d87a3mr10102506pfu.11.1687170854324; Mon, 19 Jun 2023 03:34:14 -0700 (PDT) Received: from ika.internal.digitalocean.com (ip-091-089-160-106.um28.pools.vodafone-ip.de. [91.89.160.106]) by smtp.gmail.com with ESMTPSA id 11-20020aa7910b000000b0065434edd521sm17370756pfh.196.2023.06.19.03.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 03:34:13 -0700 (PDT) From: Jan Glauber To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jan Glauber Subject: [PATCH v2] mm: Fix shmem THP counters on migration Date: Mon, 19 Jun 2023 12:33:51 +0200 Message-Id: <20230619103351.234837-1-jglauber@digitalocean.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230619054955.140276-1-jglauber@digitalocean.com> References: <20230619054955.140276-1-jglauber@digitalocean.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8355AC000F X-Rspam-User: X-Stat-Signature: r6r1w6picxuy71c8ux1ke975mtjaesxu X-Rspamd-Server: rspam03 X-HE-Tag: 1687170855-617583 X-HE-Meta: U2FsdGVkX19aTLHFj2nT75/Ygye74rn1tcJvutyZDQ865Xtc5FXJ2LSUQ56VT3ERg+H4mu5mnKwuKrsUkkZGqX+wYvrNh+oXHJvdyTmqbM90K32ddwOxQIvu4kaVvzgmkf8e2Mn39okJ76Jy9C/fallXhci22G7FygKfujFbvlonZaq9lHbz2xRcmti19W/O4SHJWoWU1qmxgZP8Ut/yZUzksHHlQCbRmN8XBZyZbzWmAh69oMuwhFuc2CIPpKiBadkm6S3x7U5Das7UOPPBLViH+UQZdF1nns42auIqyB5araGcX7/FNV68LoyjYWFY6veUaQ3Pp8ojhc1BPZ3qTskfcIiVrcpFMLZ/9JFPuTXi7QOq2t8vjzNzPyVdCLEPpAuvAnUyqj3gn0dubGTgCYMXpr6f5+B4uSZlHRP+9/GhEg25729v6CFy5Bao/wOd7Gnf56ZrXbiNF+eCg3PFJdlYWlpNzMoa3x6iz0lAruY5hufTrO8K+R/buzMP7o9PXxtQ2F2wZFvrtxpZQB755ptNLz5ToBV7tGg3ab07wWUxcrgsvzEPtt3zMXnhorXHYx5q3zaT94fVQZ7CjWF5RYXRoEYhqHmemtZIVeAFHwXYzz0JOQnSNFDUkamvBALu/fN/oN+YbmbS5tnGgYeP7sZN+1OiykDTzCEtCnRRjuEm59Y4jVs25nQtWVmr3j2i0GWjQg4CIeKsoOkY12RRsi6uekApEUORKm2VIddymjkRYFGAVItrj0KEvMCDpdFhyGZ9k0qcCY9zzWGaKT50aoboUOmYD62De0kcAHzIoJUIFkl/Z2bh2q90EazsevaOOw4O3bL5AF5YkMDXjyh46YlJyzVb8lOuw3q1koeKHnbKl9fzqc0oHhTQxLhh30ynPqz+XctX78qs8jD1N6QspWlNWKCVGqeo5yYkJWWqNnBEPm+itMQo5rPmhy4+AhBvc+LmajHmYcvWm4jnMa5 VvGmujyM HG7bP2HWj7rK5h62wMw8TL6xfcSha+1BwuaIJ7ncgQnCslfZAAc5DM/3VIenKFNAumRDDATsjGBNt3nSuePumqc1oAxQ/cuoknRUQvRlvMTTD1w2eIH5TU1hL/Rzj3nsUgNLcECwJB+aL688RqHicK3XYh1vb/Rzox+Z9ED61M1wD3VXHBq77C8OfL9GoL1C4z7t+5/ZwA4yQwD63mixKh4v2/norJvlQ0zMDlykdtqr8x0uD1ZbU4VoncLHTXkKq4FN2FULABYqu1xx9bABtEbMCFxGDQtWEU4y2w4lUSASCxIAN5y4+Dn51OtgvCRDNysQxL4KxUrdQgXdN3AWnLYVyP2/mzgXLTc6WAy0StVhQabMZKHq3BF8lubEOl963m1ky 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: 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(+) -- 2.25.1 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_THPS, -nr); + __mod_lruvec_state(new_lruvec, NR_SHMEM_THPS, nr); + } } #ifdef CONFIG_SWAP if (folio_test_swapcache(folio)) {