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 A5823E69E81 for ; Mon, 2 Dec 2024 19:11:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E1586B0085; Mon, 2 Dec 2024 14:11:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3906A6B0088; Mon, 2 Dec 2024 14:11:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 257F26B0089; Mon, 2 Dec 2024 14:11:12 -0500 (EST) 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 083F56B0085 for ; Mon, 2 Dec 2024 14:11:12 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6BF06C02B8 for ; Mon, 2 Dec 2024 19:11:11 +0000 (UTC) X-FDA: 82850961816.29.68D3F7D Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by imf04.hostedemail.com (Postfix) with ESMTP id 15CD24001D for ; Mon, 2 Dec 2024 19:10:55 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="YV8/wi3l"; spf=pass (imf04.hostedemail.com: domain of yosryahmed@google.com designates 209.85.219.49 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733166658; a=rsa-sha256; cv=none; b=ibyG//OFLKsd4DThSJcebi9g9t1zIBQnwKrEUIN+aGRr2V8PvpcrJHsR1ZgjW0TKknMuT8 K1Fdf3GeDtKKKtQraj5XCGVUq3E2FvRTVu+MZk/mw2kViG+GqGr7YaEJRS1IE7oH8UmJTG EDm41/IJ3OuN8Hd0riDmYzWsOpGZtss= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="YV8/wi3l"; spf=pass (imf04.hostedemail.com: domain of yosryahmed@google.com designates 209.85.219.49 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733166658; 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=9tZHNcncTzXBZ9VMwNXbeOxENgdTLEygyN7vzsxyigU=; b=JyZJ9wMr6njO6JCBSSJuP8oPsNqPzSErEcD2PsQFSgeRQTesjMwMZO2F1rmDvPUlJ3vJ77 F/DfCUJJhHaxlweC1LWxmMJVuwT2Az8wAr+TbE73LjXVhHAp3YjweUo5Mqh/x9wjJeIkY9 zRblv8lDm231PDqcFyJb2fpBU9oog2I= Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6d87e0082b8so30663686d6.2 for ; Mon, 02 Dec 2024 11:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733166668; x=1733771468; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=9tZHNcncTzXBZ9VMwNXbeOxENgdTLEygyN7vzsxyigU=; b=YV8/wi3l5nNfZNIQQ2FKNuw813bYsyknmfmSrlewfQKsFh25sMGqtwUZD1kviIS2gX p4plH+YMQttNnMzqFsG+WDnXBCHUNzgD1UtnoA8BZQgvCLYWOy71pL9Mp7pQAHIKAI8g FuI996c/Ajh1dCUAm+sjeYiN71PbnlHi57hyb8446CPdd+1mQ7zxhuPUPdRkufDYUr6f Ns00Sy/wJGtSTCuxG3KYgr9XfFJSUlJCIau4gfMHQU0SP67ZBgKtkg7z2M2arEDLFrkf yIr2LXIV/+XYr6JE2zfKJ5/ex3++DJu4lA+B7Muwic9onwzjdm+yYefdQA1+wW6Yi2UA Pt0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733166668; x=1733771468; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9tZHNcncTzXBZ9VMwNXbeOxENgdTLEygyN7vzsxyigU=; b=Z0dC7pagdxHYhbwncdnFwwgTHqK3iV5lbGGJD4amnIEhVLOx1RMBhxdxwsUpb0tcwK 5aJ/5UKITITrz5+X8KEEr8Nr9JuAAQjtM1EPhANRFHMmE2P5wnF0nxZO+F9XQPMEc6n8 UhSx09VO/qs43HsTxaZbIjVro6G9PkbnReNwA0s7uHavl5o1jW0d7Q+Mph69yOx84mPu S0uLpOJMI02aTsBWvXwqEDAzRb/6cCLh+W9d22aToOHnQEod5BapJ6hbaJn8QIxnV+s5 ZPOJTzaiBzagLEuHqt9CowtGjQJtgR0ufBjbw8gUNRFswQ21OvTE9v5KevA6Z8SObeV4 4gCw== X-Gm-Message-State: AOJu0YyElGRBQXQ+1clic0hQEG7hE9M7Hq8Grd4fe+M8mGG98GcyYlpT OcOxOHgnPfmThiT4ZpCa7DY1yXgGm/FDzQ0e4D6XikxhXoHrOepMqYeiE6t7gh+A146/yvUnhOV 5xsqqIoMAbb9bNUg+LvIId23dejxLJOzDSE+a X-Gm-Gg: ASbGncv6UagjX1YtLvdm1rS3i65qg6gFSa6Mru295EOxPNpOXuFrZPXbU4YuQSHqxit 9fwpKtFLTUMsAuuEZsHePWu3YJMvS X-Google-Smtp-Source: AGHT+IHOQnSlFzFAeAKUYgKdEL1GA+HhzSuU7YRO9Wz/mhvv9hGBoppdTHpYn35KpsBM1Hn+yp79IJKjwUYS4gmLbpo= X-Received: by 2002:a05:6214:2682:b0:6d8:9002:bdd4 with SMTP id 6a1803df08f44-6d89002c59amr247159806d6.28.1733166668142; Mon, 02 Dec 2024 11:11:08 -0800 (PST) MIME-Version: 1.0 References: <20241202184154.19321-1-ryncsn@gmail.com> <20241202184154.19321-2-ryncsn@gmail.com> In-Reply-To: <20241202184154.19321-2-ryncsn@gmail.com> From: Yosry Ahmed Date: Mon, 2 Dec 2024 11:10:31 -0800 Message-ID: Subject: Re: [PATCH 1/4] mm, memcontrol: avoid duplicated memcg enable check To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Chris Li , 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-Rspamd-Queue-Id: 15CD24001D X-Stat-Signature: kite47t1cpit69xw9k7ttj57oh3oyd61 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733166655-210877 X-HE-Meta: U2FsdGVkX19UoFQgT66L/Eba78+/pqq3oZPdBrBjgxsZHWeuY2O7fuKGbnkJAK/BXLIauavMFE8J8PkF1PLrlrLe3JTc8tx9UmadtNhEJfPHGTNPfqwEwbyQpNG63YJSkoi+rAHrQPt821Z3mq01G4zPF8gRPEzJYwPNCxPe+JRVCBjLXhUQvGgYFw6fqqAdjcAsNwbcSUbJt4AV8HepuBYQ9v/306JmeHRw6caFQxkdFjO4ynoLpd1j3S4mC1yBPXCmTepVY1pwou0eaJzmV/L85HdL+KCCR+xTOtrxwrlgsL5DOc1HLxAAKXuh140wLBnmyh3geSfFqRR384xMhSu4I6rNFbaUx7raFk7YOhAVTt24HmQIL1N/Fa5PluwVNmYwkxiCxmibTWaNp1uCvd2mtPbORROqV6sWK8SaEVkdO5KvtkzSLxOLuiJOou/F5ybEex5lFRO41JZ5w8CKPr21K1zIf3ZqVdMvDrvfZgoi983lpuyp2/i6cgs6XJBmqQYpJbfezYyur2gPwn6JgGfaDVeazo9zf68tLFz7BBCF5KHxd+Z5+Yqp0ehQqK7ZIacIXCL5zNbJ3PyY0n6z2RtJXFuKpuWnt41KdZr7zC/aEjId64gLkeMB58A8lqlHasa/Y0VcUFuf9Qlp5oZ/cG7We6nnuSbUwavGdv/H+AKkV8amM6I5Z8FjCTW0Vwt1rQbTkt9H6rvwczDrJGpWsPcAM30Fvj/4ruDYaIIvqrGDtv2asM1IVF0lwGfEigz1Z4vc5/r0AJg7je9gjLjsoDOdmIcNrR7uEslsPXsMpnw19Y9SBcu7TE7ysbcojjgW4pDg8DkuU1rryaV/wuKw+ZuMlJTneq9aEYahh8hhOY52hfbMezNVkYr3xWqEvPbij9S6BFZAvYvIbs2s2PT3HZWj/BANrizjolJuiFQE9hmYgQ9ocKum3rqFD5rWQls0MeIzoHeHLhffw0DP4Tv aT8TALx2 KRGtpXrHN08ASa6ZrBcmORFjD1zDvI6Ec9xbmv+JmfHnJK3dWq3jyohEXB9Ek31SUWHlSDgZgtP893akHppDt4ASPeDRtDTJKOEftXEPrgYdT1oISNAvpeRsYSE9DQjqmZ6AErK05uMIqPrAvuVzzfmDMTEP9mPytJtlyZB5ud+xgctRPhcciD40KuSBoecdYtNQER03kFGLjTA6odNCVWJEtZf5yYxrovITAqxftcSQvwZsMSpqgsIPvSJgJgFYLitVusEf13F3s0tA= 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 Mon, Dec 2, 2024 at 10:42=E2=80=AFAM Kairui Song wrot= e: > > 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 en= try, 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? Anyway, FWIW: Reviewed-by: Yosry Ahmed > } > } > > -- > 2.47.0 >