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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95F31C433E6 for ; Fri, 19 Mar 2021 13:20:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 24C1C64EC0 for ; Fri, 19 Mar 2021 13:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24C1C64EC0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 90B4A6B0071; Fri, 19 Mar 2021 09:20:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E19A6B0072; Fri, 19 Mar 2021 09:20:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D0376B0073; Fri, 19 Mar 2021 09:20:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id 609886B0071 for ; Fri, 19 Mar 2021 09:20:29 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 26A9918088955 for ; Fri, 19 Mar 2021 13:20:29 +0000 (UTC) X-FDA: 77936682936.14.66695C3 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf02.hostedemail.com (Postfix) with ESMTP id 13BFF4080F46 for ; Fri, 19 Mar 2021 13:20:19 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BE1DBACFC; Fri, 19 Mar 2021 13:20:18 +0000 (UTC) From: Oscar Salvador To: Andrew Morton Cc: Mike Kravetz , Vlastimil Babka , David Hildenbrand , Michal Hocko , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador , Michal Hocko Subject: [PATCH v6 1/5] mm,page_alloc: Bail out earlier on -ENOMEM in alloc_contig_migrate_range Date: Fri, 19 Mar 2021 14:20:00 +0100 Message-Id: <20210319132004.4341-2-osalvador@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210319132004.4341-1-osalvador@suse.de> References: <20210319132004.4341-1-osalvador@suse.de> MIME-Version: 1.0 X-Stat-Signature: 719rbnfk1wfncoxxi6ub7u74easwubwr X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 13BFF4080F46 Received-SPF: none (suse.de>: No applicable sender policy available) receiver=imf02; identity=mailfrom; envelope-from=""; helo=mx2.suse.de; client-ip=195.135.220.15 X-HE-DKIM-Result: none/none X-HE-Tag: 1616160019-955927 Content-Transfer-Encoding: quoted-printable 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: Currently, __alloc_contig_migrate_range can generate -EINTR, -ENOMEM or -= EBUSY, and report them down the chain. The problem is that when migrate_pages() reports -ENOMEM, we keep going t= ill we exhaust all the try-attempts (5 at the moment) instead of bailing out. migrate_pages() bails out right away on -ENOMEM because it is considered = a fatal error. Do the same here instead of keep going and retrying. Note that this is not fixing a real issue, just a cosmetic change. Althou= gh we can save some cycles by backing off ealier Signed-off-by: Oscar Salvador Acked-by: Vlastimil Babka Reviewed-by: David Hildenbrand Acked-by: Michal Hocko --- mm/page_alloc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cfc72873961d..a4f67063b85f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8481,7 +8481,7 @@ static int __alloc_contig_migrate_range(struct comp= act_control *cc, } tries =3D 0; } else if (++tries =3D=3D 5) { - ret =3D ret < 0 ? ret : -EBUSY; + ret =3D -EBUSY; break; } =20 @@ -8491,6 +8491,12 @@ static int __alloc_contig_migrate_range(struct com= pact_control *cc, =20 ret =3D migrate_pages(&cc->migratepages, alloc_migration_target, NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE); + /* + * On -ENOMEM, migrate_pages() bails out right away. It is pointless + * to retry again over this error, so do the same here. + */ + if (ret =3D=3D -ENOMEM) + break; } if (ret < 0) { putback_movable_pages(&cc->migratepages); --=20 2.16.3