From dd887dbfaaf816cdecdd28ff8578e8c290848b69 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Fri, 25 Feb 2022 16:43:25 -0800 Subject: [PATCH] ANDROID: mm: do not count cma_alloc_fail on __GFP_NORETRY Do not account __GFP_NORETRY allocation failure as cma_alloc_fail since it's not critical failure(i.e., the caller with __GFP_NORETRY should always carry on the fallback plan). It's also good for compatibility POV with upstream since upstream cma_alloc_fail only counts cma_alloc_fail with !__GFP_NORETRY since upstream doesn't support __GFP_NORTRY yet. Bug: 220669548 Signed-off-by: Minchan Kim Change-Id: I377e6b033c3786e10b6b1c814037a4fc40e20a73 Signed-off-by: Richard Chang (cherry picked from commit 8ffc7ff817fe552592daa2b0de1760e3539663f3) --- mm/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/cma.c b/mm/cma.c index 29e8178c640a..9a23246a8a1c 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -574,7 +574,7 @@ out: if (page) { count_vm_event(CMA_ALLOC_SUCCESS); cma_sysfs_account_success_pages(cma, count); - } else { + } else if (!(gfp_mask & __GFP_NORETRY)) { count_vm_event(CMA_ALLOC_FAIL); if (cma) cma_sysfs_account_fail_pages(cma, count);