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 2A570E74AC9 for ; Tue, 3 Dec 2024 18:28:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97FE66B007B; Tue, 3 Dec 2024 13:28:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9098C6B0082; Tue, 3 Dec 2024 13:28:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A9836B0083; Tue, 3 Dec 2024 13:28:45 -0500 (EST) 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 5B5546B007B for ; Tue, 3 Dec 2024 13:28:45 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1DB75C0B71 for ; Tue, 3 Dec 2024 18:28:45 +0000 (UTC) X-FDA: 82854483180.27.C6C7606 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf09.hostedemail.com (Postfix) with ESMTP id E9F4C14001A for ; Tue, 3 Dec 2024 18:28:33 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hwL75Ckd; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of chrisl@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733250517; a=rsa-sha256; cv=none; b=UNlWQz1ZkuXPcxqfy8qzYkaDDivKhsJkJTxLMBxNk5cIhW2SPLew1qRBrWVUSCnJO8caSe Clv/eHYYBaviyZwER12nsLig6mRi8PDPjy985YvczYX7Jr15wVNiABtwMB0NtHjZ6JBW46 QWMb/9L2PouE12eK43lMVo48D8w9THM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hwL75Ckd; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of chrisl@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733250517; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=87z31lpITkuhRJyh2d3MUztPvJ7gFY/CejLDwXSY6qA=; b=ht5z1F0ibofOScvB58ww2q+s5AbLYK5KTH+VXv4JuwSX6ku3FSkpVO916qk/3R0sr1BWv7 f2yNdKHLM2B8677vVnXqOimdX0T4d2DW3L2KPq2q0WxTxAKZ4+ogq8+tGVjwmrVEldiw4Q khSm5p3P7xDdMG1ii+xSYjvxXN0tkLE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D99A2A418BF for ; Tue, 3 Dec 2024 18:26:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8FD2C4CEDD for ; Tue, 3 Dec 2024 18:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733250521; bh=dAqSBQldDaZM671klLg3Yg9EMBKSJ+lOZ+zy13Gx/6Y=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=hwL75CkdeBDhrjUsHjwt6FxBozK3oio/abGFNlYmVkF0YdSZJbxWk7Ze6cOoBAsy2 zkPp/crslZWdv1roZaqcWQsUUcw1Lvwh4FxFR8vWqLB+j2Ps+fhl8MeTWVc0ovg/k1 TcxAICEf4qgBkvIjqN9+xei+Rkq0OsAxzQmZ+x0qXS5U9YbifqzmQ4u6Y4y+PxBjrr j5wYgnRZUxtePYjI099/IKQLM7KyGXJW3x6M2Yg6asvj8avpaNMniajCpJzJ+c4z36 5vyENYiw8jYJBCJHARQZcc1yXpRWXSCsOWSkebUYpAMfDn8ECGCXmoL34zuwyLJn/D MntdrE92jHZpA== Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-6efa08f91c8so24898497b3.1 for ; Tue, 03 Dec 2024 10:28:41 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUdAQaJKwUOKMUUasEnCMVXysjDZRYfYmly6qwZvA1KbzC1cPISDXTdEhWRj2Y7yBiKL13gDNBT3Q==@kvack.org X-Gm-Message-State: AOJu0YwbeI9uXWfQTCQDZhsy9rLIQYLqhgJ6wzn0RYeN22xNFTtqnQ1y VFMISeqdQRXJqRhtQ72lCFs0UhwCipQC5e3ipCleZWI8Vk9eoZxVnr+viQV7UOGGnDkPXgA3qGx DOOL2hMuVx3ZjcxV+ir2nRW6QTIeH70TAuJUlQQ== X-Google-Smtp-Source: AGHT+IGNscgGi/J3gltdmjKTXwoNsW1FgKvacF3vttSA4/t31ZEm4yvkbQRpe7jS+6C9t00e36FkVfR3giW2+ryb1As= X-Received: by 2002:a05:690c:6106:b0:6ef:910d:7847 with SMTP id 00721157ae682-6efad1be677mr52023427b3.24.1733250521018; Tue, 03 Dec 2024 10:28:41 -0800 (PST) MIME-Version: 1.0 References: <20241202184154.19321-1-ryncsn@gmail.com> <20241202184154.19321-2-ryncsn@gmail.com> In-Reply-To: From: Chris Li Date: Tue, 3 Dec 2024 10:28:29 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 1/4] mm, memcontrol: avoid duplicated memcg enable check To: Kairui Song Cc: Yosry Ahmed , linux-mm@kvack.org, Andrew Morton , Hugh Dickins , "Huang, Ying" , Roman Gushchin , Shakeel Butt , Johannes Weiner , Barry Song , Michal Hocko , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: E9F4C14001A X-Stat-Signature: 3hkbzhj8s4ypferfxmocuzsgyw31wntq X-HE-Tag: 1733250513-157289 X-HE-Meta: U2FsdGVkX195MMVCMo1zUVDgVUWtYNH+yJafbtk3D+1CUOn21h7SjdQ/zUS2rINdg4F+dQxHcw2ZaLJj516cJ+h5i53It9OuUUQV/gUJ8ZPGfvxnTlXPZMrTARRNIb/atIgQMwsJtMJe3eciDzukUCXyZ0UlhQEjELN5Y/l7UkqtrroxDbgCcBgJO1LhDM50mWKj1wk9HuruQNIaa3Arh2j/reJmQFVw3BfFo3PGePiLZGdsWH9rmEGrx5vL+0xLWCxtEWgj7+WHSb3bHAKprHjn216Fw7YX3MKh4uU3pWe2z2fY7ZlM4ZzGU2lTprcdSzUenn+hx8ypOnGFqEqdBerhfvn43ymLx4DecSzOVB6UkXDZv2IBdCKxHZUJKlNkxUZNyOAdKdfAZy0+Fbq6Rlysc6U6wdembs55+gzAFCgzVjRQ6fxUYB+zTGbjl81E6TNx5tBg8BORPtmjKQHGK4/9Hfpaf4zibj4uFXxRcewFKhcc8BEJv5lNuVnkPNeOEmrGGUGUiYQ6cy6T+hIONBlDyvAdnLr8Bu0f1VbVlTyGgD/NW44kEBdgACrVBfNK1uTs3/cPXZ5I39DfEdl13S9O+yxAA725N0HSycl3Ts0DP3UxsGDFj30ECVbLeoJIxqMcFzsWUZiNdVDe3aZ29kQsExTErC0sr9wGEjVjpypyiwqzwIUe+B9Qs/WPhwZv/b7knJyGHXrlhJOyOAtv0ItOBYpWgvmjjCbo/1Vs63VoMUFwFNjBtR+nHLgUjll6m6A6jTCvZh5cAqQDEYn49eM+SrrBY4+aUPKGi0Z9VjV4EaETYXm72a3U7Ymbs95mPRSvR3LgO4QoNx7sung29yjcFwY2HBhihmjwSApcmw8JRp9XW9ikVB6UPArc4aAynHZBjyEMM8wN3ipB3VMG+jZIozVQpRKlAUWGKF2qTf8P3B1yMYMmQ55x2xo68/VZmnfM1LIfDs4a3cerobi VTDjVZqk mANMoUZqRV8F1iiP9CUhmP/7T7wJeXhEUfSyqtKGjs/p3Lx5Wa/e0kjz1JHjI8mi6jdalSK+4QbPv1EIJbaRLmEptmW0AsP3oQCjJLV9XOz8g0AJWA6EZriIWeSdpJwYhCJnhpWtbDepAf6dkTfjPAfxJqQMqfGNuDS0vqVoZWvB9/Xaizqrwy6aSnjwr1XBgwwo5bsKubzDQv2x4G1i5REmWQ69T0c4hXpeY5SZTc4UhicJEBOHXinvgbyDEZjMDhZAt3Tqfw6itQ7gzfiO53Q+f9ofb23ZKPwIWX4YqwJTa6Zj1RE/A0XHboAooLts08hTZNUatW2/oIt+NchJe2/l3spE71l2e7IIqDSkw+DvrZbyNkVhyRhxnw+0mJKsS4TrU 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: Hi Kairui, On Tue, Dec 3, 2024 at 12:26=E2=80=AFAM Kairui Song wrot= e: > > On Tue, Dec 3, 2024 at 3:11=E2=80=AFAM Yosry Ahmed wrote: > > > > On Mon, Dec 2, 2024 at 10:42=E2=80=AFAM Kairui Song = wrote: > > > > > > From: Kairui Song > > > > > > mem_cgroup_uncharge_swap() implies a mem_cgroup_disabled() check, > > > which is already checked by the caller here. Skip it by calling > > > __mem_cgroup_uncharge_swap() directly. > > > > > > Signed-off-by: Kairui Song > > > --- > > > mm/memcontrol.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > > index 7b3503d12aaf..d3d1eb506eee 100644 > > > --- a/mm/memcontrol.c > > > +++ b/mm/memcontrol.c > > > @@ -4615,7 +4615,7 @@ void mem_cgroup_swapin_uncharge_swap(swp_entry_= t entry, unsigned int nr_pages) > > > * let's not wait for it. The page already received = a > > > * memory+swap charge, drop the swap entry duplicate. > > > */ > > > - mem_cgroup_uncharge_swap(entry, nr_pages); > > > + __mem_cgroup_uncharge_swap(entry, nr_pages); > > > > Would it be better to instead remove the mem_cgroup_disabled() check > > here and have a single check in this path? > > Good suggestion, and the kernel test bot just reported > __mem_cgroup_uncharge_swap is undefined with !CONFIG_SWAP, so better > to fix it by removing the check instead. Agree with Yosry on the suggestion of calling mem_cgroup_uncharge_swap() instead. With that. Acked-by: Chris Li Chris > > > > > Anyway, FWIW: > > > > Reviewed-by: Yosry Ahmed > > > > > } > > > } > > > > > > -- > > > 2.47.0 > > > > >