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 75C27C43334 for ; Mon, 20 Jun 2022 11:42:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0F0D6B0071; Mon, 20 Jun 2022 07:42:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBFB86B0073; Mon, 20 Jun 2022 07:42:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D86A28E0001; Mon, 20 Jun 2022 07:42:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C99836B0071 for ; Mon, 20 Jun 2022 07:42:40 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 90F5B80C59 for ; Mon, 20 Jun 2022 11:42:40 +0000 (UTC) X-FDA: 79598426880.18.A911554 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 16743C0093 for ; Mon, 20 Jun 2022 11:42:39 +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 DD46F612CB; Mon, 20 Jun 2022 11:42:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1465C3411C; Mon, 20 Jun 2022 11:42:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655725358; bh=XjBQVHtkZS96FR702JUYc7O6XJ6QMpLEjXEb3IAjCtU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nTEHa144aq1WqQkzQQ42Q0xeWOjDA30l712yxqZQ3PKJ+WkZj86BAaxSibD6r2pxK /BFoOen3d9dHYExg/T2qGqLPWpDV3ddhuHsvRuCtD6iOkRQ/Z9s7XWlp8B3oIfJjRp 4OAVIIQYURLIzvgf32esC8xKIXnU4csyrYMKgdg0= Date: Mon, 20 Jun 2022 13:42:35 +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 5.15] mm: validate buddy page before using Message-ID: References: <20220616161746.3565225-1-xianting.tian@linux.alibaba.com> <20220616161746.3565225-6-xianting.tian@linux.alibaba.com> <35bd7396-f5aa-e154-9495-0a36fc6f6a33@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <35bd7396-f5aa-e154-9495-0a36fc6f6a33@linux.alibaba.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655725360; a=rsa-sha256; cv=none; b=dWS7DX7yQSOYMYCmdvad56xudeTf5QuJZR2HqCiDz2ziHJbDbZV/s6LKHd2vtCrO5gCRW4 KRg1yu6lFmeMXqOkmckfRARDpIAlTfRM6z5m7WZG+yXXGVwXfsFKb7bLi4ZerMCkAKmXCG OrUOVvBjFH/+rXcKF9sM+Ut2KicR5dE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=nTEHa144; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf10.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=1655725360; 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=Yllb3wsWJqe8xORbZ3PHshOjh23nqjNKqZoj/kz97CI=; b=En0V8dXz3QtuHC6LV7ZG/ugU5IstRygwK7YTT6M5+Zk9C7gG1wfqRG15tU9QKSy4WloJ+A UH8LL3RkRVDpcq/hWnlmLhVQJBmAlgAJDaw/xIEgdCvaA1FzEVKaBYf4TkH2LoK27SOr1a 7tVJeiDepC8gkx5HbW0tMn4jiUDs1LQ= Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=nTEHa144; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf10.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Rspam-User: X-Stat-Signature: 1myyyw7ba5w6gj4yfo5wtktpdt67ua9o X-Rspamd-Queue-Id: 16743C0093 X-Rspamd-Server: rspam08 X-HE-Tag: 1655725359-96005 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 Mon, Jun 20, 2022 at 06:54:44PM +0800, Xianting Tian wrote: > > 在 2022/6/20 下午6:17, Greg KH 写道: > > On Fri, Jun 17, 2022 at 12:17:45AM +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 unset_migratetype_isolate(), we also need the fix, so move page_is_buddy() > > > from mm/page_alloc.c to mm/internal.h > > > > > > 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/internal.h | 34 ++++++++++++++++++++++++++++++++++ > > > mm/page_alloc.c | 37 +++---------------------------------- > > > mm/page_isolation.c | 3 ++- > > > 3 files changed, 39 insertions(+), 35 deletions(-) > > What is the commit id of this in Linus's tree? > > It is also 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 This commit looks nothing like what you posted here. Why the vast difference with no explaination as to why these are so different from the other backports you provided here? Also why is the subject lines changed? Something went really wrong here, I'm going to drop all of these from the stable queues and wait for a full series of all new backports, with the correct upstream commit id added, and the original signed-off-by lines preserved. thanks, greg k-h