From patchwork Mon Oct 24 11:28:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp555153wru; Mon, 24 Oct 2022 09:59:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cDiKSFN3SpsHNaaU5j14sEeqjzk28aS8gyCoKb0+VjiOTQ8NvZ2a/l9JBpCqg3iplusX4 X-Received: by 2002:a05:6402:2201:b0:44f:443e:2a78 with SMTP id cq1-20020a056402220100b0044f443e2a78mr31151162edb.76.1666630749627; Mon, 24 Oct 2022 09:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630749; cv=none; d=google.com; s=arc-20160816; b=msf+6oDRtqr+/ZLoGJlMltpWEEMIVe8EPQ4MrsNggy9wjMohDB1YHR8OyNwNKGizVj Da2y2OYcOsZ5LREPFIX8G1lYZI1nBFjZ5Gpk6a2W9grQe+T2LFtPAT9hEeFqCUlx9tFw ZUyi6TyZBEnF8cOf125JQvC8OWodTlEkS+PGZRBixbp9pFLEBe0qmOafe2g3DY9J1uJX ULsJa88LpJFQGq9SwDQf31OtTadVd73KbMbGnXPE7o9qN1BJVUZQnA+JYwB+7S5feqEf 4mLWlsWoKfiOaUp3+hMbXPnoe/Hys3XQAQs+mBYwA801CuBTyRA+GJ40ztAAvAOGaTuP dKsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lMLoWhGTwHN7J+blcoryw54qGgCC26wn8jpBjLiv2n8=; b=MFGi044hcD2X66OLvnL1RJqxlfgerJ3oKcUzQ9poXsbvB89Lf9dizI0NeTJHx8+HMa aGxRinutsNTPZYHPNxw/yxi1DGe63Mo6gmhTOIum0jWdfT6ny7idw70ppCJT71NrgzfI cn+H3pSZzaPIbif5gvYNaMeHwKINFMJXui2K3YDsZCWnrAKDDBCJaJp7BEzXoEaRC7r9 IYRiy47guSN+KoFv33Sl8G+b+Rxfi2RyhDEYx866T9Fp48SgIfFjdC6rnHEfpezhRrx0 3veQyBo+UkhhfZXwedGPNAJTZ6BIHxUUFmyDTIQzIbaVRsZNWmOhBHt3DD3J6x/v1Dmf zfQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uSFLJ3sO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn15-20020a17090794cf00b007aa6262f627si254276ejc.640.2022.10.24.09.58.41; Mon, 24 Oct 2022 09:59:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uSFLJ3sO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbiJXQqo (ORCPT + 99 others); Mon, 24 Oct 2022 12:46:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233809AbiJXQpe (ORCPT ); Mon, 24 Oct 2022 12:45:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0BC218B48E; Mon, 24 Oct 2022 08:31:04 -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 ams.source.kernel.org (Postfix) with ESMTPS id 38D1AB818E5; Mon, 24 Oct 2022 12:39:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91AC9C433C1; Mon, 24 Oct 2022 12:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615153; bh=KLXaFQT2JlFqTccYwn76fcGTCiyc8m5psLPMQV9qgJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uSFLJ3sONUy4pydNE5MZzHF+oIvIn9bjLEVjgtroaVWRtVimnSB7LZXiDkYXBNWya CbxAcKmFGnftGwImL3Cwz4BxbnZuI97SRWKZVGJe7Xo26bfZNeW5HMI0X6dIajeFU8 5LoJYbeTYm9MoLFuRViiSZvcdt8aQSljmjSk0SqI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kefeng Wang , "Russell King (Oracle)" , Sasha Levin Subject: [PATCH 5.15 143/530] ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd() Date: Mon, 24 Oct 2022 13:28:07 +0200 Message-Id: <20221024113051.549719948@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747589004931863213?= X-GMAIL-MSGID: =?utf-8?q?1747589004931863213?= From: Wang Kefeng [ Upstream commit 2ccd19b3ffac07cc7e75a2bd1ed779728bb67197 ] After ARM supports p4d page tables, the pg_level for note_page() in walk_pmd() should be 4, not 3, fix it. Fixes: 84e6ffb2c49c ("arm: add support for folded p4d page tables") Signed-off-by: Kefeng Wang Signed-off-by: Russell King (Oracle) Signed-off-by: Sasha Levin --- arch/arm/mm/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c index fb688003d156..712da6a81b23 100644 --- a/arch/arm/mm/dump.c +++ b/arch/arm/mm/dump.c @@ -346,7 +346,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start) addr = start + i * PMD_SIZE; domain = get_domain_name(pmd); if (pmd_none(*pmd) || pmd_large(*pmd) || !pmd_present(*pmd)) - note_page(st, addr, 3, pmd_val(*pmd), domain); + note_page(st, addr, 4, pmd_val(*pmd), domain); else walk_pte(st, pmd, addr, domain);