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 53429C433EF for ; Sat, 19 Mar 2022 03:58:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE1618D0002; Fri, 18 Mar 2022 23:58:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A90338D0001; Fri, 18 Mar 2022 23:58:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 931398D0002; Fri, 18 Mar 2022 23:58:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0030.hostedemail.com [216.40.44.30]) by kanga.kvack.org (Postfix) with ESMTP id 80DE78D0001 for ; Fri, 18 Mar 2022 23:58:13 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D616A1828AC7E for ; Sat, 19 Mar 2022 03:58:12 +0000 (UTC) X-FDA: 79259778024.19.9FACE7D Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) by imf26.hostedemail.com (Postfix) with ESMTP id A00F514002F for ; Sat, 19 Mar 2022 03:58:11 +0000 (UTC) Received: by mail-yb1-f170.google.com with SMTP id y142so19006434ybe.11 for ; Fri, 18 Mar 2022 20:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0gA2qXzSRl9qE4e/yYCKLgAXKN8MMVbC49krdg3yp3I=; b=t6/7N1sZ0ZkI6hW5qc6ora09i0y+N1UhwsfsFLFL74GSygv+Glm57pstuNI/fDtPTR /fzfKTU47bUXAyFve35zGys6ry7fp6P0n3+dEej8JfBkQdDoQAVOkSyEZckc23r1+dyJ QUoVnunu1WTQClkMrK66Hmm1eBAJ9zjuNNTYKYEZi2dBucihutg0niDaBEEG7K+Eiuvt PFgHrBK0esrxgY3edNfwPqWYoy00o+SVWwFtQpGqvDv5L06QOJ+VwgWAkDqZOMpEKYHE lhEiVpiVcZ8O6SQEdGLZjdqUMdL8QlXAIk5aBozC8b5DWbPVHxfc7xuf612ezBUZnwkY Ki7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0gA2qXzSRl9qE4e/yYCKLgAXKN8MMVbC49krdg3yp3I=; b=VanZa8XhA69m0eKrCXTPMRPOLpLgyU9fC73I2dKbCH54Hvw5UXmGJrPhaVwe7jbMdv dI6vmin8rg/ondSSx34PfsqM48Q9qmyioo0saT3wpbtmNuZ5mO1lSFSKUbboRS36bchS GZfBQwZuDuAWTXCMNIxJ2c2X2vWE7iBbcQya2Ee6zz+Wg965yPgeepEeXtAWaw1DMk1J dG6VTSvmrcXKMt/yQvIfLe8Gvyzldo0a0PUq5WjHTeABVnnB1I0Fammkl4uqKTz34hIT jYgm0Emh4zJaIsUf8cap2Zbav37029E9Jw4nD2ezFehEb4Yqle9JvTUFbilpJt7JpJLv gPKQ== X-Gm-Message-State: AOAM531dbDMeE5hcwV4saJuLMf5cE8fRFdFGRvFYrF8X6JFKxr7n9xRU rxwiMTLsi8yYiZfGGnbPqH8iSRy+eZwfVjYYlCJr2w== X-Google-Smtp-Source: ABdhPJynV8+lYCBUqF2tFn5s5qKnLh+GnL5M2HPtr94nl6OYf+yVbOOsr28Uz1gniP+AOeBXRZQC3YG3haZrbPFqT6w= X-Received: by 2002:a25:33d7:0:b0:633:134a:6e7c with SMTP id z206-20020a2533d7000000b00633134a6e7cmr12855599ybz.89.1647662290616; Fri, 18 Mar 2022 20:58:10 -0700 (PDT) MIME-Version: 1.0 References: <20220318100720.14524-1-songmuchun@bytedance.com> <20220318100720.14524-2-songmuchun@bytedance.com> In-Reply-To: From: Muchun Song Date: Sat, 19 Mar 2022 11:56:18 +0800 Message-ID: Subject: Re: [PATCH v4 1/4] mm: hugetlb_vmemmap: introduce STRUCT_PAGE_SIZE_IS_POWER_OF_2 To: Luis Chamberlain Cc: Jonathan Corbet , Mike Kravetz , Andrew Morton , Kees Cook , Iurii Zaikin , Oscar Salvador , David Hildenbrand , Linux Doc Mailing List , LKML , Linux Memory Management List , Xiongchun duan , Muchun Song Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: 9yrsz18h6mpghng3bhqybmzz9h7nd956 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b="t6/7N1sZ"; spf=pass (imf26.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.219.170 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A00F514002F X-HE-Tag: 1647662291-436846 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: On Sat, Mar 19, 2022 at 12:40 AM Luis Chamberlain wrote: > > On Fri, Mar 18, 2022 at 06:07:17PM +0800, Muchun Song wrote: > > You can add Suggested-by tag here. Will do. Sorry for forgetting it. > > > Signed-off-by: Muchun Song > > --- > > Kbuild | 12 ++++++++++++ > > fs/Kconfig | 2 +- > > include/linux/mm_types.h | 2 ++ > > mm/Kconfig | 3 +++ > > mm/hugetlb_vmemmap.c | 6 ------ > > mm/struct_page_size.c | 19 +++++++++++++++++++ > > scripts/check_struct_page_po2.sh | 11 +++++++++++ > > 7 files changed, 48 insertions(+), 7 deletions(-) > > create mode 100644 mm/struct_page_size.c > > create mode 100755 scripts/check_struct_page_po2.sh > > > > diff --git a/Kbuild b/Kbuild > > index fa441b98c9f6..6bb97d348d62 100644 > > --- a/Kbuild > > +++ b/Kbuild > > @@ -14,6 +14,18 @@ $(bounds-file): kernel/bounds.s FORCE > > $(call filechk,offsets,__LINUX_BOUNDS_H__) > > > > ##### > > +# Generate struct_page_size.h. Must follows bounds.h. > > + > > +struct_page_size-file := include/generated/struct_page_size.h > > + > > +always-y := $(struct_page_size-file) > > +targets := mm/struct_page_size.s > > + > > +$(struct_page_size-file): mm/struct_page_size.s FORCE > > + $(call filechk,offsets,__LINUX_STRUCT_PAGE_SIZE_H__) > > + $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig > > + > > +##### > > Shouldn't this go into mm/Makefile instead? > We should guarantee that the include/generated/struct_page_size.h which Kconfig depends on is created before processing Makefile since processing Kconfig is before Makefile. Right? > > diff --git a/mm/Kconfig b/mm/Kconfig > > index 034d87953600..9314bd34f49e 100644 > > --- a/mm/Kconfig > > +++ b/mm/Kconfig > > @@ -2,6 +2,9 @@ > > > > menu "Memory Management options" > > > > +config STRUCT_PAGE_SIZE_IS_POWER_OF_2 > > + def_bool $(success,test "$(shell, $(srctree)/scripts/check_struct_page_po2.sh)" = 1) > > + > > config SELECT_MEMORY_MODEL > > def_bool y > > depends on ARCH_SELECT_MEMORY_MODEL > > new file mode 100755 > > index 000000000000..9547ad3aca05 > > --- /dev/null > > +++ b/scripts/check_struct_page_po2.sh > > @@ -0,0 +1,11 @@ > > +#!/bin/sh > > +# SPDX-License-Identifier: GPL-2.0 > > +# > > +# Check if the size of "struct page" is power of 2 > > + > > +file="include/generated/struct_page_size.h" > > +if [ ! -f "$file" ]; then > > Does this really work if one is workig off of a very clean build > like make mrproper and then make menuconfig or or mrproper followed > by a defconfig file ? Have you tried it for both cases po2 and npo2? > > Because isn't include/generated/struct_page_size.h generated? At > which point does it get generated and why would the condition hole > true that the file exists at a new 'make menuconfig' time? > You are right. include/generated/struct_page_size.h does not exist in this case, CONFIG_STRUCT_PAGE_SIZE_IS_POWER_OF_2 will be default off in .config. Then it will be switched on/off accordingly when you build the kernel, for instance make bzImage, which is done via "make syncconfig" which follows the generation of struct_page_size.h. While testing this case, I found some bugs. The following patch could fix this. Thanks. --- a/Kbuild +++ b/Kbuild @@ -21,6 +21,8 @@ struct_page_size-file := include/generated/struct_page_size.h always-y := $(struct_page_size-file) targets := mm/struct_page_size.s +mm/struct_page_size.s: $(timeconst-file) $(bounds-file) + $(struct_page_size-file): mm/struct_page_size.s FORCE $(call filechk,offsets,__LINUX_STRUCT_PAGE_SIZE_H__) $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig diff --git a/scripts/check_struct_page_po2.sh b/scripts/check_struct_page_po2.sh index 9547ad3aca05..1764ef9a4f1d 100755 --- a/scripts/check_struct_page_po2.sh +++ b/scripts/check_struct_page_po2.sh @@ -4,8 +4,6 @@ # Check if the size of "struct page" is power of 2 file="include/generated/struct_page_size.h" -if [ ! -f "$file" ]; then - exit 1 +if [ -f "$file" ]; then + grep STRUCT_PAGE_SIZE_IS_POWER_OF_2 "$file" | cut -d' ' -f3 fi - -grep STRUCT_PAGE_SIZE_IS_POWER_OF_2 "$file" | cut -d' ' -f3