From nobody Tue Dec 16 19:43:37 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4D8A8748E for ; Sat, 22 Jun 2024 03:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719027573; cv=none; b=tMAWaFQummRh9oPBASwzqgQ+zoKxY4DQ3OUZu6RfpmO+5XmaHtYdRW7ZxpqUa2NP9WwyKN/AkVaTUr8Sg/QK2zBzSMRCkxWC+CP/sjF9JOJrai372TsdSMmcd2sxuZ4FhOn9ZXE6SZtuIblOcVenn/ADsLlLIHf3SvcsMZQ5Nrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719027573; c=relaxed/simple; bh=BMw5JAzkP46NHEAdfpVxC+yvO2GvFSbohkUjQ+PGMyc=; h=From:To:Cc:Subject:Date:Message-Id; b=r/kqEoFrLMc6TiPRMDfRpGs/vG5ujeFCGg5ca/+qsFrIyH8CTOXn7hQrdAH9n0t4QyYbR3KoUzs33AtfbdL/+j8/EnHCWHCGddZG+21v5I4uKrAoV2IdKUo1fKsNxuiVgnk41n4Ezyt+svaTC07gzHT4wX3HK7M8t6KdiVMvrjc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=bB+md6x0; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="bB+md6x0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=lIGxqX9x+SGOnQIbd5 VQLVmLF3zctLikoC965VXpZOc=; b=bB+md6x0/Nl4yd8sHTfCFwsPdM+God2ByX itjAYN8Plm1LryGKMV09fz+ihx8Zw4XeAb/GMDjk9qKYyOsZV32wCkvDWIo29K1J IS2x40Tyq8oFacW2nxqkv6iul9cW3sjN8f4O9AOMWjSO9tjDf6MyNfWrAUR/y/1U Sm35KowAM= Received: from localhost.localdomain (unknown [120.229.10.157]) by gzga-smtp-mta-g3-1 (Coremail) with SMTP id _____wD3f4XMQ3ZmXFf2CQ--.59476S2; Sat, 22 Jun 2024 11:23:57 +0800 (CST) From: "yongfa.hu" To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, hushange@163.com Subject: [PATCH] mm: rename no_progress_loops to reclaim_retris variable no_progress_loops exectly means reclaim retry counts, renameing makes it easier to understand. and has the same style as variable compaction_retries. Date: Sat, 22 Jun 2024 11:23:46 +0800 Message-Id: <20240622032346.12250-1-hushange@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: _____wD3f4XMQ3ZmXFf2CQ--.59476S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAF4kCr4DAFWrXF1fCF4kZwb_yoW5Jw4fpF 4xu3ZrGrZYqFnxJFZ5Aa109F18A3s7KFZ8Xr1xKryxZw1fJrya9rW7Kry2vF18XF4DXayY vFs8Ar40grn8Aa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRYg4-UUUUU= X-CM-SenderInfo: xkxvxtxqjhqiywtou0bp/1tbiRQ8GnmXAnBlJXgAAsl Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: yongfa.hu --- mm/page_alloc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9054645ed..1435a9587 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4107,7 +4107,7 @@ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask) static inline bool should_reclaim_retry(gfp_t gfp_mask, unsigned order, struct alloc_context *ac, int alloc_flags, - bool did_some_progress, int *no_progress_loops) + bool did_some_progress, int *reclaim_retries) { struct zone *zone; struct zoneref *z; @@ -4119,11 +4119,11 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order, * always increment the no progress counter for them */ if (did_some_progress && order <=3D PAGE_ALLOC_COSTLY_ORDER) - *no_progress_loops =3D 0; + *reclaim_retries =3D 0; else - (*no_progress_loops)++; + (*reclaim_retries)++; =20 - if (*no_progress_loops > MAX_RECLAIM_RETRIES) + if (*reclaim_retries > MAX_RECLAIM_RETRIES) goto out; =20 =20 @@ -4150,7 +4150,7 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order, wmark =3D __zone_watermark_ok(zone, order, min_wmark, ac->highest_zoneidx, alloc_flags, available); trace_reclaim_retry_zone(z, order, reclaimable, - available, min_wmark, *no_progress_loops, wmark); + available, min_wmark, *reclaim_retries, wmark); if (wmark) { ret =3D true; break; @@ -4222,14 +4222,14 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int= order, enum compact_priority compact_priority; enum compact_result compact_result; int compaction_retries; - int no_progress_loops; + int reclaim_retries; unsigned int cpuset_mems_cookie; unsigned int zonelist_iter_cookie; int reserve_flags; =20 restart: compaction_retries =3D 0; - no_progress_loops =3D 0; + reclaim_retries =3D 0; compact_priority =3D DEF_COMPACT_PRIORITY; cpuset_mems_cookie =3D read_mems_allowed_begin(); zonelist_iter_cookie =3D zonelist_iter_begin(); @@ -4390,7 +4390,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int o= rder, goto nopage; =20 if (should_reclaim_retry(gfp_mask, order, ac, alloc_flags, - did_some_progress > 0, &no_progress_loops)) + did_some_progress > 0, &reclaim_retries)) goto retry; =20 /* @@ -4427,7 +4427,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int o= rder, =20 /* Retry as long as the OOM killer is making progress */ if (did_some_progress) { - no_progress_loops =3D 0; + reclaim_retries =3D 0; goto retry; } =20 --=20 2.17.1