From patchwork Wed Jun 21 13:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Liu X-Patchwork-Id: 13287339 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 7556EEB64D7 for ; Wed, 21 Jun 2023 13:48:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BA2D8D0007; Wed, 21 Jun 2023 09:48:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06AE28D0003; Wed, 21 Jun 2023 09:48:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E74018D0007; Wed, 21 Jun 2023 09:48:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D55AD8D0003 for ; Wed, 21 Jun 2023 09:48:20 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9C8B6AFAC3 for ; Wed, 21 Jun 2023 13:48:20 +0000 (UTC) X-FDA: 80926884360.05.AF6E25E Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.220]) by imf29.hostedemail.com (Postfix) with ESMTP id 542FE120019 for ; Wed, 21 Jun 2023 13:48:13 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.hostedemail.com: domain of liuq131@chinatelecom.cn designates 42.123.76.220 as permitted sender) smtp.mailfrom=liuq131@chinatelecom.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687355298; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=Ws2fD4Sw0lS6ECPDmGf4mSQuAEgHfLBd5/kXpDaWZCI=; b=fwAuRxT8DYNIa01H3zOacq6RCR9toQwbkbQEqWrdK7ti8A2PNOWHXHyNarLLdPOklo9skx RVIcLwL8GAG6qOrzwC337imuBs2GpjI0jpCwkoLgzI81iW5wG6c6vRgPrUO+aEFS+IyYwx dZfuNYUjqqv5P9WfoU/taby7Sk1a/dQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.hostedemail.com: domain of liuq131@chinatelecom.cn designates 42.123.76.220 as permitted sender) smtp.mailfrom=liuq131@chinatelecom.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687355298; a=rsa-sha256; cv=none; b=FxjAnR1AH2DByFLmtKE5t0wKXVHfqs4b6Pq/BfYZmt4vA389keY3i7V6NvqqlpfBth17W9 Jf8mB2k2r5QVy+jcgczJqu+FOlEODD/6HUobjdOLYPRsHY9Tl48kcapY8WndXOcskP3XNN XGKiFU075gqVTmgf4GdZhU/0S3NkEls= HMM_SOURCE_IP: 172.18.0.48:59213.1763852642 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-111.9.1.183 (unknown [172.18.0.48]) by chinatelecom.cn (HERMES) with SMTP id AFB71280090; Wed, 21 Jun 2023 21:48:03 +0800 (CST) X-189-SAVE-TO-SEND: +liuq131@chinatelecom.cn Received: from ([111.9.1.183]) by app0024 with ESMTP id 706fd4b5277744c0892d36d6ca274296 for akpm@linux-foundation.org; Wed, 21 Jun 2023 21:48:08 CST X-Transaction-ID: 706fd4b5277744c0892d36d6ca274296 X-Real-From: liuq131@chinatelecom.cn X-Receive-IP: 111.9.1.183 X-MEDUSA-Status: 0 Message-ID: <37d8c6c3-0dd1-94b1-19cd-4743968b0fce@chinatelecom.cn> Date: Wed, 21 Jun 2023 21:48:01 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 To: akpm@linux-foundation.org, liuq131@chinatelecom.cn Cc: "Huang, Ying" , linux-mm@kvack.org, linux-kernel@vger.kernel.org From: liuq Subject: [PATCH v4] mm/page_alloc: fix min_free_kbytes calculation regarding ZONE_MOVABLE X-Rspamd-Queue-Id: 542FE120019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 9igu7s7t3h7xoa7d3zqzsjms1jymubs6 X-HE-Tag: 1687355293-814679 X-HE-Meta: U2FsdGVkX1/+W09FBMeCwUcNpmr2AXZ4EDDzjn5+Kv9+iAOscK/B9o6FjqJNMMO6LVVfzcuAjsPmEnG3P2jsSEIReLCYja4tCovbzp5TrXW79Nl0MjTDRSS3YeMWfnNAsrKYAF1xV4ST7HdUFCybck4GCqs9YiWqY79ztursyeQIrP+rZvjgMdfdOMXLnMthdZdEnEyCgC1k3kdhy6HaUSlzBy3CqgqK40RpFmIzdO8GAclFof6yN2hMLefEqPgCqoYhCqA4EcoLKIMlKehEVwYcfgT94PXUBLZdlpk8j8MROTiIeZCIfd8c8p/KVJjcxcW2VlFIVwn1bup2Dvt3cOsR6xl8eLMrXlp7IWvv//0yrm/7xCDCnUHxrlnVNrxj74kpbgaR82PPZRCb/Ff24hWznCiwU/6rdqnOH6+FYxQRFUaOZmcEYPkikSFtP8F9qc4voD9dwVnUQrMuE0/hz95aXpZn1l0AEpDEs/I+M6YucQTSPRDJqQkAy74YjenMUMvaMhPRcEe23WgkeMFJQNdlAgAF48n/FJMB9ezDr7UwLQNt/jKpX6YMtqBZTynCgMmGUJXb8e1UNCJJdnfwd3NGsIznZwQwDX5Y7o+oVS6DUKoxWf9Wj9kjjFbBISahz1bjUq06koi2mIfLeS4wwi9DZWca582IH2DfQUFTqAu/Xxu/eWflRjuYMpwawwmWo46r3ZhAqCOFfQ/pYetiLdyiojzyM00MmjoU/LCZ+C46dddCwgsz9cIFM/uxrMAWasuYGCL/1KErqmqSYK9kyZ2Zxi64dqUt79ckBnroRIfm34R1mFguvdwJdnTUvBNoj50Z/AMrsC02btuDsuYkIaM7FitJHKIP7Xj/eU/gcch9xOgfYp7/v5sDhsBM6axnlTWPpupXhvjiHpJ91lmF6dXxjTzfthl32M0r2hfjYk3sQMfZe0ci+BerKNOBsBtUb5Kmr2LBXXMk8FeHG4j 6uIesvdE pwz0qVKWiJiujtmR+txESr0eCkZNgpi4K/vdqkr89M8r+En/sor3uQvKdb9fHsEauCoBUiGRm7tpHRWzY49QQlQEr55s40oCiEqTjct4VYJPGM4y0AtsIsoigvD+NeVM8htDfD2L6dTopnxnTIwzhaUJYONftNfH2TUAr X-Bogosity: Ham, tests=bogofilter, spamicity=0.077340, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The current calculation of min_free_kbytes only uses ZONE_DMA and ZONE_NORMAL pages,but the ZONE_MOVABLE zone->_watermark[WMARK_MIN] will also divide part of min_free_kbytes.This will cause the min watermark of ZONE_NORMAL to be too small in the presence of ZONE_MOVEABLE. __GFP_HIGH and PF_MEMALLOC allocations usually don't need movable zone pages, so just like ZONE_HIGHMEM, cap pages_min to a small value in __setup_per_zone_wmarks. On my testing machine with 16GB of memory (transparent hugepage is turned off by default, and movablecore=12G is configured) The following is a comparative test data of watermark_min no patch add patch ZONE_DMA 1 8 ZONE_DMA32 151 709 ZONE_NORMAL 233 1113 ZONE_MOVABLE 1434 128 min_free_kbytes 7288 7326 Signed-off-by: liuq Reviewed-by: "Huang, Ying" --- mm/page_alloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.27.0 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 47421bedc12b..590ed8725e09 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6362,9 +6362,9 @@ static void __setup_per_zone_wmarks(void) struct zone *zone; unsigned long flags; - /* Calculate total number of !ZONE_HIGHMEM pages */ + /* Calculate total number of !ZONE_HIGHMEM and !ZONE_MOVABLE pages */ for_each_zone(zone) { - if (!is_highmem(zone)) + if (!is_highmem(zone) && zone_idx(zone) != ZONE_MOVABLE) lowmem_pages += zone_managed_pages(zone); } @@ -6374,15 +6374,15 @@ static void __setup_per_zone_wmarks(void) spin_lock_irqsave(&zone->lock, flags); tmp = (u64)pages_min * zone_managed_pages(zone); do_div(tmp, lowmem_pages); - if (is_highmem(zone)) { + if (is_highmem(zone) || zone_idx(zone) == ZONE_MOVABLE) { /* * __GFP_HIGH and PF_MEMALLOC allocations usually don't - * need highmem pages, so cap pages_min to a small - * value here. + * need highmem and movable zones pages, so cap pages_min + * to a small value here. * * The WMARK_HIGH-WMARK_LOW and (WMARK_LOW-WMARK_MIN) * deltas control async page reclaim, and so should - * not be capped for highmem. + * not be capped for highmem and movable zones. */ unsigned long min_pages;