From patchwork Mon Feb 24 16:55:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13988497 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 AF9E0C021A4 for ; Mon, 24 Feb 2025 16:56:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 397556B008C; Mon, 24 Feb 2025 11:56:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FA7F6B0092; Mon, 24 Feb 2025 11:56:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DA4A6B0093; Mon, 24 Feb 2025 11:56:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DE3AC6B008C for ; Mon, 24 Feb 2025 11:56:20 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A9BB616199A for ; Mon, 24 Feb 2025 16:56:20 +0000 (UTC) X-FDA: 83155441320.13.120D982 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 37A6C180015 for ; Mon, 24 Feb 2025 16:56:17 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GvUAQUbR; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740416177; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2J0EAZe5fI1EPFno0gWSdFeb6AH1J2rAdhMuBREbwsI=; b=A/bD0Jw5iUaFbVleeRZDDiL3xjtevCYaGDIYLz8ZUoJSNUn/Nov4e2kVPnJMJ/2gQkp865 DxisSGfGTXvzNpRuqev7e+bi1KZZCWqZGu+eydmI37hhjv4/m2N2ctG5k00jHuwRaL4DA7 S4ByQkLxPfPTQrczBYWGOFbr2Oc/Rpo= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GvUAQUbR; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740416177; a=rsa-sha256; cv=none; b=WYvZ73z66/5M7sxcQQ+GUAEKg3s9Zo9QzwII8UM/3t0eqDid9p+NLIlCdprWcZ10bSiroq LZzQCRL98J6+/hG/Iz/bKjZVUNZOjSPE3kddXfsHp5T8cyOU+MyUP4nuLOh/olxJLytjpS P87Z/9BdqalGFHSIctANF3kadV7EQgM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2J0EAZe5fI1EPFno0gWSdFeb6AH1J2rAdhMuBREbwsI=; b=GvUAQUbRRQ8LxtskxgLAV5J6UGdXjml2GtTc/dC6XpfSKztktiZoU2nMWXMKU96JKY5WH2 +QNR35H3w9b7T+MzOQWKZR0AKsBXWzM4nqYfVMz51QPY7ou/O9RNtM/78Nn9jcbbAfuvBq mPN5FDi+hanbDhapXwH8GkhtoO/tj2k= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-1L6u5aBYOlq2ALk6OzFoYQ-1; Mon, 24 Feb 2025 11:56:15 -0500 X-MC-Unique: 1L6u5aBYOlq2ALk6OzFoYQ-1 X-Mimecast-MFC-AGG-ID: 1L6u5aBYOlq2ALk6OzFoYQ_1740416174 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38f455a8fcaso3573126f8f.2 for ; Mon, 24 Feb 2025 08:56:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416174; x=1741020974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2J0EAZe5fI1EPFno0gWSdFeb6AH1J2rAdhMuBREbwsI=; b=jFSKDkXOl7eUIMCSF32jvOL31Qu8FSEoUhZMUrsdJ+iXaoj4x9AJwo00ggO6InqOq6 EPjfmNEnabKOaAQgMACoi59Gi0HoI62qfPB1k3S49YCDS9H0IbfAObk8yGnrhudt9s4V QQCcB/hE7wSAEAM4a/tMVpwAgwk0y1J9wRw217U3S5IboX/eqttJWdZZO1Ow1mC7ODcA PSnhEYS5S+JLx5tYf2lMsAUUecOYQ7X1MfmtZan9X3PT58/Y9pdCgcoJbff+1i4U7LkK XH3/X3QBh6cv3qwc41eFtS7q3OITiy755j7FWSOOQTEoMFb1aB2S+DPIR7jdnZMZtOnu R8eA== X-Forwarded-Encrypted: i=1; AJvYcCW8aiFZxjj62TNg45tUWCmjrxvOJbvwtNP2sUe5bc9Kb5TTzV9UPHWNcrw+ANDgOXH76CyM21TzDg==@kvack.org X-Gm-Message-State: AOJu0YzKR6nQztd9/UH/NuNwxsRgHyGwnl73RPPaGxLHm9ap7zfYEb46 wg5WjjVks0NENj8cjRAPddjbj6aBkzAvWocwvQzL0PO4fzdoQDq1qvLlh3KdlmbuErNQkq1lknd YiXY7bTbwsiocmyD72gQy/PpVzNsxppdd/rvn2ux27Mh3+4T4 X-Gm-Gg: ASbGncsUNqjBUywaaokrlT8Ntkada4nTXRZeRt0jaJ6NkB4nmINV63jy71/gaJXe+Hu F9WQqwj2iTvg0GVEzhHzyFJY8c8fxnUQ9lqJk7LGw9Yhk4qqxEUflBv/imkhyoAtWNktxGasO7/ VLuN6HyKKf8Iw1tiPRXb494ht7Vpe36LS5IX0jkbCMMnQROfW7eRPKEa2hi7qW2/0SzGW8LkNSG L+GsZIpeAxvlMCGVjL+QM3Ps3Ds8ixqGiHi1mAMXPJQApcJkgi3/GHTB7/A33cbaTddi0vp7vW4 N8x1VSkURwbmxzlMz/0QfnuGZDouaFBE5PlbhU89HQ== X-Received: by 2002:a05:6000:178c:b0:38f:32ac:7e55 with SMTP id ffacd0b85a97d-38f6f0bd36dmr13581419f8f.48.1740416173936; Mon, 24 Feb 2025 08:56:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHEK4+EskiCQe6b4Tt/1yywMxIN3N8u+em5znQyoHp6oO/UQ3gXRmnxMS/Oum/lKFSKXiOoHw== X-Received: by 2002:a05:6000:178c:b0:38f:32ac:7e55 with SMTP id ffacd0b85a97d-38f6f0bd36dmr13581391f8f.48.1740416173570; Mon, 24 Feb 2025 08:56:13 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258ddbe0sm32403003f8f.39.2025.02.24.08.56.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:13 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn Subject: [PATCH v2 04/20] mm: move hugetlb specific things in folio to page[3] Date: Mon, 24 Feb 2025 17:55:46 +0100 Message-ID: <20250224165603.1434404-5-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Q_7W7wf0YhstYVe3ix8oYRSErUHT9yv30f8yNNFaw1w_1740416174 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 37A6C180015 X-Stat-Signature: oxrfhy3a73s6cx61goz1n6fu87qmcnfk X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740416177-461529 X-HE-Meta: U2FsdGVkX199lWyFDc2Ag+o39YOMDyzKO3POaZFo01eypqHB26ccSUea51/5WYZ0mnG3h1hQoNc5fh7IBZvwIL1hDxC/9/b0VThtuXYpsCrgKhUWXfeh45tpL3n2VZzlxU+EOi+r56FVj7GvABEDT/rjsPK67KH/oQGTiH0IZIBQJD55GS91jEkhaqQ7KAdP5Uj1lhybchOQLkRnLQMAaDGEVBwN5RBeUw6w7m5ANjAy4oErEoLRg2GholAwqpbnpN8ju4f9OBxb4F+AeGfp95jOky+3NDqgMa5fn2xltJfkTMQojnY0wI9A8Z/4NUSUVomJQATkcZdS8H0UOI34e1Pu2dk7ls3FMamX6ZTmNJG3d177udIPOh1sXmobCaSpKFOnuj6niXnnu1yEFS4FA8vS3pbOVf9yWX0+NzHkhOfiHqynPS9YHC5H3uvIZF0HbcElcFEdw1RvhOHippuD8Q6Ocl7GfgcF4jckORaWrTdcAP7ROsuUZaD1zU8LA4nnwQHC3R2hPDVSX9fvDtgwLQALwO8ft3J8jOZpvPS+N0VWTk/zSOVpr+EcsgP+8cjwJ3NTngM+eQ3Zp6Jv+9nglLYt/SzT6KcMtgdvYwPzsjn15p4HGcutBhmOMdbHyyIMCLIBDkSupklhdIVdNHEiSWhFoCjTe+vvYaTu+EHa+xlzR0V3air/CRLu+BBMnNQfFXqhxJUrFMhXUCvIJT210Vu1vOvAOMlZagDinYNrP2GSdUHuqikEEAwjRyZeiVf4Ev0k7FQyqzrPDA4Hlg5S+qPHqb0M4Cyx1NyG4G4yO7Uy7ysptK/9AswyztDH5o4AuxRWxxXt2gWLt4b/EZGtYzDvGGCS7+4kn4FMrSxY9NqyfiRJ/o65fRTO8gTm9I708HiV/e1llKRm+C0REngbeNvn0FJ3zTUMgFWtxk+KqTOOScYR9hpIVtQDfG54OcVZnqSvssMrZXP9l5rBtJu 99VViGM1 mCyIAPYLiLJEVrxiRWWuUSsq4kXcrt5L1R538kb6vmsrHufqUaPID+yGwKiSM7cBQu7xQRtISGDqbIA3li/68jQmTgQQPk9pC9fRM9VFhlhYPslQgXCe6KAIR3AAuXdgITki2sHemAUNqgIIBa3yJj/oLml00u6fwiiN38Z+HsJErrdHn4NoHGmvedPL7d9EGKGcScRUR4ueVG6foHxslGRbBWdP1q8dFlLKiG4H2bLASMhCFjmEfKQUmyqEK7AuujADxIn35egzGS6KcTc5zxx7lP+DbKi1GOTBRLBIm2YB4VoWSn/1cshsIlp6pUfanAMxI/SFcxEDDzzP0DMB8RAxnSbCJIh3y0kebo9qd6xhdLxCjo8KLSc3+HuuTGGnD1p+Y/HdcXGTnzjtUHE++wCRiOwYh9VGQxgn91LiZ2031BMkFGAgDOpwjKiiy0Ga2j9cU1qbMS6Xra9WQ7GWMjoUAVExqWMUCwrYOxJbMl/XuB39xmzt/HtF5Fw== 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: List-Subscribe: List-Unsubscribe: Let's just move the hugetlb specific stuff to a separate page, and stop letting it overlay other fields for now. This frees up some space in page[2], which we will use on 32bit to free up some space in page[1]. While we could move these things to page[3] instead, it's cleaner to just move the hugetlb specific things out of the way and pack the core-folio stuff as tight as possible. ... and we can minimize the work required in dump_folio. We can now avoid re-initializing &folio->_deferred_list in hugetlb code. Hopefully dynamically allocating "strut folio" in the future will further clean this up. Signed-off-by: David Hildenbrand --- include/linux/mm_types.h | 27 +++++++++++++++++---------- mm/hugetlb.c | 1 - mm/page_alloc.c | 5 +++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index e81be20bbabc6..1d9c68c551d42 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -405,20 +405,23 @@ struct folio { unsigned long _flags_2; unsigned long _head_2; /* public: */ - void *_hugetlb_subpool; - void *_hugetlb_cgroup; - void *_hugetlb_cgroup_rsvd; - void *_hugetlb_hwpoison; + struct list_head _deferred_list; /* private: the union with struct page is transitional */ }; + struct page __page_2; + }; + union { struct { - unsigned long _flags_2a; - unsigned long _head_2a; + unsigned long _flags_3; + unsigned long _head_3; /* public: */ - struct list_head _deferred_list; + void *_hugetlb_subpool; + void *_hugetlb_cgroup; + void *_hugetlb_cgroup_rsvd; + void *_hugetlb_hwpoison; /* private: the union with struct page is transitional */ }; - struct page __page_2; + struct page __page_3; }; }; @@ -455,8 +458,12 @@ FOLIO_MATCH(_refcount, _refcount_1); offsetof(struct page, pg) + 2 * sizeof(struct page)) FOLIO_MATCH(flags, _flags_2); FOLIO_MATCH(compound_head, _head_2); -FOLIO_MATCH(flags, _flags_2a); -FOLIO_MATCH(compound_head, _head_2a); +#undef FOLIO_MATCH +#define FOLIO_MATCH(pg, fl) \ + static_assert(offsetof(struct folio, fl) == \ + offsetof(struct page, pg) + 3 * sizeof(struct page)) +FOLIO_MATCH(flags, _flags_3); +FOLIO_MATCH(compound_head, _head_3); #undef FOLIO_MATCH /** diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9faa1034704ff..2ad5c292568ab 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1646,7 +1646,6 @@ static void __update_and_free_hugetlb_folio(struct hstate *h, folio_ref_unfreeze(folio, 1); - INIT_LIST_HEAD(&folio->_deferred_list); hugetlb_free_folio(folio); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bdfc954dab9aa..05a2a9492cdb0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -971,6 +971,11 @@ static int free_tail_page_prepare(struct page *head_page, struct page *page) goto out; } break; + case 3: + /* the third tail page: hugetlb specifics overlap ->mappings */ + if (IS_ENABLED(CONFIG_HUGETLB_PAGE)) + break; + fallthrough; default: if (page->mapping != TAIL_MAPPING) { bad_page(page, "corrupted mapping in tail page");