From patchwork Thu Apr 10 08:18:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 14046080 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 6840AC3601E for ; Thu, 10 Apr 2025 08:19:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40C3A280076; Thu, 10 Apr 2025 04:19:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B658280064; Thu, 10 Apr 2025 04:19:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 256A3280076; Thu, 10 Apr 2025 04:19:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 057E5280064 for ; Thu, 10 Apr 2025 04:19:21 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5F96C80623 for ; Thu, 10 Apr 2025 08:19:22 +0000 (UTC) X-FDA: 83317434564.30.004F94B Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf10.hostedemail.com (Postfix) with ESMTP id E4C42C0006 for ; Thu, 10 Apr 2025 08:19:19 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=L3OF73is; spf=pass (imf10.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744273160; 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=2WMNK4T/HAXbxP0c5nSxB7WqEQuDCDLUA/LOjFIKTw8=; b=bZMCxjSK24jLnTkLk39c+YbHWsflONU4p/PAyvGcIyCNNO0NQku71GDPHioaUlBXjRJ0mS PrJg9CbErAch2ond1TUNvwoVj+i7AyICmU1GcK5VwpWwzueX+1FPdGep4c9N841E6DLIvR OOowbHkSq5dxDOxlm9Qt+941OE0SR8Q= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=L3OF73is; spf=pass (imf10.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744273160; a=rsa-sha256; cv=none; b=r3IzJ7yIcXUoXcNsO0FItAYf6KOHnSDX7A8twsTEloom9P8oNZZX8YY/wj1RZBY3FAb+jk 1W2zKFJTGo9+m6KNkH4Qy0O20wVZwE/z6gyAh5/R0aF463VFz9hnvhPfqbRlg3MtymPF50 aVOi0VwkRRdnX/CEAwcqn+vcisb+Pi4= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-224171d6826so6951895ad.3 for ; Thu, 10 Apr 2025 01:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1744273158; x=1744877958; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2WMNK4T/HAXbxP0c5nSxB7WqEQuDCDLUA/LOjFIKTw8=; b=L3OF73iseTTf5uhG5x6eyOCZ5SnuECAGRBsJMW8na2d0Crmji1zSyJWXMmSd+BYLQh F7a0a/wTW4mjSFTtPdFHrbYadAS1Y0WqPVnfpFImaGVqzt73ZiEgKGkekmsMags+96EV CsXENTliQjz+NDv6VBt9OKuF4A/tDHS/c67qOysZNrVeS7q7ya5RedQlfg5UlP+ZwQkS RhyAzM10PnyWIGmz5nrAiLzY98cRQ0Sf/qD9krP2K/gO+xKCh6aaqPLMGJry8pHpFtHT CBqzSuFCAK3v9099YlM0eB/vunVpBcQmpcqWQsezLAOLtYPILVMSTxI/1vvBwJyIbHQ9 8wZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744273158; x=1744877958; 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=2WMNK4T/HAXbxP0c5nSxB7WqEQuDCDLUA/LOjFIKTw8=; b=hRZoLEDZPzspyyte9KW2rKI2qEAqHEs52n/QGEj9JD0b3WaMeqdmspCNLMAqX3opyy Zgo9asX+Np3krOMzaeHmqjWTxcp4url2A4/OfDhqu9KGMJN5vXfED69UfW/fFU97Gxr3 eNXWDu5w4I9WcQkUkjhZKV6BK1+TcLQeFWbrbgy1vnxWu2BXNaSo8+zJoHWzVRHx58FP l2ijaJRZQweM8OPo6bCccEXvfczgWGIlERumJySJbq7as2jrAlMXn7bx7se/OHGZ3aCS wegV/SI1HJQSmgtd6s+3Z++CMOVXygSPwt5iJTUxqrx2h77AGrmFWYUZSzvgbAJ5Mc2g hxcw== X-Forwarded-Encrypted: i=1; AJvYcCV/fXJ09eMSWDcr3XNk+4A9kvjQKJKmFjbloryurNe2ZixPAtASskEXs4XnD6QkPQGBUF0A9zq8KQ==@kvack.org X-Gm-Message-State: AOJu0Yxj1cncVAB3/rsZGYRRIZNfnX6FvfEFzpXXkFetm1HABOcFY0bL 7aViQuvJYpTS+QHS7gu+hQ77Um+nFbY/EWk+6eP7wKwg4l4lr1Nu9D9M+q31E/A= X-Gm-Gg: ASbGncuyo+hg27fiScfyzTWfjUo3of9tJCsC/L11B5kiLo5SvrUhzvEIC5cSqcfqSId KY1I+JpBhRC0NpGLQQl5Ri8FCjlRvhBPRH8/vWCHEhSAoEFjEmrpGtdlowFmcvHUXVtR+5NqH7r PNo0vqEv+tRKZ6kWPJeRvxNa45RkhZM5Hq15F5iiUUMPdkIvOog1YD41iMECWw+nhnGPSuc7N3c 2kEUxAmyTQl5zztaSlrYeanJ0k4DrM8CEudY+he/RNlfs999lFoQrf17NcU4OIeOKxSsF8/rTgj whaWs51PCwjPf9LXYchvoWBQSSw0t6UGLBGr9VCz536RJdPtzNrlHI0xRaBk/Hcza4bQwyaXoA= = X-Google-Smtp-Source: AGHT+IGtxCPcjlOxTXUr2/79MqVJQWBnBVjOCUpd/dINEd2Wk8WKKzYVYItvH6r2Re1mb6kWmGXZnA== X-Received: by 2002:a17:903:2a87:b0:223:fabd:4f76 with SMTP id d9443c01a7336-22b37e1af80mr28407585ad.30.1744273158539; Thu, 10 Apr 2025 01:19:18 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.12]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7b6284dsm24806755ad.38.2025.04.10.01.19.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 10 Apr 2025 01:19:17 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Muchun Song Subject: [PATCH] mm: memcontrol: fix swap counter leak from offline cgroup Date: Thu, 10 Apr 2025 16:18:12 +0800 Message-Id: <20250410081812.10073-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 X-Rspamd-Queue-Id: E4C42C0006 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ei8arce6yjq5j7f78x9r36i1z1us43te X-HE-Tag: 1744273159-425612 X-HE-Meta: U2FsdGVkX18t9dc3+EZouzo4DTEUY3cQS3lPLF0cJIGR8vp8r5vF4Hyns0fZBFaOnY4lzf5AUIW+MkOKU2vS6b18hgaBKXYJ+wb4D20iEY3iCabwKgh/hThBTmV8LmCXs2nBXuU7DR2zn3Qqmx9shY2WwuFttM6OHZ3dOgkTJS9ELXBZsQqIKxWcsokP5EjaKdxwZ0cjYZVtkDKFGKoXJ44nCKzlnhoMz+EH3lIDqmkXDwoeRQ7WfM+VPrOCgmz5lH3O+Q461wA3EA0xSjkt37ks6lkKOK7L6Zk7/gHl8I4v9ZYFF0fEa0mSiKs2xuiHKq/eyT79OvgpMmmLG589wekh4ETlPNSNhmxEJZE7Q3ZakJC+8//OMXRxI9KWFkXWRRuKWMZXxVNYttimKFCZInigApxrygFhneR1fUdsY6D+Oq7oJZEDXo/xCHsI8+qOSTX4eSF24H82QroOjBdx0gBJ/UR2GLSr/OFDJrJHEIqK1EXXaQeiWWEHxaCJEi2E9KiRrU6dp5JgqHcQRaRbFj3Dt5k+BFDmdPJgR83GAnHKuxgSbZ6X/LvxKbFBgKHuK/BfN3TVa6CjI8cdGy2tezrVJ/oXU6Wwt6zFhJ+QuLLU8vSGHJQjkDeHZm8NP8dlRA9x9+lsh8/AIAlJCKrTJBQqz3Z4zc/qS4B19gvezpLpIE+AqD0NwIa25YURArudjbBkT68q6YuMGGZdu8xK6ygrM6Z1sru0e8opstnq6glrf+05J4M9dIomfpksW5JZNh8uTv26aZBWQXSc4336ZrZMNKO9cYQ9YzBGaRn8DAZqK324F+J7px5fKSCAVA9YblqNH/cpekl3aUG8nqUXAqhSejSOv9zqZzWMknrsV4tmVJo8RmFiR9D+HXP90IllhKGyIP2q7E9XqcHvWQKgkI0lRr/+CYgApR1auS7AG9De58yC9NPlWroiAD+fYVCU6L7EE8mj9sjo6a/1SJu cAeyhDe8 DMpDZiEKGaWsfAeznN3OeMI1eTZUAJY2mx7gf+UNTxqiJjekaE1Uz8H4S7kVGa261mcRSl7rk6sOZItLyD6SLHmYtZcgiKh8gS6J+VFCTSdMgdBF/ZQT8Dh7Nz5JsylniskIPPGNq3Y8Xe95eJ+fzUpZ0EEM2ye12aFMgBo4ZNKjF7XieiONU+jiv4eUajzW7+Gsd/u3sdE/JMeBARwcN99sPY03fHLJVUDSyu1ntGmDC7QFS3sNj4eB9BigfIw1mlUwZZkUyh57wVZqLHNvTwJ9P3XKf6zvtVruaUofuMaE5mSyNzWAGr2sIDQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000029, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The commit 73f839b6d2ed addressed an issue regarding the swap counter leak that occurred from an offline cgroup. However, the commit 89ce924f0bd4 modified the parameter from @swap_memcg to @memcg (presumably this alteration was introduced while resolving conflicts). Fix this problem by reverting this minor change. Fixes: 89ce924f0bd4 ("mm: memcontrol: move memsw charge callbacks to v1") Signed-off-by: Muchun Song Acked-by: Johannes Weiner Acked-by: Shakeel Butt Acked-by: Roman Gushchin --- mm/memcontrol-v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 8660908850dc8..4a9cf27a70af0 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -620,7 +620,7 @@ void memcg1_swapout(struct folio *folio, swp_entry_t entry) mem_cgroup_id_get_many(swap_memcg, nr_entries - 1); mod_memcg_state(swap_memcg, MEMCG_SWAP, nr_entries); - swap_cgroup_record(folio, mem_cgroup_id(memcg), entry); + swap_cgroup_record(folio, mem_cgroup_id(swap_memcg), entry); folio_unqueue_deferred_split(folio); folio->memcg_data = 0;