From patchwork Tue Apr 15 11:18:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 14052011 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 EA5C9C369B4 for ; Tue, 15 Apr 2025 11:19:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CDB02800EA; Tue, 15 Apr 2025 07:19:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5517E2800BD; Tue, 15 Apr 2025 07:19:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A6552800EA; Tue, 15 Apr 2025 07:19:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1528F2800BD for ; Tue, 15 Apr 2025 07:19:15 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D0F871CD41C for ; Tue, 15 Apr 2025 11:19:15 +0000 (UTC) X-FDA: 83336031870.24.6A20BC3 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf05.hostedemail.com (Postfix) with ESMTP id AE8C110000C for ; Tue, 15 Apr 2025 11:19:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LGVWtH98; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=febXkoSZ; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LGVWtH98; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=febXkoSZ; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744715954; a=rsa-sha256; cv=none; b=nTYipAfmhXzNk8oIG6Krpx/d/13TS1CafNzZAnYzMxxPosQk8KvC6ZYKu+Od8tuShdI3Yn Oy6QvtiFRl7zafdtV+QwvWioAyKu35ceRo5kT6hU+DuUBuzL7HFubGIvRZyq7MUEa7dXhM by8OF4tV8nHurjCgP9klyx5WdXP8nC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744715954; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=2tkYgBN93De44ZUzQ+u2SMXn56k/+Th3v9B5mugI918=; b=1ntc2aAOMtveEA/PhvCmOcUqPFnuoDLU+1WDVm+z6k9RNFJplpydNg+7Yf1oXYV/pbvD5t EZY+U+maCkaqnYWDZe8d2r7Gibow+L1gCyRU+xoa59kFgRgiHWPQHa8Ehnaqe9hwZhQovY t75rTLbGNR/bEg4SRjdjcRdDavn0/tQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LGVWtH98; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=febXkoSZ; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LGVWtH98; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=febXkoSZ; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DDE931F385; Tue, 15 Apr 2025 11:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744715951; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2tkYgBN93De44ZUzQ+u2SMXn56k/+Th3v9B5mugI918=; b=LGVWtH989xPiwP8zqKoBX3bYue6AZmt3bqCzdRB/dSU3pIlIKYnSQZK63L/CuPgDjgOVpv gUK58QjZqRjUuWcS2+OTfVBiL0wih43w//6Cue30f7FlFaUqWGhWx4QnDLK3hyAkGdq0sw XW7QXiouBwzSTFrzwilRea+XcOfb5Do= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744715951; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2tkYgBN93De44ZUzQ+u2SMXn56k/+Th3v9B5mugI918=; b=febXkoSZ+3CTR0yy0FFWj5hJ/EHVkLUE/YQXJwalZx72TGin1+mlpqdE/38g3THbEmMPdX nOv8yqgAsJwbL3BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744715951; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2tkYgBN93De44ZUzQ+u2SMXn56k/+Th3v9B5mugI918=; b=LGVWtH989xPiwP8zqKoBX3bYue6AZmt3bqCzdRB/dSU3pIlIKYnSQZK63L/CuPgDjgOVpv gUK58QjZqRjUuWcS2+OTfVBiL0wih43w//6Cue30f7FlFaUqWGhWx4QnDLK3hyAkGdq0sw XW7QXiouBwzSTFrzwilRea+XcOfb5Do= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744715951; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2tkYgBN93De44ZUzQ+u2SMXn56k/+Th3v9B5mugI918=; b=febXkoSZ+3CTR0yy0FFWj5hJ/EHVkLUE/YQXJwalZx72TGin1+mlpqdE/38g3THbEmMPdX nOv8yqgAsJwbL3BA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7FCAE137A5; Tue, 15 Apr 2025 11:19:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id vVx2HK9A/mdvegAAD6G6ig (envelope-from ); Tue, 15 Apr 2025 11:19:11 +0000 From: Oscar Salvador To: Andrew Morton Cc: Muchun Song , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH] mm, hugetlb: Increment the number of pages to be reset on HVO Date: Tue, 15 Apr 2025 13:18:59 +0200 Message-ID: <20250415111859.376302-1-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AE8C110000C X-Stat-Signature: zdg69tbmapd56k4tgwesh5ubterr3di4 X-Rspam-User: X-HE-Tag: 1744715953-507633 X-HE-Meta: U2FsdGVkX1+GT3SggYBELdj9nnWQdREZ+1osP/uAAyXMf11ZMgAuCC5euj7mD1WO1KflkqkEYshgpYHHYREC0SMQ3lOnyhMgcG48JdUKo+OlSGEOCJ+qjni054VWyFdUL/2v9qu/D7FCKBwAsw5Qs3B5U8aZe2++8iimzEokbCPSucYtzuecvW+3xFh7V5AmPi+RgG1BVqWvvmpwIu0obDLnTrbM3WMzZvGYnFRTQohFDKalgrGY0O48AbzTi/QI2FhfkXCxrPrRRrHitu3h3NpLgp5wVsA1QogmwwIHQ0/GxbIlSXbKy0t5igs1rsny1BAnnM8Hyf2fU2mYWg3WqLuyifbi3jp6yI27R9Iuff2q9UJDLZfeJS1YV/edyIhrwRheVuOQvqrqgkrrstUvp1niLjQf/K7YvnTqFuAwvFKUmAnudiMSmv1jlbgiiQo3AX/wQoKycnr4iBmsT1FHg3udS3BXmfMHsr1/ka/pQgYnojJ5SUbfne6L544PjBsDgoNnGqMTLTnSXjhcxdGkLmkd4h6OvMC3E+bg0FfB/SfbnbFWWmxEBpUKybLWAcxsOv9ivrn42aUNgHQmRXbg4lXwL5emQJhTpnPRq8OTZMH1uiUXasQZB56xg941L/W+MuPBy/iJN7QGA4QiWg0ysCmMc2BR6ERVjHeyMOp7/uOXo/HTw9cG1L7GUhzdQ03CqVO4pI0GV+iJIYYvI0XPsF8e2pA2cl6wl5BHNuVAe/K/rpHirI/fjPcGHRLeqT5F0Z7s1aR23lRX/P3hFy5bN7OfwVh2SSuj2+zIgqtbnbF8lY016qBO3DexV6QW5qqO8KdsK6tckHtgggWddp3BjKhcQpQlLYDg60rKJ/skD9UKGC1ZY/5yEefGYnGN3oilPQSYFCgAHH5Nfwnntgwvm+QZLkMW5k4lw1cCFPZD8+MjIFtvL63TAmDXOqn5cuKZQ5EglgdEhZf9yT0nZmd CeMztZTY 6TJvrf4n2rjSHOjVs97dmDMSM8FEBfH6PovLHHIHbPl3uY6nx88gosi7Wd8W2f3NrUuCTzWR2dGNc6lP3CgXFhwY9EIPWvOy76uuSEtuIBsibWt4TKVDCTWOj5luZJdvXK6NXc9uhvTSyVUNtxFxmuOE7lN4ow/kpxj91lk41RRuOTjibIHZhT4mPRfpL+dO2HmSshRshAlBjdwCns/KIunKgk7Rg6axakj6mWXrQE/EKbXN458xZdoFaYm/gqKYXpnZOd7sQ4mI1wE9oc6pp3NyoYDfq/FgX2Bw1r2DsqsTYtjfMiq4Nn1aAIQ== 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: commit 4eeec8c89a0c ("mm: move hugetlb specific things in folio to page[3]") shifted hugetlb specific stuff, and now mapping overlaps _hugetlb_cgroup field. Upon restoring the vmemmap for HVO, only the first two tail pages are reset, and this causes the check in free_tail_page_prepare() to fail as it finds an unexpected mapping value in some tails. Increment the number of pages to be reset to 4 (head + 3 tail pages) Fixes: 4eeec8c89a0c ("mm: move hugetlb specific things in folio to page[3]") Suggested-by: David Hildenbrand Signed-off-by: Oscar Salvador Reviewed-by: David Hildenbrand Reviewed-by: Muchun Song --- mm/hugetlb_vmemmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 9a99dfa3c495..27245e86df25 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -238,11 +238,11 @@ static void vmemmap_remap_pte(pte_t *pte, unsigned long addr, * struct page, the special metadata (e.g. page->flags or page->mapping) * cannot copy to the tail struct page structs. The invalid value will be * checked in the free_tail_page_prepare(). In order to avoid the message - * of "corrupted mapping in tail page". We need to reset at least 3 (one - * head struct page struct and two tail struct page structs) struct page + * of "corrupted mapping in tail page". We need to reset at least 4 (one + * head struct page struct and three tail struct page structs) struct page * structs. */ -#define NR_RESET_STRUCT_PAGE 3 +#define NR_RESET_STRUCT_PAGE 4 static inline void reset_struct_pages(struct page *start) {