From patchwork Wed Oct 19 08:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp214288wrs; Wed, 19 Oct 2022 02:12:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM59vWaG+OfrNhPQkORQDc9WdPGmKE/e7Ort82hl3FH7PblJVFeNtpxMdbCfNvCB5ILwoD/C X-Received: by 2002:a17:906:2699:b0:781:a473:9791 with SMTP id t25-20020a170906269900b00781a4739791mr5969019ejc.644.1666170744987; Wed, 19 Oct 2022 02:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170744; cv=none; d=google.com; s=arc-20160816; b=S6D6Nh+37YtS6pbIiiQqGh0WC/E96fxx1uShGkkrKJcMCPl7vXKgd3odEpZRl9tuNQ pQdCb4UM/4F3NEqLHVs3NqD5cam4pz20mmBefE4woOm06OZGF5qcONO4JNfL0iFFuD4E KGSlb5YsDxXrEljVk4ZTA61x/rWj+XV75X6zsw+9ZsQLFRx9DUkI0g094PladQuEOLNO QZfbIDAqD8VPP9adLJcs/rJOwHtjgW+urJZ4AhZlz6XrIcc2UMZSXxkBhvMjBQqFkfa5 oESwXteoUlmMTT6GyHZoKUHZexfVcw5PiPzgehLIuwN3Kru2xIbU5BnujB98Bb9k8hbg fsDw== 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=TjyYZEcFnTpYgqzgWiIyg38cT6pFK80WSXg1xw1z54u4r6zP92+7uuHUAM4er0Z652 DSDCKkO6hzS0huMxZcnG8vdRxPNvSQwxI1nwKxYlcZdfTSaMMaG9Xcd/+9xIAP7v36rW 8CA92g+o7RNOhRWNv8vnI50JvCo+sklKoQg1447qSCEtnvxUZgspf/HGf8wQ2mHCHpo+ MH6O/mjullz1pj65NzxyP/4FYCAx9nisYNpHF8GainV22BuQZqURVgDTLl29VTyFofln it1Ha0b6vkB6XAWMXN919X8KnO8e9GMXW7JBWABuremSb6ef3Lei52CUfXibbDn0cype mEig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mRxO+wgO; 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 hv19-20020a17090760d300b0078d83fb6672si14657653ejc.118.2022.10.19.02.11.59; Wed, 19 Oct 2022 02:12:24 -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=mRxO+wgO; 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 S232680AbiJSJIk (ORCPT + 99 others); Wed, 19 Oct 2022 05:08:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232424AbiJSJGG (ORCPT ); Wed, 19 Oct 2022 05:06:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF8BF9FD2; Wed, 19 Oct 2022 01:59:28 -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 A780A61828; Wed, 19 Oct 2022 08:47:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFDC3C433D6; Wed, 19 Oct 2022 08:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169269; bh=KLXaFQT2JlFqTccYwn76fcGTCiyc8m5psLPMQV9qgJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mRxO+wgO8+aD9YJZKw8xdhbCuQsSYckIDCRBAU5oxHo+u78RoUERUHttqB2nFLwCk VJRXwjMrpv7CR0UUVz+9sL/B5pL3eHhTL3IV7FK/jWBZnQqAeCbfzuwIEKE+QV5bxC ri1/OYXVZkTEzwZCk3yXAIXCmdGJ2LP81LE97DQY= 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 6.0 215/862] ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd() Date: Wed, 19 Oct 2022 10:25:02 +0200 Message-Id: <20221019083259.530895015@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747106655323004520?= X-GMAIL-MSGID: =?utf-8?q?1747106655323004520?= 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);