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 2C1B8C369A6 for ; Thu, 10 Apr 2025 13:20:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D6A12800FD; Thu, 10 Apr 2025 09:20:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 284732800FC; Thu, 10 Apr 2025 09:20:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14EAF2800FD; Thu, 10 Apr 2025 09:20:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EB9232800FC for ; Thu, 10 Apr 2025 09:20:46 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 06B5F80B13 for ; Thu, 10 Apr 2025 13:20:48 +0000 (UTC) X-FDA: 83318194176.06.B3912F5 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf27.hostedemail.com (Postfix) with ESMTP id D70E44000C for ; Thu, 10 Apr 2025 13:20:45 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=hxn8rGUU; spf=pass (imf27.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744291246; 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=uvjpkhdO+uAITJ9R+WF0zbYBfmINwYKjsiOVdhMgoeI=; b=FMrbNgKvpBj8esTvY23XZJtvV0yLl4mBdIqoPFdWf9G6fk+rxkHkmryLjMDaD8PWFX/i8z BvdKRyvP/O61376IsC5ipMqrh/wNj9f0v8ghtcCM1A9TbT50QcesbtdcHJR3GVdPC4iLE5 d03b/5YSEPOX4F2KPk1k6RChK4siFjk= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=hxn8rGUU; spf=pass (imf27.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744291246; a=rsa-sha256; cv=none; b=KLCoWzWA94ISs+jEluz5HTn6m8ccONDA7Mk5ruLlZK0NYeR89GuZCW5b9k8bIzFOblGPYB YlAe1E7qu7vvkvk6bZSopFqWN8ufQpscsagc1PpnK5T3E308SjvRkXdYes0TS/lhEPoxMX fuEIQO+VS2FsA46DQ1cMgu3QaXJAdug= Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6ecf0e07947so8003586d6.0 for ; Thu, 10 Apr 2025 06:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1744291245; x=1744896045; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=uvjpkhdO+uAITJ9R+WF0zbYBfmINwYKjsiOVdhMgoeI=; b=hxn8rGUU0pRYkEWaZFSj8EdkN17NyAad+ncqhZgQSbzR1d2mz+7ByFJ3p/eKKHXw2U sTHYhJMEoHqK1yS5LE71hDAjJBWPOusR/UocX0v9mzqUMPIIIcfRGJOwlDmBmYjtNSGa MPstkNs1u5qiVqDT7RXwhutfBlP85eFqhx3B8pIKcYDhnq6Ux5CUi4eJfVuYVgtGRWKK fwGiv9IcEIEg2kfQNzAIMGWzhZuCNo9kUCHbFoP1Ng/6ASgOO7K/37KrtvuG+wFpSQq0 D6Y6pYPK2gSKLIUr6zvx2Gi7nbMr4Zn7zCDhxgxEm1Y4GY63/icfUJsKxKOe82zfMSgm x7Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744291245; x=1744896045; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uvjpkhdO+uAITJ9R+WF0zbYBfmINwYKjsiOVdhMgoeI=; b=Yy9mA3bRSXE/E5sL9jOkh8ca7Dd65lhR61ZqJR/soHeLP8ygbaGzweWelHDGz8jE6h YfPvxAn/Cq7JFHd+W3tKaz7MXK0hpz7TwVLFLwOcHDU3YMXxARRjcZO5jVsMmoeoMHQ3 F17op5+1/CnA4e3/iNe22LuH+Y2FLzXZ1NLWWJzpXq0YsXPjViua7WleoVl9/fj/6ESR VdLdgiavlaA4UBPjJbA4ko3wSKZcUWCDhMYd4bWnrKzuc229bhGp3JIE36MbfvFlQ/U7 KNrU4RUc6gJ8HgvTNhP55CIODBfW1E5HszWEuC1o/GnzqZ2VbEaDAD5b5O5MnWdhptBd EW1w== X-Forwarded-Encrypted: i=1; AJvYcCX4DQAWf3k9Dqx+IHAfNkw2MgjTjZ1w6crf78iaQdz7BgJ7l9IN3tVAq568QgKmPet1lXU2MP8X2A==@kvack.org X-Gm-Message-State: AOJu0Yy17QjHaoLanVKZCYcTq2L5qf8EJZ4Glj9dENjncQOxhLQ5pFa7 WWhLMZLYZSATCXLJj931IRyVeT41kC49gwtvwEOLqc5Xoo5Ob2tAEkX0eBcqUGc= X-Gm-Gg: ASbGnct1PW5gl1t8CSZk8ZQmaAwOVRYigqWrIyZhW9aMrO/vshtToWBmsl0VGOz0/b3 QxsvRWfM6jS5eMblzTHdgBiSHn63Wu4s2jv3usJxlcXjK0nvMTgM/g/U00pihakWW/+eNHvoR80 FWhBvjo/6DlhKLv3UXLFjxgedabnrTC+xILubGCc7xxRVLqZFWgHuPrxhp67IRzwBWbEyzDHoAi 721jjGiDJRabMB+pxZzFfjNi7VOl/KOmm1Ku982KfDlOfE8d03OKvbWRhsXsFSn8u9bYr4wnIax doIxnkFVyrqNykZBvJQTf+WWqmu121/hpJLDEt4= X-Google-Smtp-Source: AGHT+IF1TEpqq1y88DdCFclWrDEHt9sZ1im+VnXq/99xnonpkDH+Mjh4Wk8ppzfG3wbI3GnFX974wA== X-Received: by 2002:a05:6214:2129:b0:6ea:d604:9e4f with SMTP id 6a1803df08f44-6f0e61be51fmr45231716d6.19.1744291244756; Thu, 10 Apr 2025 06:20:44 -0700 (PDT) Received: from localhost ([2603:7000:c01:2716:365a:60ff:fe62:ff29]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6f0de95f774sm20638926d6.16.2025.04.10.06.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:20:43 -0700 (PDT) Date: Thu, 10 Apr 2025 09:20:39 -0400 From: Johannes Weiner To: Muchun Song Cc: mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH] mm: memcontrol: fix swap counter leak from offline cgroup Message-ID: <20250410132039.GB102987@cmpxchg.org> References: <20250410081812.10073-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250410081812.10073-1-songmuchun@bytedance.com> X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: D70E44000C X-Stat-Signature: 4p5bkf5fs3ugocod1wqwo6ru9qbgzp5r X-HE-Tag: 1744291245-114065 X-HE-Meta: U2FsdGVkX194nN5dpCb69ONGslHfgvECfx4UmLFB8cUgOjt2eE8jdxe73GtR3NaztAgk6PtGs7DgArXq3CRXIGGQHIqRhrAbYrajQBKtdnYRTwTOMB+W6nvpDMdgEl8c1CWlL3qAYZDCo3MF/ww+Vc23qAdl072etaBppPNQ26AhQa66SaRrWZgjOiYpNndTNQmif3WKRKDrGyIFg06S1sU9/umAKfxrRbDXvspBD2PR8pS6hhTJ8U7VfYkY8IBXPhTZy3jXMRjdNx9YxgOyZ6vqU5C8swDy9BSS/tBwT2uF2BUw/RIrruQ8xeKJfI/W0z/4EeYmh8M2nol2xYa4NXtDJiWWYjKajTwWMWxnq/p1kkzRT6JOMx/tmc1b/Urn0NM/axh/hqPjAH/Zfh/0Qtq29VLqixOv6pMd9m5DckkcycLsC+PhBI+O88S+kuXA0OMCUjEC0S2520nmj47kC32G2g/UyrJ5Gfv+/5q5xxbN5237fIeLc+79GDXpJWM/gF2kDVGSnqjUNdRyLzxHzAIwCPSxkb6iPg6sNL2fIu3BvAV7qfvNwnpnWQ+3P7GlB1sCKeEMpX+u5fBHuh8kC9osyXJ9Q82BxKbExOmiBBP0l5EisiO6aEe8wnkQtm1IIeb9yrFKkEPgSdP1pQ/LLEEFUzN8eWyDSMH8dSQpz4Eo1UI9dRoCz4S/HWGvjbljfZ5z7TRGDoPyWNC0cdXMchxi55IephDaKebCKFVslRwe0mgtoNP84qD5vdt7ndG59hHj5kBMrAWCoS+S7qDLIh8QT14ZeKvS9OK5M0Ty9m0dg4k4+AhTlnXC7c85hrcOsTE1QKVlFuZtvFqwN6zmlLMGoBygD9d3fYxWjooY4ADmoUfNb2bBi4mUc9bJ5q5LLW1M8DKQ5wnFuf6yBNIXzh4ONDbODFC+wRkepJAW9zoYj7v8LT3ddmWE0X/7sOcN12tR9qThbggGPLDkZZ4 WW0vluLh i1phoZOIuEpUZ+z21RJse1rELP4MdhNnFrStTCAkV5XehN+nN+lpIKlTG+haZEG6jGRkIerSZ0UXaUO07LS/M0OICrSKt2eNCFcsqAB02o6d8kOFg9hutJSzy0AzJ2ztBk4DYtBUnKV65ZD6bp8WqsxICW7YpuAnJ3a+5l39t8EGTXVJB6qJ8Zh3ugkGgsvr650MCl4Ya1/0RbcPwTqWpM2CqhMLUADWyQUfBPeT22xPlhtADZ9Ny5WiVvqiCSYsxhurxDFNQGxUlCoonPxIdCA4r9uJ7x0C/sJaBhphj7V5Qd+GHHIvqZNwinuN1moEk6Xp/LI0kRHragmMoQnUnrwGwbvzCgfvCHDQyIVghnl8ZAE4k9xBhFoO0iAdy96ajv3DL9x32TnRm+ywxuELA5kpOgUo6WcHHJW+Za4DlZ+PYlsfe7cjMzB0OKwaZURb8GEqU6VoWfLFZABB4eVsJdNgsNhixqw5LNNC5tLXeOEAyiZFVnba0TBRBjb8rDHFtennG 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: List-Subscribe: List-Unsubscribe: On Thu, Apr 10, 2025 at 04:18:12PM +0800, Muchun Song wrote: > 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 Ah, those patches got reordered because yours was a fix and mine a cleanup. Good catch. Acked-by: Johannes Weiner