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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id F369BC3DA4A for ; Fri, 2 Aug 2024 00:03:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B1536B007B; Thu, 1 Aug 2024 20:03:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 561B16B0083; Thu, 1 Aug 2024 20:03:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 428D46B0085; Thu, 1 Aug 2024 20:03:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2641C6B007B for ; Thu, 1 Aug 2024 20:03:07 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E1487161042 for ; Fri, 2 Aug 2024 00:03:06 +0000 (UTC) X-FDA: 82405355172.21.5D88E45 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 2C835140010 for ; Fri, 2 Aug 2024 00:03:04 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=zDQgRSxI; dmarc=none; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722556942; a=rsa-sha256; cv=none; b=rC3aYX2uxD22Xcjb9doWs8dLKrtvEAM8zukxBG261IGn/DCCAbALXV4TKtibTVg1oVXNgV Zh+5XF1YZ1HpMxNqpGP1qOGEoaChEE1VN74yfWz2nj5jA8tbZpn6Rpm8ZF2rB2nYPBzAYQ BqqtfmR8gdQfrTbtw9XvFSMidoTwjHg= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=zDQgRSxI; dmarc=none; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722556942; h=from:from: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:in-reply-to:references:references:dkim-signature; bh=xaF53ex6i/5EuK3UbIfC42qMwC787os6+WZfukxT+VU=; b=pmfI/pZcCS5B6y5zQe64SfJfG5qHYQla75RaHxttI9EzYwxgPjXpBtdVtUT+aRIEgkKPc5 OFGsUrJdMDt9wLOKSI70kAjK/I1JHbyUdfpuO8KJyvdIDOouifRepj0oCbUp22XVTZItY8 5cj9lt2sjoXJDifCWvsqOdz6P5+Ok+A= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 070B66297F; Fri, 2 Aug 2024 00:03:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86F3EC32786; Fri, 2 Aug 2024 00:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1722556983; bh=IqQn450456vZe61s6dYSKwUVITuDMiJNlaUyV1XgdW4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=zDQgRSxIszYDwc867ANMyL51XXz2TQnAkUP/1gsGiM81YotX1sfmRp/mlFB5ilocm QfQEc4PjKxlL9p6NcHE5lLllZPNGT+roJwIbRBptMQ5p/uVb1UioJADVFLi3wU4Lc3 EtGErKbzXHLr/5slBUnOmUr5QGYJz+ur6HvW74ZA= Date: Thu, 1 Aug 2024 17:03:02 -0700 From: Andrew Morton To: kaiyang2@cs.cmu.edu Cc: linux-mm@kvack.org, hannes@cmpxchg.org Subject: Re: [PATCH v2 1/2] mm: create promo_wmark_pages and clean up open-coded sites Message-Id: <20240801170302.0d233169e708bca1e88a65c9@linux-foundation.org> In-Reply-To: <20240801232548.36604-2-kaiyang2@cs.cmu.edu> References: <20240801232548.36604-1-kaiyang2@cs.cmu.edu> <20240801232548.36604-2-kaiyang2@cs.cmu.edu> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 2C835140010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hi3borhz9m1tqsxbmwk9wo51pywijxjd X-HE-Tag: 1722556984-906855 X-HE-Meta: U2FsdGVkX18cDTMCEflfXlbqDakGBMCSBBD/euDquzwzAD4TfFljw5rIS19VkGv4PmAF1X5g3JKt/QKfD0v1wtJI9veLsMAmy6xdJ49saHNICjRS5RNtYtcxp0R3Q6SJ/BtwgQ6BiaesqUmEugWCy7A4CN5wVsJunjF43WycORp8ng3ghuyzyehCgCOSbbGirwzYo5773GpAjLwOAkNteCkWDWJYmja/zQz7q+qEzMFwXrrlOuXt9NaSyRiFpH4/S4Ph4mPcwSOq74ebVesG+WzCRIWfoSVov9DjysBPxHo9OjxDaJ14t2Pejtgmry5sCWh/kIkjBuINTfEmhh0/J6nCcPrng0RHUmiGlvrrr9fxvE8D9YK5+ump7GzDb80Oc59OGczOepa7FidCaOse8yjYlbOokDm8Bnt05MDjqXHhTGRowBavISgs4ioGnCdL6p8Nv3yCqNadogqFWEpww7VElhms1skzh/jG8zGe2A0B0G/hMdrPZdMUKMgmDSlZfBQmqyFGJSI7q+qtrBU3mH8cmKAnTB4xHDm4hb+lxlftkgeq0lVA9hJ0Qx01hzYEz3biD7YjLVsbp1oVrSgpdh6NPq6e0+LwumFVGbCFpxP7Bqx7KfXqtEP6g6vpwpcQvglMNgtd2j9fsSEf/DQKX12yVfIMTIq9td/S+gmkeI+BvqTreKCQUvOJmk8dOK4vp/9pywqzGTQRWKn6560pCzrInXUHrOUhH7fItT0icoLlDYCX8NSIIrhs29VSQPES5SXalg6sW421dQU+4nIiZmfYBSOCPAWmy3duHFg7SYU/fDflqSdWij4ACZj/95P9+/D19C/kT2wNSz9jc8ZOtmnLaw33Vl9910PMWJ+VG2XfWV/0hVJJ7vV9RjIMAoOHHCYB5tu4Wse6/XVyzlMyt6jocodSPD/M4JEjlrUc57B7cttwDCiP8B4otE6xW3YwtdPJBttd7OM8kGygu8/ GwnwAuHB jQkthDdZf1sJzwPEM8Uk+hYWrPml3j8vurGl5POBHSEdAZ4+goxiN3nMhIkCAwv5TIZbjcM+Xye9BCAFPV8TFzTcT9Ob8YwZWCtWIrXIsGhtVbD9TrgPLTMkTs9gz98NjeNe2FI2lWnqM8gag2P4mwyP7LH2M1fxq5ldynmlQJY81Co+SWlnBwmI5Dtb8l2l0LCmMl/NejvOk3hHl7+ZjuKooPgrRp/4EyOXqtZxlvbzTLVQHOvrlWk2LS+88h/F0Sth7VCWjXpz8axL9jbXyUgmGZV6PDghs48kGPhZ7j2bzBJm5SezulrMOx4Rgq4LuDq0xA+TEmqFzgPdUiux5fc9SsRNlEMFWAREHCypiKMhisHZV7DShNyVBLhqkKBafCBhUj5yoyiy5VQk= 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: List-Subscribe: List-Unsubscribe: On Thu, 1 Aug 2024 23:25:47 +0000 kaiyang2@cs.cmu.edu wrote: > Define promo_wmark_pages and convert current call sites of wmark_pages > with fixed WMARK_PROMO to using it instead. Fair enough. I did a thing. From: Andrew Morton Subject: include/linux/mmzone.h: clean up watermark accessors Date: Thu Aug 1 04:50:05 PM PDT 2024 - we have a helper wmark_pages(). Teach min_wmark_pages(), low_wmark_pages(), high_wmark_pages() and promo_wmark_pages() to use it instead of open-coding its implementation. - there's no reason to implement all these things as macros. Redo them in C. Cc: Johannes Weiner Cc: Kaiyang Zhao Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) --- a/include/linux/mmzone.h~include-linux-mmzoneh-clean-up-watermark-accessors +++ a/include/linux/mmzone.h @@ -668,12 +668,6 @@ enum zone_watermarks { #define NR_LOWORDER_PCP_LISTS (MIGRATE_PCPTYPES * (PAGE_ALLOC_COSTLY_ORDER + 1)) #define NR_PCP_LISTS (NR_LOWORDER_PCP_LISTS + NR_PCP_THP) -#define min_wmark_pages(z) (z->_watermark[WMARK_MIN] + z->watermark_boost) -#define low_wmark_pages(z) (z->_watermark[WMARK_LOW] + z->watermark_boost) -#define high_wmark_pages(z) (z->_watermark[WMARK_HIGH] + z->watermark_boost) -#define promo_wmark_pages(z) (z->_watermark[WMARK_PROMO] + z->watermark_boost) -#define wmark_pages(z, i) (z->_watermark[i] + z->watermark_boost) - /* * Flags used in pcp->flags field. * @@ -1019,6 +1013,32 @@ enum zone_flags { ZONE_BELOW_HIGH, /* zone is below high watermark. */ }; +static inline unsigned long wmark_pages(const struct zone *z, + enum zone_watermarks w) +{ + return z->_watermark[w] + z->watermark_boost; +} + +static inline unsigned long min_wmark_pages(const struct zone *z) +{ + return wmark_pages(z, WMARK_MIN); +} + +static inline unsigned long low_wmark_pages(const struct zone *z) +{ + return wmark_pages(z, WMARK_LOW); +} + +static inline unsigned long high_wmark_pages(const struct zone *z) +{ + return wmark_pages(z, WMARK_HIGH); +} + +static inline unsigned long promo_wmark_pages(const struct zone *z) +{ + return wmark_pages(z, WMARK_PROMO); +} + static inline unsigned long zone_managed_pages(struct zone *zone) { return (unsigned long)atomic_long_read(&zone->managed_pages); _