From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (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 EF6B039184A for ; Tue, 23 Jun 2026 18:01:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782237691; cv=none; b=QRmGd1uj2jjxBSBNgJiu1i4azSanmFWfd/QXUBJbLrdkqekwPdR7ZYNLeYDKjS33RHsncBnAQa1jtRFG6GjZUguk8zvj1tc7IZ6N9dz6jZKIqnQkdcr0hkTe6QSaGFJUp6FA2An8zDRTqBa3KL8TflOhvsC5I23RxWrqDJFwWoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782237691; c=relaxed/simple; bh=ZZ9V3z/btQd038efIhrlg2T/8T5h48YyZVg+hDwwQEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oEswWWB45kw8iD6ztzV20YCkyNOIEUjv8cDMkzVx+BeK1cnvfTEP9EKPsahq/SUv7Uwrpr1NzIP52GVy/sB30BBoJ8y8tODbdWZWXKpAZlGjCVTRRxOWFntznTDWEOUlfV4YLWICLM0+lDwgbtlmO30z038TGeIEjHN0ZRUfeTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ptVNkGT5; arc=none smtp.client-ip=209.85.210.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ptVNkGT5" Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-7e93a984f79so144185a34.1 for ; Tue, 23 Jun 2026 11:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782237689; x=1782842489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e0cD7xT/1LEgCqENdxhvxeeA9K5MWSbIZS67SSvT22o=; b=ptVNkGT5QQ110GDjmiow/PsR15hBXV37lH8sSIpe4PZ7E0hhyWCttBtcFpyRsSfGT/ 6Fp9plZ17G6q1d/srcU01z1QTlEp7vy68y/M7hMHac6FcfOn+l7pWw9CQ0j6MNABbU/f 3QC+xLccvpnQFInRiPwv1DIAapTzWiI5Elx45KT+xgJg0a+WjrBtojJbiYiq/6zw1Mfe 8jexl5FUplNF8xxIPJHZiyXiBYT+Nbv0I+1uZcdCnvZ9h0n5wMV5/NBue3M9mbRunvDv mLhpjsmSeGq3qeu3IS6h0ZgBrRvzyPEOeD2UdyBQ1ShMZ8agHfFMc18KN77MxG8FOcLc wK7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782237689; x=1782842489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=e0cD7xT/1LEgCqENdxhvxeeA9K5MWSbIZS67SSvT22o=; b=Yejx0os5rPUTXdN7RAO8s2EkWfeePYfeyGMV4y30QuHoIEHByqPu/iM8B7oXUqIKXJ es7xtiTyB86lTB4Gv+MV4eQtknl/5P/Jo20b0IItbbC4qDlduNz+EOGTDLmEmFiBXOE9 cDLJfNzI7XSnwZoWMqfsphZ80KJF1B9hvMC16nm3EjRPxyes4PRbFKaqAb/Ba1qafj5f +1vThPs++EMuhMPAKvAOolVVhN83Iz/BTQJrZDHB8kTXO/ZGz6CxhMtTLtzu9/lRDoJM MOxuNfS58rQk+joE69Qn7Eo5L5H+0htSIsdK7Eg+tZBlSft8jJDcsdUetCi9zfMK8QQb 6lyA== X-Forwarded-Encrypted: i=1; AFNElJ88KT2XRKPig1cAsp8tQg6VSqCHP9RBYzx+fDVOU3GERHXrqzWclGgZhsR0WqTlZZvqxq7QeOniOAmqJWk=@vger.kernel.org X-Gm-Message-State: AOJu0Yx23mjnKsF3GyciLUpJW6tzCvrFnedGjyIUcvJMzomRiqS7QtS2 YL8dyjnUGiT0PbYJOhTSbzLfPK/5zUUpOGOzG4j5qC5M1aQP7ZUTEKDr X-Gm-Gg: AfdE7ckPtHqe8xl1l+f2hsPhlXOBsY0dbbJvVMY138sj8Ie5xr7VtMypRRhfRUnmG8X BxLM6o4S7inefIpgMONnDLFS9uDa9HBpRILjp8QVxDD1Eb+4cmH/NXmfAVVsa+FOjnerbVcOL7k q7nyBDunKlGGN2cOcIrBsJFNA/Z7VVtgBQcxN+OE6F1oljxh7wybLZSbVHNMaZx5f0Pa7Fx4Cvv +6xiA3jRIMd/vytkSOoUIr3d2Wl5odZBc2Fjr73KuqnjudyWyKDXYQPQDn9AVW1ZmxJdtWZ04NP sFgL7KrwdO/Rnz+Nfkpd0I9lLdZXthxxZSyCCXMeEWdVzCk4yqm6cn/V0NfRu0otRLmhmBrz4qQ G/0jOSXrrj4PRiz8wflcVwAJ1+QOW6GUAUMMLWyFCPs5SzLpVPYSefIZMRsQVUnIxgoeB30spKd G0Djm9LB/f4dF7/vm6UEqPdBHjwlsl/FxZpCFti3+EDg== X-Received: by 2002:a05:6830:210d:b0:7e6:ed97:ce5a with SMTP id 46e09a7af769-7e986a0e11bmr74036a34.4.1782237688802; Tue, 23 Jun 2026 11:01:28 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:b::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e94424c93fsm10349972a34.14.2026.06.23.11.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 11:01:28 -0700 (PDT) From: Joshua Hahn To: Johannes Weiner , Michal Hocko Cc: Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v4 2/5] mm/memcontrol: flatten try_charge_memcg control flow Date: Tue, 23 Jun 2026 11:01:20 -0700 Message-ID: <20260623180124.868655-3-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260623180124.868655-1-joshua.hahnjy@gmail.com> References: <20260623180124.868655-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor try_charge_memcg by flattening the nested memsw/memory page_counter operations to separate the logic between the two. When page_counter_try_charge is made stock-aware, this flattening makes the control flow easier to follow since each page counter now has its own success/failure paths. No functional changes intended. Signed-off-by: Joshua Hahn --- mm/memcontrol.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 56cd4af082326..306658fd55512 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2616,18 +2616,21 @@ static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, batch = nr_pages; reclaim_options = MEMCG_RECLAIM_MAY_SWAP; - if (!do_memsw_account() || - page_counter_try_charge(&memcg->memsw, batch, &counter)) { - if (page_counter_try_charge(&memcg->memory, batch, &counter)) - goto done_restock; - if (do_memsw_account()) - page_counter_uncharge(&memcg->memsw, batch); - mem_over_limit = mem_cgroup_from_counter(counter, memory); - } else { + if (do_memsw_account() && + !page_counter_try_charge(&memcg->memsw, batch, &counter)) { mem_over_limit = mem_cgroup_from_counter(counter, memsw); reclaim_options &= ~MEMCG_RECLAIM_MAY_SWAP; + goto reclaim; } + if (page_counter_try_charge(&memcg->memory, batch, &counter)) + goto done_restock; + + if (do_memsw_account()) + page_counter_uncharge(&memcg->memsw, batch); + mem_over_limit = mem_cgroup_from_counter(counter, memory); + +reclaim: if (batch > nr_pages) { batch = nr_pages; goto retry; -- 2.53.0-Meta