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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13BC3C41513 for ; Fri, 4 Aug 2023 18:13:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbjHDSNH (ORCPT ); Fri, 4 Aug 2023 14:13:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230372AbjHDSM3 (ORCPT ); Fri, 4 Aug 2023 14:12:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AB2B4ECD for ; Fri, 4 Aug 2023 11:12:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7507D620F4 for ; Fri, 4 Aug 2023 18:12:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC69EC433C7; Fri, 4 Aug 2023 18:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1691172738; bh=41IsH+a9Y9zKDxx3MbKTj5BdChm/QreLCW9mlY5xxEM=; h=Date:To:From:Subject:From; b=EgPO24bWJiUYWMi82XsHJobl7alKD8QJ6Zn7Zg6IJQMJ+OxIXRH5KfcwOaz3irlRM AqLjM1q9n1eINweeiBQ5eBj7tvBkFZ2xrw/scsAxK1NJ+t6cj73XFWP6tA8kSx22YH pZ38e3GvLkYAnhHz/cPUKjNOHhpZwmS2jcpsPt08= Date: Fri, 04 Aug 2023 11:12:18 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, wangkefeng.wang@huawei.com, sunnanyong@huawei.com, zhangpeng362@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-mmapc-use-helper-macro-k.patch added to mm-unstable branch Message-Id: <20230804181218.CC69EC433C7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/mmap.c: use helper macro K() has been added to the -mm mm-unstable branch. Its filename is mm-mmapc-use-helper-macro-k.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-mmapc-use-helper-macro-k.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: ZhangPeng Subject: mm/mmap.c: use helper macro K() Date: Fri, 4 Aug 2023 09:25:58 +0800 Use helper macro K() to improve code readability. No functional modification involved. Link: https://lkml.kernel.org/r/20230804012559.2617515-7-zhangpeng362@huawei.com Signed-off-by: ZhangPeng Reviewed-by: Matthew Wilcox (Oracle) Cc: Kefeng Wang Cc: Nanyong Sun Signed-off-by: Andrew Morton --- mm/mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/mmap.c~mm-mmapc-use-helper-macro-k +++ a/mm/mmap.c @@ -3785,7 +3785,7 @@ static int init_user_reserve(void) { unsigned long free_kbytes; - free_kbytes = global_zone_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); + free_kbytes = K(global_zone_page_state(NR_FREE_PAGES)); sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17); return 0; @@ -3806,7 +3806,7 @@ static int init_admin_reserve(void) { unsigned long free_kbytes; - free_kbytes = global_zone_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); + free_kbytes = K(global_zone_page_state(NR_FREE_PAGES)); sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13); return 0; @@ -3850,7 +3850,7 @@ static int reserve_mem_notifier(struct n break; case MEM_OFFLINE: - free_kbytes = global_zone_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); + free_kbytes = K(global_zone_page_state(NR_FREE_PAGES)); if (sysctl_user_reserve_kbytes > free_kbytes) { init_user_reserve(); _ Patches currently in -mm which might be from zhangpeng362@huawei.com are mm-use-a-folio-in-fault_dirty_shared_page.patch mm-remove-page_rmapping.patch mm-page_io-remove-unneeded-clearpageuptodate.patch mm-page_io-remove-unneeded-setpageerror.patch mm-page_io-introduce-bio_first_folio_all.patch mm-page_io-use-a-folio-in-__end_swap_bio_write.patch mm-page_io-use-a-folio-in-__end_swap_bio_read.patch mm-page_io-use-a-folio-in-sio_read_complete.patch mm-page_io-use-a-folio-in-swap_writepage_bdev_sync.patch mm-page_io-use-a-folio-in-swap_writepage_bdev_async.patch mm-page_io-convert-count_swpout_vm_event-to-take-in-a-folio.patch mm-page_io-convert-bio_associate_blkg_from_page-to-take-in-a-folio.patch mm-kmsan-use-helper-function-page_size.patch mm-kmsan-use-helper-macro-offset_in_page.patch mm-kmsan-use-helper-macros-page_align-and-page_align_down.patch mm-remove-redundant-k-macro-definition.patch mm-swapfilec-use-helper-macro-k.patch mm-swap_statec-use-helper-macro-k.patch mm-shmemc-use-helper-macro-k.patch mm-nommuc-use-helper-macro-k.patch mm-mmapc-use-helper-macro-k.patch mm-hugetlbc-use-helper-macro-k.patch