From patchwork Mon Oct 24 11:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp535004wru; Mon, 24 Oct 2022 09:12:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ec4vWUhSxQThygukyHugJb73xMo1OICt02/fW8fxUKV8xZ20J0lldDfQV+ydMNzM2beqD X-Received: by 2002:a17:902:7c0d:b0:178:a6ca:1dbc with SMTP id x13-20020a1709027c0d00b00178a6ca1dbcmr34495676pll.115.1666627932181; Mon, 24 Oct 2022 09:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627932; cv=none; d=google.com; s=arc-20160816; b=RlzCmbTMPDfLpQuzQyTYM6sphFleO2+GTBIBLOX2nxQ8QhMblKZHbSV/YoIgm/etgU 6pRasaBH3wP9AgFiQi1Lrj4MrS+egdNFr4ur7mlOoNA9KzSRaFodT3nLWzxtJRw4Cank PWoL3uEw8kTlcD/BJ2Lm6UpSBHM4imepNvDm4cA+xpZ0Tlh6hajrcNA4S8clgkhvsmC0 cI3zFU6Sxy8T6rKE1xm+TvnwF7zD3kYSdyCt9PP9NI02lO6DiJrX+5cPzhccq+kFBFQA LL7dJMqdhHOQe3WdAmFEEC+7ZQ1MsYKyTrzXv+F3/byG861Wn7JO8Ce8YCbeE0gusqiO Z8xg== 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=1CutrfnPJZ5u6Aos5cfMf76SifiZZ+L9g/aUEY0ly4o=; b=E1x/4sdbKS9/+Dc1mZOHh9eum0LfNOzI+UEBYiJXEIDa48KpuI3tvH9eJnk88yFv1v Iai5zW1ZXKX6H1FYfayraeu5K3CmJChDrFa7KdCPDv5T+rbMkfEz/xmN/5ofqMpW17e1 TZu14NKk0zfPP9MqKYyoZ6Suv3vJxVCkQZ/mW+fQFuErgkV1Rtl9KxyV+DRlJvVd1Pc/ 706/YJeM2WN7f2Q65NeDG3z0wmPsq4+YsMdfGCOaBjpYPfLfsn2BbZ0VjUH+dvlvuq88 1CejQuwyca9DxHUJj1OarUd/2uULfD6p9ARYjXPqAqQWUGxQF3EwI7En5pTl/EaeY5mr AtYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1q50m4xH; 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 b5-20020a170903228500b001868a4db3d1si9669765plh.48.2022.10.24.09.11.58; Mon, 24 Oct 2022 09:12:12 -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=1q50m4xH; 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 S233413AbiJXQLA (ORCPT + 99 others); Mon, 24 Oct 2022 12:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233765AbiJXQFA (ORCPT ); Mon, 24 Oct 2022 12:05:00 -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 780D7111B94; Mon, 24 Oct 2022 07:57:45 -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 9F766B8164A; Mon, 24 Oct 2022 12:20:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0663AC433D7; Mon, 24 Oct 2022 12:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614003; bh=M5oEERXuvUHrrYr4fvO/JcOAz2Fo/EAEiLu3hsYkgyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1q50m4xHLVJrOfrw+A/w90xIGw6aEut18hirjTunss10uUQPq/TVoOpNqjexfZ3ru B9yBD7U7WOeLz7e1Uep5Wiro5lj9cCB2axIiimRKGWBxCyTVvIZHtvkBMN15HPeNPt AsE9iscM+LMkgubys1xcPLN8Zhr3Bj6cEhZGo3Yg= 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.10 096/390] ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd() Date: Mon, 24 Oct 2022 13:28:13 +0200 Message-Id: <20221024113026.737057802@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747586051004528975?= X-GMAIL-MSGID: =?utf-8?q?1747586051004528975?= 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 c18d23a5e5f1..9b9023a92d46 100644 --- a/arch/arm/mm/dump.c +++ b/arch/arm/mm/dump.c @@ -342,7 +342,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);