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 21999C47258 for ; Wed, 31 Jan 2024 03:19:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF8C86B009C; Tue, 30 Jan 2024 22:19:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A81496B009D; Tue, 30 Jan 2024 22:19:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 922CB6B009E; Tue, 30 Jan 2024 22:19:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7EED46B009C for ; Tue, 30 Jan 2024 22:19:53 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 21D1D1603A0 for ; Wed, 31 Jan 2024 03:19:53 +0000 (UTC) X-FDA: 81738151866.09.2ACC196 Received: from out-171.mta1.migadu.com (out-171.mta1.migadu.com [95.215.58.171]) by imf30.hostedemail.com (Postfix) with ESMTP id 84DE980015 for ; Wed, 31 Jan 2024 03:19:51 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=fiVEZcoi; spf=pass (imf30.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.171 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706671191; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=Zz364JoMX9h2N5yV5c7OrViie26VfXvY+e5Im09K4k4=; b=3NSNttxoYLEdOFd4l5I9bIa23e5vNJaVw7fUD2sc4LYa5kEQLiiBTZAX+ncjsph2V82A7G NZvYLkWsrDSTP+W2rqUqjSh7ELVVD+KPd+wwq9gQ6G/ew6t6DsZUNEMGu92l5XIk1FVW11 TNE5uNuBJuyrKTx3tMQ0p0ZTRrgxeIk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706671191; a=rsa-sha256; cv=none; b=W6vCfef3B9bRdpwI1++X0BSTO8DLh4JBK17mhonudrw93MzabF6Yc/4JIMqBOT97YmFLX1 0uTdkY7iroMmr9C/GglwdEt53Y4fyRPvoJ3Fbk2E8vQ/RQYOjIP6wwFZrsreaW24PFu61T mjLzjl4D8lNCJHfPLXyrZj6jD0QWUMs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=fiVEZcoi; spf=pass (imf30.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.171 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706671189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Zz364JoMX9h2N5yV5c7OrViie26VfXvY+e5Im09K4k4=; b=fiVEZcoirkHU005RRkF9Yqx4zJ7jWfTNJ1Gvjw9OI5phD40jJwwGqgSEIIm5PjQ3m3I3fb ML0iMug8p1/f4yXd4ctCoFgjPTnvKKnndHOY2XSVb08y826pzQDGm2UPflfgTdv+xJPet8 OCr0oQeszoukVsmtiJ3u7lE61EoFshI= From: Yajun Deng To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v2] mm/mmap: use SZ_{8K, 128K} helper macro Date: Wed, 31 Jan 2024 11:19:13 +0800 Message-Id: <20240131031913.2058597-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 84DE980015 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: wcqa847g131bq3c3tethi64hmdnpr18a X-HE-Tag: 1706671191-11328 X-HE-Meta: U2FsdGVkX1/HnbK4sFCJEWAAeks/7PYQERVD7Gj1BrT73HiqzOhI+bcOfcVlB4ZzxG7aoyuwd4iX/5opg0f2QItGr4GLz55hmvPZedNabuDEJIy84K7whVz906TbvznN/d4lMOSJvBAHOhghm3Quc/TyK516+Afzc1p8VTvBeGIYZcPFkERzYlQu8w9tTdLS2lj14QlOVNzsXWTYVGwgO2+M/77j/vZrBooDTNEGafSlNIFwe1Gb1TXL3kuKxvMnPXyBu5Br5vuDHMx2S+nyuy4nwNr0/PlgHFCMyOl28yTLMChPNKfTIh/EU03GUFpOxvBCf1K23jy8SUzdujr2S29s5ffppedC71zzgmJodCoUXjuVfBgQtlBcciWUYW4zoUfTGMoVXkMSrHRKOykIHZDyfLyYN5Rx2xU8UZhxyn9QMx4RPp7ZN2zYLwZ/PEwuG+e2xfXRNNcVhYLyFqpkt7DtFjI2xyf+fDegyrYm6/Xqz1xTO9YYm+s3tKOaQ7X6rU0VxCdGL+g18vUbir63m4jm5LF+yj+ob4S74h8FIxmuDrgaddxz7deDbnSVumibxtSQ5QmADBzIgygv93aO2hLgiG5JpX39NzEn5yPmKYTopycNJnZXVCUSyYzF0ubVYo9cAPoDqJPivjuubR7kyAov0WRc4frRC/OfNP1NQqfajeKwQRZ71garj+KaFttlnupR67OzSwKLNe6iJkuxpYYLgnMgeMJVaRslhIpfo6ZgoT6VPWsn6xRA8r/JMcUYy9bIdngmOkRUfsxxWvvp2KMmgdQEFy2HBLO8SyRbWqDAw389hs5pp8dynmxkLHTFBrUQT3TBbo7F7Bxt/9C9xDRs3PCaSrcl6bTGYH6PLr9e1VtQrglZ/jixMRBTd5tD 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: Use SZ_{8K, 128K} helper macro instead of the number in init_user_reserve and reserve_mem_notifier. This is more readable. Signed-off-by: Yajun Deng --- v2: use the right helper macro. v1: https://lore.kernel.org/all/20240126085905.2835513-1-yajun.deng@linux.dev/ --- mm/mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 7000c14a039f..6722368a48dd 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3847,7 +3847,7 @@ static int init_user_reserve(void) free_kbytes = K(global_zone_page_state(NR_FREE_PAGES)); - sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17); + sysctl_user_reserve_kbytes = min(free_kbytes / 32, SZ_128K); return 0; } subsys_initcall(init_user_reserve); @@ -3868,7 +3868,7 @@ static int init_admin_reserve(void) free_kbytes = K(global_zone_page_state(NR_FREE_PAGES)); - sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13); + sysctl_admin_reserve_kbytes = min(free_kbytes / 32, SZ_8K); return 0; } subsys_initcall(init_admin_reserve); @@ -3900,12 +3900,12 @@ static int reserve_mem_notifier(struct notifier_block *nb, case MEM_ONLINE: /* Default max is 128MB. Leave alone if modified by operator. */ tmp = sysctl_user_reserve_kbytes; - if (0 < tmp && tmp < (1UL << 17)) + if (tmp > 0 && tmp < SZ_128K) init_user_reserve(); /* Default max is 8MB. Leave alone if modified by operator. */ tmp = sysctl_admin_reserve_kbytes; - if (0 < tmp && tmp < (1UL << 13)) + if (tmp > 0 && tmp < SZ_8K) init_admin_reserve(); break; -- 2.25.1