From patchwork Wed May 29 15:49:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 13679139 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 F26CCC25B75 for ; Wed, 29 May 2024 15:49:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73D9D6B009D; Wed, 29 May 2024 11:49:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6ED466B009E; Wed, 29 May 2024 11:49:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5DC796B009F; Wed, 29 May 2024 11:49:36 -0400 (EDT) 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 3E48C6B009D for ; Wed, 29 May 2024 11:49:36 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BDB6B1C168A for ; Wed, 29 May 2024 15:49:35 +0000 (UTC) X-FDA: 82171868310.14.02301E4 Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) by imf23.hostedemail.com (Postfix) with ESMTP id A797E140002 for ; Wed, 29 May 2024 15:49:33 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vUDJgssi; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.179 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=1716997773; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=iT76y12aHL4ImtbcXTa98+kFBHSfVFYyCaRgIBXgWd8=; b=2BeR/ODueH6eYPuc/kcaRk9aUDSIJ4VgNGp6S9cEGVVheYE/ddX6gSLoTFgIF00pvgczwY ud2Z/sugTQb0XHrFWDB7xxZgc81osJ/vNPvs35e78vPp9AJ5Ddz2nzSdiVnnFR6ecs1fZb 99POMfbdErYip3chLiKdavpcXd38kGE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vUDJgssi; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf23.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716997773; a=rsa-sha256; cv=none; b=21tN3fZks9LkUW8N6bK9HykWxN0IwQhmGSfdCMLOMOQwJvWWyUdKgpDMNknB9+Qx0Y1sdi LD+B1Cfk7XY4Z3bGeUiX2Xr3rEkOMBU9hDqy0yODVF0/eCdvpsImeRQAjY+rEdPisbzfYn DeC377sKlz5An8rN8a2DiwHMY0VqmAE= X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716997770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iT76y12aHL4ImtbcXTa98+kFBHSfVFYyCaRgIBXgWd8=; b=vUDJgssiVKzM3a+MnBGnLQwbXjVcO7oKlRNifePZPj2q6omSHZw1mErz5A9VJc19ewx1rl 51MNKrjdb8eAhb19hXOPGjChWLjJ4iV5cQ9qT1Mr9UiuVXYMp3BY9D1TbI1zdrQgcaBxwd x2hfIAyah1AKSghtNZLjn+43mbq5d4Y= X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: riel@surriel.com X-Envelope-To: roman.gushchin@linux.dev X-Envelope-To: mhocko@kernel.org X-Envelope-To: kernel-team@fb.com X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: syzbot+17416257cb95200cba44@syzkaller.appspotmail.com X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Andrew Morton , Johannes Weiner Cc: Rik van Riel , Roman Gushchin , Michal Hocko , Facebook Kernel Team , linux-mm@kvack.org, linux-kernel@vger.kernel.org, syzbot+17416257cb95200cba44@syzkaller.appspotmail.com Subject: [PATCH] mm: vmscan: reset sc->priority on retry Date: Wed, 29 May 2024 08:49:11 -0700 Message-ID: <20240529154911.3008025-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: A797E140002 X-Stat-Signature: 7ebnd3ygisrbxr4whzichby3s41u8mz4 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1716997773-784836 X-HE-Meta: U2FsdGVkX1+lmRDZpAvP06Qh87E5WWGryIACkF7re57Gou+lWdW5mrVEySMEHVEm8ezYzmG/AuC6b5Mzc0cD4rA8vodB1Sqo78ncPKtgrvK1sTBRG/PyzSz/c76r0bbQHtsoyStUa0iYQw3GsMrHp23hPn8JJwmz9qFvE0g2nYiYK/WrvINNi+i8VcogIKZxUpHBwtHWJ5mchwySUOUyPdJJHp6JMDRI8vJMLmstHZMgBjKwZt3INZ7vUtVtsFBjOHVPzLc9131x0ZSA60nX3AN2WLgvQIb2qofNt715adKsaYEbAdW/J6nX6PgzbAjUk60PhIF2Brnjqcg9djIdFJDJR6PC99yTukm5XB8P02o4Y5fUoH0MirN/MBxVl4uItU6/liHdQbGOR55bhGOfkU3f6neOG9bz5w5rzXFPY+XXOHuZFE9afTvKhWL9SGNbtmv4Yzvm4vfCm1t8kBhAc2IpSkkhSIv9CcljpkhmvBvTIl8/07KyhfhWcB4ppjA4B8SjpV0luGZaX1czuDmrjSAp9IR04W41wP/pai+3CH2ttsCxjHJoimCGXQ7v4jzXKHKJyf18ieiaVxrjO0f42NzS1DYwGZTEdlSO18RSy+YWSiY4LvvhqOTx+ca3n9kLCl7ep7B7OqsmA+gufr+rw7oDMa0W0N2oB5UGlPvT/UtWXHSLbqr1y2ELZLPC10A6FA09lYlm2fDTVI7vSglzCuqQsK5zE22cADQsXNOVICUrZH3xh5RO8CN3HIe+14vLynX07HWrQnzBW+479bGP78e3K5XzzleUjRmdROy1xZF69QG1orAEaOGhl0Tmpm2ux4PX2uorMtqVy8tChGOMK8etqLfZJ3j/ZTLfxIdpPnKhiNIY5U4EnTIUZdUvxMJ+tWzYcnFDiKiFMKNWtKc9ibX0rtrgP8hUIJVrBz/hmzu6x/k6SBLGnEes1xRFGNlpKT2U09pq0M/gT83X25t 1SajBD+3 pM2BiobjOjbZq9mv69jsxGYwL3hwZ6PLPagKDnKt7eklS0qR+TGulo1gYRlqyG8nmjhQKXFGmg4zCnqa2aTk8BjzQ1C9vJnrGaFwpXoZwFD/Q/VjLwgDO/cCj7RYmfWKjF+mtJN41BmW1SxTPYL1/Qd8Gt1UBzOzMDz5DWQhlz+we8OZv+d7tv5+B4VAKHt3bKojRnAN9qmeGBaqeX0YSqqHses8FmS5KZjl9mv7ukRlmvlpC42RDPMWCPHOugzS5BNrr 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: The commit 6be5e186fd65 ("mm: vmscan: restore incremental cgroup iteration") added a retry reclaim heuristic to iterate all the cgroups before returning an unsuccessful reclaim but missed to reset the sc->priority. Let's fix it. Reported-and-tested-by: syzbot+17416257cb95200cba44@syzkaller.appspotmail.com Fixes: 6be5e186fd65 ("mm: vmscan: restore incremental cgroup iteration") Signed-off-by: Shakeel Butt Reviewed-by: Roman Gushchin --- mm/vmscan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/vmscan.c b/mm/vmscan.c index b9170f767353..731b009a142b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6317,6 +6317,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, * meaningful forward progress. Avoid false OOMs in this case. */ if (!sc->memcg_full_walk) { + sc->priority = initial_priority; sc->memcg_full_walk = 1; goto retry; }