From patchwork Fri Apr 28 11:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhaoyang.huang" X-Patchwork-Id: 88600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp858661vqo; Fri, 28 Apr 2023 04:28:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7D2o3tNpew8Uwp2pm8pu9i6fhSNx2kPU47j6wcnhEDKKQxv5vavzZTMpV4D98XzcC6vH4E X-Received: by 2002:a17:903:41c4:b0:1a8:1b63:8aee with SMTP id u4-20020a17090341c400b001a81b638aeemr5521080ple.46.1682681302478; Fri, 28 Apr 2023 04:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682681302; cv=none; d=google.com; s=arc-20160816; b=FvcfOO44UGLA3mcgG8UIHzOvcfVLbFfLuWQsyOZzMR2N/7qk8uPZ4nA7IJ///LbrUs DZokoNS5l0mxS2dIH2Q5IVxyNPiyvfgfW/z1hVH3U+B3QVXsJ6BpK+xeTt/mEt34+rJL Vp5NY1feEPTSNwtWjWuUpoN3Y6dzzoQyizBFIOreSMrnwLK3z+C3073FT5vf7hs06q2x TL2+fdjZ3sozJXr5y2fiGEnC8dS3kIxi8V1ZxHQZ3LEMuqUAlDj3iqPsCt4qdxhnnnVY otZPvFPfQPlcvPSy83pJocjRrnizDFm7RjTA77cwgwK4bsMil8j1R/B3uDvRIIGnZ31l vaHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:to:from; bh=na7Kbo0nJD+VtG6/qhyN0YsoD/S98VoCbnRkatZc62c=; b=ejdkVdMCBvmRls5Cj0Cdof/DKzRrIypr9f2Fd26STZc1wL4+5nTvIW9Qcz74fXfsdy LrTbJZisGrHcRYIJ2AltrHhnNM+UcmcUcq6ozBbayOxJJCrXfJ5kY2gJwHXl9JLrTNBx hK/YLbFuKGE5MPpeOpY2cDVsp2Z0AifEPKlVhJrFTKxiEoPoTbPbbS0Yn7cKJZtePT2u rQYIg8roI4FZuWFudcbptzUHL9W+TknAEMECaCR004Hu32iA3XKivf9rpcUYKjse2BLD 6TqDQBgHZeGdRRc9XLlCRLc/nZ1+3aI56olxyMc/jVGXdNiGqmTGmqmesdIaONSqhI/J pIaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a170903230900b001a63a2de59asi23121194plh.494.2023.04.28.04.28.08; Fri, 28 Apr 2023 04:28:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345515AbjD1LBp (ORCPT + 99 others); Fri, 28 Apr 2023 07:01:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbjD1LBn (ORCPT ); Fri, 28 Apr 2023 07:01:43 -0400 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A88882706 for ; Fri, 28 Apr 2023 04:01:40 -0700 (PDT) Received: from SHSend.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by SHSQR01.spreadtrum.com with ESMTP id 33SB17r7034907; Fri, 28 Apr 2023 19:01:07 +0800 (+08) (envelope-from zhaoyang.huang@unisoc.com) Received: from bj03382pcu.spreadtrum.com (10.0.74.65) by BJMBX01.spreadtrum.com (10.0.64.7) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 28 Apr 2023 19:01:01 +0800 From: "zhaoyang.huang" To: Andrew Morton , Roman Gushchin , Roman Gushchin , , , Zhaoyang Huang , Subject: [PATCH] mm: optimization on page allocation when CMA enabled Date: Fri, 28 Apr 2023 19:00:41 +0800 Message-ID: <1682679641-13652-1-git-send-email-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.0.74.65] X-ClientProxiedBy: SHCAS01.spreadtrum.com (10.0.1.201) To BJMBX01.spreadtrum.com (10.0.64.7) X-MAIL: SHSQR01.spreadtrum.com 33SB17r7034907 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764419229096525038?= X-GMAIL-MSGID: =?utf-8?q?1764419229096525038?= From: Zhaoyang Huang Please be notice bellowing typical scenario that commit 168676649 introduce, that is, 12MB free cma pages 'help' GFP_MOVABLE to keep draining/fragmenting U&R page blocks until they shrink to 12MB without enter slowpath which against current reclaiming policy. This commit change the criteria from hard coded '1/2' to watermark check which leave U&R free pages stay around WMARK_LOW when being fallback. DMA32 free:25900kB boost:0kB min:4176kB low:25856kB high:29516kB Signed-off-by: Zhaoyang Huang --- mm/page_alloc.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0745aed..97768fe 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3071,6 +3071,39 @@ static bool unreserve_highatomic_pageblock(const struct alloc_context *ac, } +#ifdef CONFIG_CMA +static bool __if_use_cma_first(struct zone *zone, unsigned int order, unsigned int alloc_flags) +{ + unsigned long cma_proportion = 0; + unsigned long cma_free_proportion = 0; + unsigned long watermark = 0; + unsigned long wm_fact[ALLOC_WMARK_MASK] = {1, 1, 2}; + long count = 0; + bool cma_first = false; + + watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK); + /*check if GFP_MOVABLE pass previous watermark check via the help of CMA*/ + if (!zone_watermark_ok(zone, order, watermark, 0, alloc_flags & (~ALLOC_CMA))) + { + alloc_flags &= ALLOC_WMARK_MASK; + /* WMARK_LOW failed lead to using cma first, this helps U&R stay + * around low when being drained by GFP_MOVABLE + */ + if (alloc_flags <= ALLOC_WMARK_LOW) + cma_first = true; + /*check proportion for WMARK_HIGH*/ + else { + count = atomic_long_read(&zone->managed_pages); + cma_proportion = zone->cma_pages * 100 / count; + cma_free_proportion = zone_page_state(zone, NR_FREE_CMA_PAGES) * 100 + / zone_page_state(zone, NR_FREE_PAGES); + cma_first = (cma_free_proportion >= wm_fact[alloc_flags] * cma_proportion + || cma_free_proportion >= 50); + } + } + return cma_first; +} +#endif /* * Do the hard work of removing an element from the buddy allocator. * Call me with the zone->lock already held. @@ -3087,10 +3120,9 @@ static bool unreserve_highatomic_pageblock(const struct alloc_context *ac, * allocating from CMA when over half of the zone's free memory * is in the CMA area. */ - if (alloc_flags & ALLOC_CMA && - zone_page_state(zone, NR_FREE_CMA_PAGES) > - zone_page_state(zone, NR_FREE_PAGES) / 2) { - page = __rmqueue_cma_fallback(zone, order); + if (migratetype == MIGRATE_MOVABLE) { + bool cma_first = __if_use_cma_first(zone, order, alloc_flags); + page = cma_first ? __rmqueue_cma_fallback(zone, order) : NULL; if (page) return page; }