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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E3E1C433F5 for ; Wed, 30 Mar 2022 20:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245718AbiC3Uza (ORCPT ); Wed, 30 Mar 2022 16:55:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232316AbiC3Uz2 (ORCPT ); Wed, 30 Mar 2022 16:55:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3A2E2B25F for ; Wed, 30 Mar 2022 13:53:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 439FD616A6 for ; Wed, 30 Mar 2022 20:53:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8567FC340EC; Wed, 30 Mar 2022 20:53:39 +0000 (UTC) Date: Wed, 30 Mar 2022 16:53:37 -0400 From: Steven Rostedt To: Zi Yan Cc: Linus Torvalds , LKML , Mel Gorman , David Hildenbrand , Vlastimil Babka , Mike Rapoport , Oscar Salvador , Andrew Morton , Linux-MM Subject: Re: [BUG] Crash on x86_32 for: mm: page_alloc: avoid merging non-fallbackable pageblocks with others Message-ID: <20220330165337.7138810e@gandalf.local.home> In-Reply-To: References: <20220330154208.71aca532@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 30 Mar 2022 16:29:28 -0400 Zi Yan wrote: > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index bdc8f60ae462..83a90e2973b7 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1108,6 +1108,8 @@ static inline void __free_one_page(struct page *page, > > buddy_pfn = __find_buddy_pfn(pfn, order); > buddy = page + (buddy_pfn - pfn); > + if (!page_is_buddy(page, buddy, order)) > + goto done_merging; > buddy_mt = get_pageblock_migratetype(buddy); > > if (migratetype != buddy_mt > The above did not apply to Linus's tree, nor even the problem commit (before or after), but I found where the code is, and added it manually. It does appear to allow the machine to boot. -- Steve