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 DE174E77170 for ; Wed, 4 Dec 2024 17:06:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 711A66B0089; Wed, 4 Dec 2024 12:06:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C0926B008A; Wed, 4 Dec 2024 12:06:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 589126B008C; Wed, 4 Dec 2024 12:06:04 -0500 (EST) 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 3D5036B0089 for ; Wed, 4 Dec 2024 12:06:04 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E0588161184 for ; Wed, 4 Dec 2024 17:06:03 +0000 (UTC) X-FDA: 82857903660.07.9BC9B73 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by imf05.hostedemail.com (Postfix) with ESMTP id A7F9D10000B for ; Wed, 4 Dec 2024 17:05:33 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=mNUb00zM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf05.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733331955; a=rsa-sha256; cv=none; b=VAK1dMt/EXKSISHdWSlsS3iIyjRwTrMObk74YO1lopBuvG3OMVpuRSWClBI2ygLcYpFU08 r6w4tbo3tltgDrW00zuuhEa6XhNQpDxv9ImXgub8M4h6Tq17R4qDbpY1u8a1xtUt3JuPni e9ps5Re29E2kA0SaypX71niVmFPNm1U= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=mNUb00zM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf05.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733331955; 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=+oKz/iIFSJt8QV4dTWE8NqIm8tqA1k/wjDtf1ROk5ho=; b=7I8yPeA/9YNTHpFZdVLr8f553okyTsoS6VCeLAfwM6+WpoJV8AJvgwrdEqoN4r7fgOt2dD rmmFNvWulepekHKssmNN1cTUerJ/EbsOCf60N9aKFAPV5gLMLV0HrGq4fcGBBWivmX6Kse 3bQxUy6XdYaoUP44Lv5sD73txaosbVI= Date: Wed, 4 Dec 2024 09:05:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1733331959; h=from:from: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; bh=+oKz/iIFSJt8QV4dTWE8NqIm8tqA1k/wjDtf1ROk5ho=; b=mNUb00zMmPKJLU9WWW6DAtG2KbV2BqOuUIIQutxjmnUHKd7oRf4XaK1YklQJLb1egmpyt7 llDzMq7U9GygeDGRAavdF4005NxaQLKaAuheduXysjWnX2aYiT1pc4oWetukFMp7OnqmEe BK9EOgl3yvbgGJccBwl7j9uRm/wPfe8= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Kairui Song Cc: Yosry Ahmed , linux-mm@kvack.org, Andrew Morton , Chris Li , Hugh Dickins , "Huang, Ying" , Roman Gushchin , Johannes Weiner , Barry Song , Michal Hocko , linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/4] mm, memcontrol: avoid duplicated memcg enable check Message-ID: References: <20241202184154.19321-1-ryncsn@gmail.com> <20241202184154.19321-2-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: A7F9D10000B X-Stat-Signature: j4ydbx6fcs3zmtd3nbpxyzkoytkchhd6 X-HE-Tag: 1733331933-915427 X-HE-Meta: U2FsdGVkX1/OTMY5VYr+J5ALczg2XCTRc/MsQwgfkvuaHgokKFrnaFfI4rvqUnQ0Ci6Tw+usY5t1ittChPHlDLkiRb4cZQBEAeKOIgXP4n44/W4g5zA4C8ih5og8+iZDaS6AzJBq/1yiKZbtUfQTkyEVElLRgDDmWszKQiBY7cQULFv3tMTehZeQJiCeRnltpmcXVJnEROFlRpXKoaTXbuEL5dvpQRdNfd/mWdx01O5wwvj7fJbk+N5Z0V/L3k+dokSAyU+Lq31WuhGcZczdVOBoswDG32aIJ+HG5tYy85wPtHjnDLzh6G6XhiDjsA6X67lMzPbs4aMHW6FY3PV4yX9QmOVSu/L/ieEfLb5IrXZRy9Ve4vkQRPODzGNJTt1KwEtwjh3HgL/v1iKkuapNwc1t3Us6qtYzUZaXUoHyXW0HbNHHjhGCIp8baGPaBewvqYoC3QvKAA/kUngEJ3pgK7w26mquAWKVlMTr4rwQaSiz0G5ev0kkI8lT0hsS6a4/WIADgDys0u95X0HHpr9rGeVmVV068pqrzIJHDiGj9sCvhmg7QnUVWFzMtxlX/xiboyltkKveA4EkaLgrEeTYjsieb0WWM1earAggaBcret3ZliGPR6qAm+jNGn9qmSpL4Uk0drBXmMybnxEdtUFeKOJw6mey6FD+RchHvKsaVia6W7+snp0jq+79ih5FFQnLfNXcpEkNETH3L70gf8riODvgJHzLE2KqBAtDLbDSuqegr+1Rs9X+gqaLjArBuaUxmHqD1gmd/z1TZ/mnMCsU0kVqfcU/Yz53i88ewCKwVGgulnyv81Lm8ld+xqvriiiiBwrY0RjOPBKbdVU7E/XwwAiEiIP8d4FUYf8dPnXCTnmlXv0Bw1XluAXL8Iq3TprJZxqBbCKu43AK3vfjhG7qWXdPuB5KUC9Eeo5ORgV+NPIoWrlh2ghaxAdtWEyKQgp7BtoyXxGrxv7wm9q7Wki dsyZlHo+ gChWzBjNNK42w5Ap1F73B7TU26kTMCnn0mKDaIgqW3+6iEX9IMkgSNV2Ny/NwgIGq1M3uSexyP7i0KERU6azusgIRquePc35m/2UA962+Y3E/IwXO3Od81mrKxLfBR5aMX2+sTCPnxhCNqNGIybdbtFMFfAeIYahotEzlw/6PNcJAkQPvb9ABTLxKh9pjUBapYQlSJlQbYYDhjrLwCBjmAzvt6DnceqppMJbjZ8O/u1KCfNq8qTUzLG5WGg== 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 Tue, Dec 03, 2024 at 04:25:57PM +0800, Kairui Song wrote: > On Tue, Dec 3, 2024 at 3:11 AM Yosry Ahmed wrote: > > > > On Mon, Dec 2, 2024 at 10:42 AM 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. > This sounds reasonable.