From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EF2B2853F1 for ; Thu, 10 Apr 2025 13:20:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744291248; cv=none; b=fIH9VC6FLhiKEV38dN1Y10MLTQoIFDUg4gT7elsy8CBAyNPW9/MvSrqoPbxk8Je6FT8ZWwsyRExG8rh/mwwpzozv2YWp6/HIknaxdKdgFCTIdPtcqjkhmQIATu77C81U8E9uaBJ9QWklTo/BP28PqQKLXubLQHH/FPi0E2K9nwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744291248; c=relaxed/simple; bh=eF3229Ut/7oMgOC0TKNVSpPRDMuApGGwnqq+oOTJ5no=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=GxPcoKYyXcpPaBN1SUQ9JBtV8vTuj1ltCupwwjm8E/0qADF6RTTgvVMjQY807BQu8WxaEzO3B8lFqqtZ+zmSgiLFMI6rCvXECIVQrGpBmKbtdIzoMricxHMM2iTJHNLVmn5hI5uC1WzInxbCor9j5pA7t3FAlBxRuGGR+W/EMqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b=PZcf8lqq; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b="PZcf8lqq" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6ecf0e07947so8003596d6.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=vger.kernel.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=PZcf8lqqvrAaY63sOOmDIug7PYxfoffDKqKMQVQY5oEgTOIO0BCAcG3K0RZRqeOQ6c sSuSUgyV2tauswe0jv7/OfAq24zp08/l0zJ7EW1AQIkN7SvIpcs6mHKi+fFCAhacMYcA I4nBImutB5sKbuAkrqF2QHFLMBqwJifzsMf5+U4MHm456Eil0cwv7bEYReSFPQ3FL0Nv N+cjQACbSe72Z/5V0mENkhwKaduIXIsSFfF9qey61jB3/IDMZ5UxJuKuvz8a59e4iN/7 fBuERL0bQ/V4hm6ZUYowH8njgXe76JmaH5u6u+TQ9BF+jSN3ZY5wUwXuqlKmAZ6wZhYZ qIiA== 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=TJLZff3wAGea4Gehff8qGIY4mIVRdLhedkP9zWC0EfxiueXZHodCvvF/7BfprTQHmO Y7S/96Axs/bqW4aMyQ9a26buQLYIs097CcHXNbr97l1rhD7weJWo5dU4+H0I1VdBhVDY sV9EgAKxHWRuS7yO2lwlUQC+HjO0dYo6+mtp0rw0jZLeNmc77WT7H2MFzyUjDXWSe4Rq 1RMl9phZPpzeHFYN2W9lgDavN4w430SdXrshxBlRcV/se3Vw2zWT6//7F95+VC9ZKqAN gBy4QXLc+YS15/NzZ6hHdUMSyCvirCUrcj5sH53qHi3OWXbTaiJLZ4vap1SayE/IytCx Kzeg== X-Forwarded-Encrypted: i=1; AJvYcCUPEfIkz7Z2BG+wvihGNlte1zvHaae7tuTZl18uzRB129RUhPTjpDE9GUlVjcG4Su2CugbT0mnk@vger.kernel.org X-Gm-Message-State: AOJu0YwSJUNd3gSfPOa4Vzs0LN6kVJ5p+6tr+9T6O1G0ERIHE4sxjjIW uP+Kn4srXDw7lMmESTwJYzcCS3awB6RxtpN3Kr4ZT5GAoK0YxYszBW7TtHLE494= X-Gm-Gg: ASbGncum75ZvSDgHwmglNIDZtZWC9OQVPwpcEnBwSsS34Z+cheSuk+6BjSJXrSw/DEY ilSltb5YH5hyeL+shLUTI2cgetJ9VgD5CaFaezf3kZPwCDXjv39roFQHX680w4cizh5tPPuDKlP TZ0F53OVUCV+VxPHsjXnfnkacYgzwHI8alXbr9XuVife1xMmknChSBTcyVDzBQcEJHpMWDxjQNw sXpNwdSLm26xHR30yvu9OwLry6HUh+lt7199+qQ04OoYm1G7dK3hPyrPoI3aJFvKykTUaJNtcKW 1dw5S3Dex6r99Txx7+3j5I5FoPk3lHMQLAcWNgM= 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> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250410081812.10073-1-songmuchun@bytedance.com> 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