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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9414C433E0 for ; Wed, 6 Jan 2021 14:22:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9353D2311E for ; Wed, 6 Jan 2021 14:22:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9353D2311E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 280ED6B0254; Wed, 6 Jan 2021 09:22:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E0B96B0256; Wed, 6 Jan 2021 09:22:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A94C6B0257; Wed, 6 Jan 2021 09:22:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id E47FF6B0254 for ; Wed, 6 Jan 2021 09:22:29 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A02D7180AD807 for ; Wed, 6 Jan 2021 14:22:29 +0000 (UTC) X-FDA: 77675565618.05.scale92_2004818274e2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 827D51803DD0D for ; Wed, 6 Jan 2021 14:22:29 +0000 (UTC) X-HE-Tag: scale92_2004818274e2 X-Filterd-Recvd-Size: 6052 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Wed, 6 Jan 2021 14:22:28 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id h10so1784417pfo.9 for ; Wed, 06 Jan 2021 06:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hon7HPngFu4HxwS2zmocIDkYMNnjiKlEfAxske+w4FE=; b=iciEoCytjnsQuJQ571GJQqBQ22jYCalqVs50SCci/1P44qwKKY+jwidPqJ61xNPXUi FpqiDh2S7zbs7j3i7H0XWY3oJHCb4JdRWj2nnP824eHaeFsIhwTxgtDJg1l6HOkNUh4l UKv1T5eheNxUlWvWhqS9S1kzqJl421isbJiJDw21bzod8orUZ8OQ9d3OKblQucyggBFA t8ZzXKf1M1ahcWqFedSzB0w0U/8cZSa6UMDmlPc10mGBQXQkPwft3hkwetlbb+bE3X8V z2t4DPVuFppIwkVtsIgZzTY1FSUeo0iBkX6FIvAcodXlzxlOGYbrxEA9xsgvsb17yNzn 3PDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hon7HPngFu4HxwS2zmocIDkYMNnjiKlEfAxske+w4FE=; b=WPRRe76HWB6CMg337O1udhgn9pFKq2nx4AzVfOOxZrSyeiAVASGrneJnylhihpzOaQ IJ+ohZuPw2Sw5ahy+79j0LqAuJ+ZrPDlBMpVqoAiLXkIUREIicj0tHDiU6RGY6f1DaoM V1WyQqqbznEfkqAiU9B8VNDTm1TIGFkDxT405SC5fT8xXaFTgaLorHtKb2z91Yx+GB4B kY28+z1IDBw/bh+IQVXzrbn/g8cNI90erEmBKTjxXcLGQ0p6qixI8+aut486t3/GtRLk IPbx6xYgTLkLy2jkEWDETMeCOA69YJ5dbWD2LQERSVlxGdUflfBofwVGtr7gcAvZQRB/ BzLw== X-Gm-Message-State: AOAM531gH+yoUlp6YsovT+iGDy+9C1CGjWNm5uOn3C9DZ1/T7qqLCZ+w Ysv82hfZg55x89hI6ZcfbPlZZg== X-Google-Smtp-Source: ABdhPJyHRzzmuLLYBccWbr5cuOP/iD1HKyoOjXtsLKUxObinuJ6v5dc8Cys4VvrK22eHqCDVTPR24g== X-Received: by 2002:aa7:9ac9:0:b029:19e:19b6:6e09 with SMTP id x9-20020aa79ac90000b029019e19b66e09mr4071404pfp.49.1609942948040; Wed, 06 Jan 2021 06:22:28 -0800 (PST) Received: from localhost.bytedance.net ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id a29sm2831730pfr.73.2021.01.06.06.22.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 06:22:27 -0800 (PST) From: Muchun Song To: corbet@lwn.net, mike.kravetz@oracle.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, paulmck@kernel.org, mchehab+huawei@kernel.org, pawan.kumar.gupta@linux.intel.com, rdunlap@infradead.org, oneukum@suse.com, anshuman.khandual@arm.com, jroedel@suse.de, almasrymina@google.com, rientjes@google.com, willy@infradead.org, osalvador@suse.de, mhocko@suse.com, song.bao.hua@hisilicon.com, david@redhat.com, naoya.horiguchi@nec.com Cc: duanxiongchun@bytedance.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Muchun Song Subject: [PATCH v12 13/13] mm/hugetlb: Optimize the code with the help of the compiler Date: Wed, 6 Jan 2021 22:19:31 +0800 Message-Id: <20210106141931.73931-14-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210106141931.73931-1-songmuchun@bytedance.com> References: <20210106141931.73931-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: We cannot optimize if a "struct page" crosses page boundaries. If it is true, we can optimize the code with the help of a compiler. When free_vmemmap_pages_per_hpage() returns zero, most functions are optimized by the compiler. Signed-off-by: Muchun Song --- include/linux/hugetlb.h | 3 ++- mm/hugetlb_vmemmap.c | 7 +++++++ mm/hugetlb_vmemmap.h | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 05fd2db09b78..b685bc4d79d5 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -792,7 +792,8 @@ extern bool hugetlb_free_vmemmap_enabled; =20 static inline bool is_hugetlb_free_vmemmap_enabled(void) { - return hugetlb_free_vmemmap_enabled; + return hugetlb_free_vmemmap_enabled && + is_power_of_2(sizeof(struct page)); } #else static inline bool is_hugetlb_free_vmemmap_enabled(void) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 6b8f7bb2273e..5ea12c7507a6 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -250,6 +250,13 @@ void __init hugetlb_vmemmap_init(struct hstate *h) BUILD_BUG_ON(NR_USED_SUBPAGE >=3D RESERVE_VMEMMAP_SIZE / sizeof(struct page)); =20 + /* + * The compiler can help us to optimize this function to null + * when the size of the struct page is not power of 2. + */ + if (!is_power_of_2(sizeof(struct page))) + return; + if (!hugetlb_free_vmemmap_enabled) return; =20 diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 8fd9ae113dbd..e8de41295d4d 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -17,11 +17,12 @@ void hugetlb_vmemmap_init(struct hstate *h); =20 /* * How many vmemmap pages associated with a HugeTLB page that can be fre= ed - * to the buddy allocator. + * to the buddy allocator. The checking of the is_power_of_2() aims to l= et + * the compiler help us optimize the code as much as possible. */ static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h= ) { - return h->nr_free_vmemmap_pages; + return is_power_of_2(sizeof(struct page)) ? h->nr_free_vmemmap_pages : = 0; } #else static inline void alloc_huge_page_vmemmap(struct hstate *h, struct page= *head) --=20 2.11.0