From nobody Mon Dec 15 23:52:18 2025 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.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 952602DCC05 for ; Mon, 15 Dec 2025 14:54:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765810468; cv=none; b=b8CQWWpGB/WJOYvWhoFaaEDOKBCZE7jiSs3knLSHOHPJQHoBLQEPQVQ4tTUfZ3YoGmHc1x6+/GEIUUlyEBZF9HQPPmvgjOWG+IeaxPakY+NveQii62piVSze/WRO5Ua4cSSgMXPGP2sg0lLM09RoyEKErV5xDblKUYfFimG0A3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765810468; c=relaxed/simple; bh=MoG4M+eQZLvDl4DSZ2MDVZrFVLWD6KmmSZDm95qZAx0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MXuoQPoXJqvnkt5u8JK0X/CHWapivyHTaGVc2CkzrmH5lEGvb4u3FoC+MrkcAGCdlMogV5PdBc8b1DjFwTmclckPaC62PO9apX+LA8A6m5PZdC+U/vcg5+OyoebkdZv/HoagaX1EBIjSBPzgoYvkxFZwLigBKg9uBt6NWFD2YRY= 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=XJWdGkt7; arc=none smtp.client-ip=209.85.216.45 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="XJWdGkt7" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-34c363eb612so1934989a91.0 for ; Mon, 15 Dec 2025 06:54:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765810467; x=1766415267; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=S3roWa5MIiHY+542QEKCeiaGQ6v+8CYrzauDwIOyQfU=; b=XJWdGkt7R3tSStPyRNjFLC19McYG+yC/fjMfeUmaydzZJxmkquOIZlz9pgbHOHx93b 8SfuORdKexJGlkrOuiB5aneCk6d3WWsXv3BuFS3uZ/PMabyEpADk3KqnPPOeOjOfFkGh IqIM73DpqpiJxwIkR6vu3VBpzPPgfh2UtOzmDe3EVfUHNAqq2S6W5khmPs4VK31N57YB 9r+mIdaiH6XVaRJT6+h0JInuA6bBCLQrLJ8PUnb4qqdhoBXvCJIew31l4FtZ0ATYYwjK 9YXD7EaeSAoPwymnIbo2UcIft8CLVUwHKj6ho/m8EroAqvbfSU7opuMIIRJD9/AfRRxV e3Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765810467; x=1766415267; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S3roWa5MIiHY+542QEKCeiaGQ6v+8CYrzauDwIOyQfU=; b=HkTv7r4hgBDHAy6V+NAl85K2qQHmV7G/lh54WEVev4Au6AMGd1CcXpYY+dOjbOYChq jxvZBW1x89bQy4fwyN7WicEjPVtgx3X7lB7uQ9IQbxGCuEVSPh1QSAE9nyNMpG8W1wUG +uTD7moD+TziP422rrWMyHTi/JTvv1CqZ1zTgPCygKyTqYH0/7cSBVtA0JHuzB4tPHN6 EwI4VuzhMdCa0tpA7Yfj5xDX1G+vs53F3uv6Wf64oOYVNTMJGwcgK4nZa3WgDErVR9DA vSt+/isO8NmNzGgMOk1JZYSHxC9aANgZn+GX7tdp7X36TuZLCZdlPeILTequlZ6RmZC2 WJ4g== X-Forwarded-Encrypted: i=1; AJvYcCXVlI0xZGaAp9yotZ+TzTrhp/Yc0qPNNq9EtY3/bk00DaqIoXynwAjYNDDiHxeV8zoFt21xyN0sgzmoHQ0=@vger.kernel.org X-Gm-Message-State: AOJu0YwLNCw1doz7oGlRA4keOw5Ybv2vAE799qOski7hNr6KHfrVSToD iELV1TvQ3JTagsPWY9HW2UHQieQXuK+QYLcqibuARJS7EepcGz4KrFdo X-Gm-Gg: AY/fxX6cRkiLUJcpzvowJYgEoishKcNpCH8o0Oy2SGchN6sXMV3aevesaTX7QIOeIGT p8pjFOAzyqVQfeAO9qVqKZ+WrI04p5+ia+H+SyfJGpw5HnH31yEFMhLxbnCHT2KmgS2DKqtou6w Exyujw0OTwrVT61014s2QX/51h+zNtjFDxAVlx4QhdWU8nZVRy4LAivb+ma4yBtcvtbJMu/iFp5 l4CNHqW89/mJgP/ltZszN3zI5j6kUPjoM9IyUQBp0ReNNdg2wLKYGB2mT2VkFatENR3yhClwsi+ ijx7jGZw13RYPnnb2mQ4PtqNQZrtP/RbU8VD5TkyXp45eVGk2NX8JEeI3dJvUSTb+323t/yxTCw rtnzCEkD173xzBvaeVRmiVHMXW2sjlIhSYYRzzu1liLBGbxsvK00dUhuwLpukE/WwtwCFLM77AX tbwXjhewQ8lw== X-Google-Smtp-Source: AGHT+IG4GmC2JCSdgqBSfS3P0q9Pr3chOIKBF667RgIXXqBS4dAzymKUM3pzhVWLtqecRCwmu+IP3Q== X-Received: by 2002:a17:90a:d407:b0:343:c3d1:8b9b with SMTP id 98e67ed59e1d1-34abd768603mr9052686a91.19.1765810466731; Mon, 15 Dec 2025 06:54:26 -0800 (PST) Received: from ubuntu.. ([49.207.232.133]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34abe41237csm9396651a91.17.2025.12.15.06.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 06:54:26 -0800 (PST) From: Dipendra Khadka To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/memcg: reorder retry checks for clarity in try_charge_memcg Date: Mon, 15 Dec 2025 14:54:19 +0000 Message-ID: <20251215145419.3097-1-kdipendra88@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In try_charge_memcg(), reorder the retry logic checks to follow the early-exit pattern by testing for dying task before decrementing the retry counter: Before: if (nr_retries--) goto retry; =20 if (passed_oom && task_is_dying()) goto nomem; After: if (passed_oom && task_is_dying()) goto nomem; =20 if (nr_retries--) goto retry; This makes the control flow more obvious: check exit conditions first, then decide whether to retry. When current task is dying (e.g., has received SIGKILL or is exiting), we should exit immediately rather than consuming a retry count first. No functional change for the common case where task is not dying. Signed-off-by: Dipendra Khadka --- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index be810c1fbfc3..7c9145538683 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2412,16 +2412,16 @@ static int try_charge_memcg(struct mem_cgroup *memc= g, gfp_t gfp_mask, if (nr_reclaimed && nr_pages <=3D (1 << PAGE_ALLOC_COSTLY_ORDER)) goto retry; + /* Avoid endless loop for tasks bypassed by the oom killer */ + if (passed_oom && task_is_dying()) + goto nomem; + if (nr_retries--) goto retry; =20 if (gfp_mask & __GFP_RETRY_MAYFAIL) goto nomem; =20 - /* Avoid endless loop for tasks bypassed by the oom killer */ - if (passed_oom && task_is_dying()) - goto nomem; - /* * keep retrying as long as the memcg oom killer is able to make * a forward progress or bypass the charge if the oom killer --=20 2.43.0