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,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 B5F4BC433FE for ; Thu, 10 Dec 2020 03:59:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5A02C23D57 for ; Thu, 10 Dec 2020 03:59:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A02C23D57 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 E59986B0071; Wed, 9 Dec 2020 22:59:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E09916B0072; Wed, 9 Dec 2020 22:59:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF9DE6B0073; Wed, 9 Dec 2020 22:59:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id BB20E6B0071 for ; Wed, 9 Dec 2020 22:59:20 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8EF041EE6 for ; Thu, 10 Dec 2020 03:59:20 +0000 (UTC) X-FDA: 77576017680.26.thumb01_3f0bbcb273f5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 6D12D1804B65A for ; Thu, 10 Dec 2020 03:59:20 +0000 (UTC) X-HE-Tag: thumb01_3f0bbcb273f5 X-Filterd-Recvd-Size: 9876 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Thu, 10 Dec 2020 03:59:19 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id w5so2187432pgj.3 for ; Wed, 09 Dec 2020 19:59:19 -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=B+nJNAc14zNnwiniWCW6WfI6I2zFcqJ/51v3uWCVId4=; b=T5Wv4nmvP6rn0RpZ6Ot5g9vk07pjiLZeAI+i6y01lqwZzFeVImP7aVh2+2XA1v2b0O iAQGQ0QdK7BbEWuTCOxUHUABoB1FQGq2yq24jCXC1N386kFMPqz2CwqVFBL13CqGvSgD ezzEMwhNfwzdyGB7Ag3fsDM5e8Szzs+Zn3EU8jxy91czxPI2gYkvEs5hp2rqHzppKAi6 9SsdEER0ykXqhxdnC0MAzVlOVfv2WKXxl357TiD8iKKXl7nxR/nNMCjcW5C/ooXHTsZk Idl+mJRwAcjub4z0RZ6BEloHTb5Ho8QhrW9JcJ/y6sbgAMx+wHYyp5p7r8M/KE11Pw+q cAbw== 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=B+nJNAc14zNnwiniWCW6WfI6I2zFcqJ/51v3uWCVId4=; b=jR4CVPqnFFI4JJWYt6XDqBZM4hyzFJDf37gQ7wr7nMuYeS2Fp/ULpoZxl0azVCgnTW f5I/EQBm6gGsA/ot3nKkStwGOQCMTir9TlyUvYcUm7K4Jzg4Ls7mgdVq9otsJUrYxN0c 68th94FzEKaE0WpleG+Fb6Cr53lM6UPdYCE5l3wuTIokuWJQ8l3c0jVSBvO2WOBhY4ks hwgkTdxlFhXCumxwTa2kjwMJ2XJGVuu9BSaWbyyLPEc1ytE0Mg3rbJ2+biA6t/PFdad5 qCRqA4E0On6o/h13tKG2MUQB3NB9asFnEq+YxWQERIWhS/LGA+f0GhCzFQle5UlUiw4r CMTA== X-Gm-Message-State: AOAM532b6H/hs1vmOvaxFbXvflE8+WFSzPkPtllHVP6MUFyy9o55UWpz pmoz/cvpCkH8AVkJatKSjU77YA== X-Google-Smtp-Source: ABdhPJx/JWypShgKNhyFcLhmO2UkTLBOKi94hUOjTvzflK5/8tNJ4r+p3oe5V3QFJhzi0PIAGpI3TQ== X-Received: by 2002:a17:90b:4a0d:: with SMTP id kk13mr5302197pjb.23.1607572758963; Wed, 09 Dec 2020 19:59:18 -0800 (PST) Received: from localhost.localdomain ([103.136.220.85]) by smtp.gmail.com with ESMTPSA id f33sm4266535pgl.83.2020.12.09.19.59.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 19:59:18 -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 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 v8 11/12] mm/hugetlb: Gather discrete indexes of tail page Date: Thu, 10 Dec 2020 11:55:25 +0800 Message-Id: <20201210035526.38938-12-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20201210035526.38938-1-songmuchun@bytedance.com> References: <20201210035526.38938-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: For HugeTLB page, there are more metadata to save in the struct page. But the head struct page cannot meet our needs, so we have to abuse other tail struct page to store the metadata. In order to avoid conflicts caused by subsequent use of more tail struct pages, we can gather these discrete indexes of tail struct page. In this case, it will be easier to add a new tail page index later. There are only (RESERVE_VMEMMAP_SIZE / sizeof(struct page)) struct page structs can be used when CONFIG_HUGETLB_PAGE_FREE_VMEMMAP, so add a BUILD_BUG_ON to catch invalid usage of the tail struct page. Signed-off-by: Muchun Song --- include/linux/hugetlb.h | 13 +++++++++++++ include/linux/hugetlb_cgroup.h | 15 +++++++++------ mm/hugetlb.c | 16 ++++++++-------- mm/hugetlb_vmemmap.c | 8 ++++++++ 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 66d82ae7b712..7295f6b3d55e 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -28,6 +28,19 @@ typedef struct { unsigned long pd; } hugepd_t; #include #include =20 +enum { + SUBPAGE_INDEX_ACTIVE =3D 1, /* reuse page flags of PG_private */ + SUBPAGE_INDEX_TEMPORARY, /* reuse page->mapping */ +#ifdef CONFIG_CGROUP_HUGETLB + SUBPAGE_INDEX_CGROUP =3D SUBPAGE_INDEX_TEMPORARY,/* reuse page->private= */ + SUBPAGE_INDEX_CGROUP_RSVD, /* reuse page->private */ +#endif +#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP + SUBPAGE_INDEX_HWPOISON, /* reuse page->private */ +#endif + NR_USED_SUBPAGE, +}; + struct hugepage_subpool { spinlock_t lock; long count; diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgrou= p.h index 2ad6e92f124a..3d3c1c49efe4 100644 --- a/include/linux/hugetlb_cgroup.h +++ b/include/linux/hugetlb_cgroup.h @@ -24,8 +24,9 @@ struct file_region; /* * Minimum page order trackable by hugetlb cgroup. * At least 4 pages are necessary for all the tracking information. - * The second tail page (hpage[2]) is the fault usage cgroup. - * The third tail page (hpage[3]) is the reservation usage cgroup. + * The second tail page (hpage[SUBPAGE_INDEX_CGROUP]) is the fault + * usage cgroup. The third tail page (hpage[SUBPAGE_INDEX_CGROUP_RSVD]) + * is the reservation usage cgroup. */ #define HUGETLB_CGROUP_MIN_ORDER 2 =20 @@ -66,9 +67,9 @@ __hugetlb_cgroup_from_page(struct page *page, bool rsvd= ) if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER) return NULL; if (rsvd) - return (struct hugetlb_cgroup *)page[3].private; + return (void *)page_private(page + SUBPAGE_INDEX_CGROUP_RSVD); else - return (struct hugetlb_cgroup *)page[2].private; + return (void *)page_private(page + SUBPAGE_INDEX_CGROUP); } =20 static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct pag= e *page) @@ -90,9 +91,11 @@ static inline int __set_hugetlb_cgroup(struct page *pa= ge, if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER) return -1; if (rsvd) - page[3].private =3D (unsigned long)h_cg; + set_page_private(page + SUBPAGE_INDEX_CGROUP_RSVD, + (unsigned long)h_cg); else - page[2].private =3D (unsigned long)h_cg; + set_page_private(page + SUBPAGE_INDEX_CGROUP, + (unsigned long)h_cg); return 0; } =20 diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6440367a71b6..e38fee45afd3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1361,7 +1361,7 @@ static inline void subpage_hwpoison_deliver(struct = hstate *h, struct page *head) return; =20 if (PageHWPoison(head)) - page =3D head + page_private(head + 4); + page =3D head + page_private(head + SUBPAGE_INDEX_HWPOISON); =20 /* * Move PageHWPoison flag from head page to the raw error page, @@ -1380,7 +1380,7 @@ static inline void set_subpage_hwpoison(struct hsta= te *h, struct page *head, return; =20 if (free_vmemmap_pages_per_hpage(h)) { - set_page_private(head + 4, page - head); + set_page_private(head + SUBPAGE_INDEX_HWPOISON, page - head); return; } =20 @@ -1460,20 +1460,20 @@ struct hstate *size_to_hstate(unsigned long size) bool page_huge_active(struct page *page) { VM_BUG_ON_PAGE(!PageHuge(page), page); - return PageHead(page) && PagePrivate(&page[1]); + return PageHead(page) && PagePrivate(&page[SUBPAGE_INDEX_ACTIVE]); } =20 /* never called for tail page */ static void set_page_huge_active(struct page *page) { VM_BUG_ON_PAGE(!PageHeadHuge(page), page); - SetPagePrivate(&page[1]); + SetPagePrivate(&page[SUBPAGE_INDEX_ACTIVE]); } =20 static void clear_page_huge_active(struct page *page) { VM_BUG_ON_PAGE(!PageHeadHuge(page), page); - ClearPagePrivate(&page[1]); + ClearPagePrivate(&page[SUBPAGE_INDEX_ACTIVE]); } =20 /* @@ -1485,17 +1485,17 @@ static inline bool PageHugeTemporary(struct page = *page) if (!PageHuge(page)) return false; =20 - return (unsigned long)page[2].mapping =3D=3D -1U; + return (unsigned long)page[SUBPAGE_INDEX_TEMPORARY].mapping =3D=3D -1U; } =20 static inline void SetPageHugeTemporary(struct page *page) { - page[2].mapping =3D (void *)-1U; + page[SUBPAGE_INDEX_TEMPORARY].mapping =3D (void *)-1U; } =20 static inline void ClearPageHugeTemporary(struct page *page) { - page[2].mapping =3D NULL; + page[SUBPAGE_INDEX_TEMPORARY].mapping =3D NULL; } =20 static void __free_huge_page(struct page *page) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 36a2e2db7913..7f0b9e002be4 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -427,6 +427,14 @@ void __init hugetlb_vmemmap_init(struct hstate *h) unsigned int nr_pages =3D pages_per_huge_page(h); unsigned int vmemmap_pages; =20 + /* + * There are only (RESERVE_VMEMMAP_SIZE / sizeof(struct page)) struct + * page structs can be used when CONFIG_HUGETLB_PAGE_FREE_VMEMMAP, so + * add a BUILD_BUG_ON to catch invalid usage of the tail struct page. + */ + BUILD_BUG_ON(NR_USED_SUBPAGE >=3D + RESERVE_VMEMMAP_SIZE / sizeof(struct page)); + /* We cannot optimize if a "struct page" crosses page boundaries. */ if (!is_power_of_2(sizeof(struct page))) return; --=20 2.11.0