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 24792C433E0 for ; Mon, 8 Feb 2021 08:53:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75F8864E82 for ; Mon, 8 Feb 2021 08:53:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75F8864E82 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 E68866B006C; Mon, 8 Feb 2021 03:53:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF3B26B0074; Mon, 8 Feb 2021 03:53:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C69A86B0075; Mon, 8 Feb 2021 03:53:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id ACC886B006C for ; Mon, 8 Feb 2021 03:53:24 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 7B0AE180AD80F for ; Mon, 8 Feb 2021 08:53:24 +0000 (UTC) X-FDA: 77794486728.23.pail29_29086ca275fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 5AE1737604 for ; Mon, 8 Feb 2021 08:53:24 +0000 (UTC) X-HE-Tag: pail29_29086ca275fd X-Filterd-Recvd-Size: 8899 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Feb 2021 08:53:23 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id y10so7450567plk.7 for ; Mon, 08 Feb 2021 00:53:23 -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=m2r1FERWV6CvJlF69ZnvfWhQq8y+N+1HmL5D3fr7REw=; b=mBcQo7C28Z/wKNxelavNo4kQzH38pqJyrK3MgBOwLmMt1/u8We3+zUu4Tp1UGo52bF TIT934gPZymDlU6DI6U8i8czBR5biwD4HgRPHf7BsSs32Lf7/aA+gl3S3Y5Q1DuFAdi8 ExZm9nxwTo6s/7WmH+lsgGEwcB+WDm5VggdMiQ7X2SQaPvSfLbTwg4b3yQyFq30TQ9Xp P2FLDjRm8zhTfJS6VQnaUSYLy9yMxjqxBNmZzHdFlISNgwSrJ0201Qr09wQ1ubPu/vqZ cQeZW2PpiKc6hgUbnyLarmgVGqUFrxYJyatJAuVWk57RT3BuRjkbNqVz9XCTU+/SnSdq Wwdg== 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=m2r1FERWV6CvJlF69ZnvfWhQq8y+N+1HmL5D3fr7REw=; b=F98euV4C918U76YBxEk/AvBTAhYWQlz+W+ijSoCrxvF+o3c1xK7uMcHxhjI6uU/aM0 FP1e4rMoK5vQELKaSmVxDG8bVgMPiahVxHsLWXQk9y+a09DPfwPoc231163Rs723b+CN mZCr/IAnAmxzILJed6Pl8me0smkF9Tw7M2pZdNdwepABsW7NekOrjyR0KQgnj0vUiUaI nBwQGG4A31hTkzgR/0ni4nZWoQ3kbQESJuVNbQLVdwsbcsQAsbb829KsVwqAPWCP2Wyy ENY/tnUT8CoQkcSWu871oYJxzOyslF1nOtuXux/j1ENCRoRVGTeutLdXkjvKaA9f6b0V LKqw== X-Gm-Message-State: AOAM532emoRIyokUtyxfNmehlnRCJUtgMNwfE0/R/l1UzQfDTTXKrdn+ Mku/nVpLDJn2fLN51I/bE2+rKA== X-Google-Smtp-Source: ABdhPJwOtrHuyQXU5ZS8lGlTx0DLdMx6kmpQHx021XNgBGLZl50up3yVnxZ+F2qQLHOMZ9ycgOf4LA== X-Received: by 2002:a17:90a:1b4f:: with SMTP id q73mr13180015pjq.187.1612774402732; Mon, 08 Feb 2021 00:53:22 -0800 (PST) Received: from localhost.localdomain ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id g15sm17205179pfb.30.2021.02.08.00.53.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Feb 2021 00:53:22 -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, joao.m.martins@oracle.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 , Miaohe Lin Subject: [PATCH v15 7/8] mm: hugetlb: gather discrete indexes of tail page Date: Mon, 8 Feb 2021 16:50:12 +0800 Message-Id: <20210208085013.89436-8-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210208085013.89436-1-songmuchun@bytedance.com> References: <20210208085013.89436-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 that 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 Reviewed-by: Oscar Salvador Reviewed-by: Miaohe Lin --- include/linux/hugetlb.h | 20 ++++++++++++++++++-- include/linux/hugetlb_cgroup.h | 19 +++++++++++-------- mm/hugetlb_vmemmap.c | 8 ++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 775aea53669a..822ab2f5542a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -28,6 +28,22 @@ typedef struct { unsigned long pd; } hugepd_t; #include #include =20 +/* + * 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 gather these discrete in= dexes + * of tail struct page here. + */ +enum { + SUBPAGE_INDEX_SUBPOOL =3D 1, /* reuse page->private */ +#ifdef CONFIG_CGROUP_HUGETLB + SUBPAGE_INDEX_CGROUP, /* reuse page->private */ + SUBPAGE_INDEX_CGROUP_RSVD, /* reuse page->private */ +#endif + NR_USED_SUBPAGE, +}; + struct hugepage_subpool { spinlock_t lock; long count; @@ -607,13 +623,13 @@ extern unsigned int default_hstate_idx; */ static inline struct hugepage_subpool *hugetlb_page_subpool(struct page = *hpage) { - return (struct hugepage_subpool *)(hpage+1)->private; + return (void *)page_private(hpage + SUBPAGE_INDEX_SUBPOOL); } =20 static inline void hugetlb_set_page_subpool(struct page *hpage, struct hugepage_subpool *subpool) { - set_page_private(hpage+1, (unsigned long)subpool); + set_page_private(hpage + SUBPAGE_INDEX_SUBPOOL, (unsigned long)subpool)= ; } =20 static inline struct hstate *hstate_file(struct file *f) diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgrou= p.h index 2ad6e92f124a..c0cae6a704f2 100644 --- a/include/linux/hugetlb_cgroup.h +++ b/include/linux/hugetlb_cgroup.h @@ -21,15 +21,16 @@ struct hugetlb_cgroup; struct resv_map; struct file_region; =20 +#ifdef CONFIG_CGROUP_HUGETLB /* * 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 +#define HUGETLB_CGROUP_MIN_ORDER order_base_2(NR_USED_SUBPAGE) =20 -#ifdef CONFIG_CGROUP_HUGETLB enum hugetlb_memory_event { HUGETLB_MAX, HUGETLB_NR_MEMORY_EVENTS, @@ -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_vmemmap.c b/mm/hugetlb_vmemmap.c index ac29753fb297..a67301a9d19a 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -272,6 +272,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 that 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)); + if (!hugetlb_free_vmemmap_enabled) return; =20 --=20 2.11.0