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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CA25C433EF for ; Mon, 20 Jun 2022 10:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 181208E0001; Mon, 20 Jun 2022 06:17:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1101E6B0073; Mon, 20 Jun 2022 06:17:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F13938E0001; Mon, 20 Jun 2022 06:17:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DDD736B0071 for ; Mon, 20 Jun 2022 06:17:35 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AFE2333BBA for ; Mon, 20 Jun 2022 10:17:35 +0000 (UTC) X-FDA: 79598212470.01.60CAD5D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 42CCB1A0015 for ; Mon, 20 Jun 2022 10:17:35 +0000 (UTC) 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 32C1E60F26; Mon, 20 Jun 2022 10:17:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11AA8C341CD; Mon, 20 Jun 2022 10:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655720253; bh=aImB4dOAnpq7fh83qe9WnFO2jaS12cjvFvZjTv0nroc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=yUmvhvmRw3/ZAXcKitI1BMSv+r0TqfV64BDHoZ/kO2QT6n/DT8xZEM4mGmEJUtvNc shEMA3hJfdKjQjcCJLgtOql20A/gsWbYHvgceKs7RLzMa9ynzcCSgaZgWCSW6lIr28 rOyYSlAl46rLAomRQs+PqiiIP0dBK7a5UOUo85Dg= Date: Mon, 20 Jun 2022 12:17:22 +0200 From: Greg KH To: Xianting Tian Cc: akpm@linux-foundation.org, ziy@nvidia.com, stable@vger.kernel.org, guoren@kernel.org, huanyi.xj@alibaba-inc.com, guohanjun@huawei.com, zjb194813@alibaba-inc.com, tianhu.hh@alibaba-inc.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4.9] mm: page_alloc: validate buddy page before using Message-ID: References: <20220616161928.3565294-1-xianting.tian@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655720255; a=rsa-sha256; cv=none; b=p39jXW4mXUMzzBxRk0fAjW37y+NP/7KThE4d2d5IKBzHYwz186mqb0MWU37l33vpPAvl4v xD2zWFdtSJ+1ETW33tYmq+WW9ToO4eJYerT2BRQtwArGnK/Wg1u70bKPRap79j5+mhhq34 Ja/MBmcd4g3T759+tQ2JTgkNcbdVCkU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=yUmvhvmR; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655720255; 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=y9atv7HNC9fBaCVSh/XHTu1mlYne8b5GUJglO4JWY7g=; b=EQxS4kb0sM3PLIFWFsl/56buLR2JBXHQf8TyAns86V29SoVD3wSDWsREDTzgBAcrh3KQy9 NMWCswdBIREAXCYXLwnF37HCVMDpRTBaz/K8J+5/x9v4DYil4+C/OyPvttaUFaKqgSF+sL wysenx219Cb1AAT7iGZTQ4GnrMZ3VxI= Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=yUmvhvmR; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Stat-Signature: o8h4ypnkpojcs1hofk917d5rf6pbnwh8 X-Rspamd-Queue-Id: 42CCB1A0015 X-Rspam-User: X-Rspamd-Server: rspam03 X-HE-Tag: 1655720255-331849 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: On Fri, Jun 17, 2022 at 04:25:35PM +0800, Xianting Tian wrote: > > 在 2022/6/17 下午4:20, Greg KH 写道: > > On Fri, Jun 17, 2022 at 12:19:28AM +0800, Xianting Tian wrote: > > > Commit 787af64d05cd ("mm: page_alloc: validate buddy before check its migratetype.") > > > fixes a bug in 1dd214b8f21c and there is a similar bug in d9dddbf55667 that > > > can be fixed in a similar way too. > > > > > > In addition, for RISC-V arch the first 2MB RAM could be reserved for opensbi, > > > so it would have pfn_base=512 and mem_map began with 512th PFN when > > > CONFIG_FLATMEM=y. > > > But __find_buddy_pfn algorithm thinks the start pfn 0, it could get 0 pfn or > > > less than the pfn_base value. We need page_is_buddy() to verify the buddy to > > > prevent accessing an invalid buddy. > > > > > > Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") > > > Cc: stable@vger.kernel.org > > > Reported-by: zjb194813@alibaba-inc.com > > > Reported-by: tianhu.hh@alibaba-inc.com > > > Signed-off-by: Xianting Tian > > > --- > > > mm/page_alloc.c | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > > > index a6e682569e5b..1c423faa4b62 100644 > > > --- a/mm/page_alloc.c > > > +++ b/mm/page_alloc.c > > > @@ -864,6 +864,9 @@ static inline void __free_one_page(struct page *page, > > > buddy_idx = __find_buddy_index(page_idx, order); > > > buddy = page + (buddy_idx - page_idx); > > > + > > > + if (!page_is_buddy(page, buddy, order)) > > > + goto done_merging; > > > buddy_mt = get_pageblock_migratetype(buddy); > > > if (migratetype != buddy_mt > > > -- > > > 2.17.1 > > > > > What is the git commit id of this change in Linus's tree? > > It is this one, > > commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 > Author: Zi Yan > Date:   Wed Mar 30 15:45:43 2022 -0700 > >     mm: page_alloc: validate buddy before check its migratetype. > >     Whenever a buddy page is found, page_is_buddy() should be called to >     check its validity.  Add the missing check during pageblock merge check. > >     Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable > pageblocks with others") >     Link: > https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ >     Reported-and-tested-by: Steven Rostedt >     Signed-off-by: Zi Yan >     Signed-off-by: Linus Torvalds > All now queued up, thanks. greg k-h