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 9ED28C47DDB for ; Fri, 26 Jan 2024 08:59:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22F1B6B00BE; Fri, 26 Jan 2024 03:59:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DC826B00BF; Fri, 26 Jan 2024 03:59:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A6236B00C0; Fri, 26 Jan 2024 03:59:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EB14D6B00BE for ; Fri, 26 Jan 2024 03:59:24 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B243412029C for ; Fri, 26 Jan 2024 08:59:24 +0000 (UTC) X-FDA: 81720863448.17.57C3190 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) by imf24.hostedemail.com (Postfix) with ESMTP id ECCBA18000A for ; Fri, 26 Jan 2024 08:59:21 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=hZaTYq6y; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf24.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706259562; a=rsa-sha256; cv=none; b=03FAV6bBO7pkCqUhMlb1KalB5yep+JGLvsgySP+niy1OdTf0SXPz84Td3RJ8ev+DLCws/I V5bdHaltDwyBu9HZxtj37C+g8wdic8YCbDMJMkELzzqiqRAU49Sdi78Iad4thlYtAGnyLR TTslmX3grjeK9N8Fk/UALLHfhHdCaYs= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=hZaTYq6y; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf24.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706259562; 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=UEiYHt6EA6JI2A3oFzAKFbfq5nte6C1ofdfTW06tbP8=; b=60cuq8/u9UyPoEKgRWrJ8gch2WeVdb2kUZ4kwoHqkJeU+8Lp/8sUtIxSbSEN+uFpK6BIKD 7QPW4aTcEKDJnJjDrxCZOuzBm705ltVrufeeylxtAWSJ+yp+LElmraUIh6VYwOlzPjOTMO 5pQbNatkXcBsLJ6ejegIVtX9mn2gdhA= 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=1706259559; 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=UEiYHt6EA6JI2A3oFzAKFbfq5nte6C1ofdfTW06tbP8=; b=hZaTYq6yORpyB61XP6FMuKwBdf5riISYuB3djvq9huZIB+zXVjpCYtDIbBToipBg9QPfet CYsKkoucQO52QVjWiED1IvybA9EJBl5Or/kkOqLNp40LRro9eS0hDb+jFjPzQfPdSiwIyM +RiZki+Mn0KsyOk3pt7xvKYoflnmRGE= From: Yajun Deng To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] mm/mmap: use SZ_{8M, 128M} helper macro Date: Fri, 26 Jan 2024 16:59:05 +0800 Message-Id: <20240126085905.2835513-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: ECCBA18000A X-Stat-Signature: i9sph1dtumh5idgcnxnjsoqqkxi7r6ao X-HE-Tag: 1706259561-406351 X-HE-Meta: U2FsdGVkX1+TTM7n/v5k0aYGYtOM427DPsqoIqhSmirhUNr/nE37mOxd2YqThsMQGYYkkYvAvcwu2kQ3dOVxufxFsUgIwsLg6S4om2AE/odYkh2g1CltD+4TwMDneIdvdQX09Oz394dFktikAMFf8PilPDVSb8ei2eW+PUz2mMhQSyAVWiAaTAKkSuAckVrEkyNXpT/d7uflYzgOp9MN0cXnGegFpJJINshhyslMME85QbU2z1/nGCkVAhuL1MP01BuGSNZ0AjgDSi8ML1/CItpYYhYxylR/AlalwIbE+ec7ocpCGqJwPXOu0D/LmazEVbQ60Zs/VpGc2WPlVNgaTJBDoH1kbpXvJZm5yLF/bNFaKTD0GJpBUaahThOaxX5jnE1zh/1DjWeR91qgFJO+FxP4q35gOvZyq6KnSgegYLk+PDAEkxz96e+RuaYmuepNRDfkKxcUUz1SUST0o+56aORmByekLY3OlHHybdKilIdkm0aHwRQz0M3N2Mp1exPc0QNcS+UX2iIz1jFM+T2Ji0DpIpNXpNc80jg6Nvjfrr7jfwrrdwwPR+oMaFdRUuXtxhbjntVhSD9H2anlsBPhbF1EKTNNgso/gjLWBBALUV326yF961850zA92uSjLBQ4Ru1sNZ/5Gs0Ea+4IcxLyJfjf5QvfwroABJEwqKBuSe87uUKgRQRupdRi+MngFnsP3KESV+IRVSTSCNPzM+/zgf4Gj29mWVOLHFIQImfVhaCI5EfnEcnfBCEHzdzLSHXqvQbHiDkUUcZ/DN5TsJ81S/imudtYhdofEuZiqjwQCXfw7QrC0MbnaphR/gRmVRfy05lRve1lBS9jqtfuOM3xBvUnWXW0eqgc1+ZxhoEB3+hQtaX47R39jz/8a1NEIk0RdekcRNMZ9pzrQq7MJmE2LQTbkH99fG2nZf6VFa6bEAAUWPcrhaU5UC2vvSYIpfGCwtNxaeei/W96+6OtO/F 9CDBo1wr PJBfiNliFC7rXEtOHrjQnGooFH5pn7jiJRDAAskIR8pVFAroEQebcuSxAYVjKurPTKYVHySNhBDQDMPgFhjd7neAYOb+iyPtcN7RJfAm2WwsdD83KLbXv0xUsqhXDJQkLtfEe X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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_{8M, 128M} macro intead of the number in init_user_reserve and reserve_mem_notifier. Signed-off-by: Yajun Deng --- mm/mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 476de5daf598..f90924b2a6d2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3845,7 +3845,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_128M); return 0; } subsys_initcall(init_user_reserve); @@ -3866,7 +3866,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_8M); return 0; } subsys_initcall(init_admin_reserve); @@ -3898,12 +3898,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_128M) 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_8M) init_admin_reserve(); break; -- 2.25.1