From patchwork Sat Oct 22 07:21: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: 7262 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1091733wrr; Sat, 22 Oct 2022 00:51:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/gGx93Kr3G7Rc0MPM67+YsHzx/T1uKh1UaCIcLZ6Z+XG9yhVOPhNIe6RcvuiDSW9aAkis X-Received: by 2002:a17:903:95:b0:186:60a7:f6c with SMTP id o21-20020a170903009500b0018660a70f6cmr12680557pld.20.1666425101615; Sat, 22 Oct 2022 00:51:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425101; cv=none; d=google.com; s=arc-20160816; b=k57OUbC0e+HIj9vD4RHctcLdXoLb5ZkouBbv59JqbYOcVSy9Z3NQ+g+3OweQL9EZC6 bkcvhacEPC0zid7Tdwgm22Nz953VQNy9+zag8Eo1HK9Hm4UxdRN9TaqZ8v0zQ8Xkdm7b vAK6b81lNTDjuPU0wPwGgIGBelS0uTmjc1rgsDQa5fyFLMAYGeV/MqPNa1p+lLivYuXK 7Xr5MdzyMX+VZdsaBxxy/8hc2j3C3RSgrp1FJ4VH/oYnekBKq9Xns0Nx/uYh90cX9p52 LFGEmlwlG2UPGzLJmsmWvzNPJXx0NaUwmjq8IZlWEA0wl5NdY5lPQZzpwMFYVTwdpCaB lEbw== 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=OuRnOwZ0j/sKY8Z9IKyMof6WenO3Iyw+aBSvHNcn4nAyiGYJgiBqQT1r/JvMyEfRxl acO3pSJ/oK1/nqla1tpSXOuR9CPUuhHLP5DN9J4AfFF7q2wOUoamXsI4yD2R0FsXHTKt S+SGkyDhCVE655HHQBlDnFOfd2ApjVUjvb78ApUoSI+d7aFXI/f7rfuHD8iXZUbUE2VA EiRHtMO/KDEOAMJc79PztX04uyvknG/CTiiQG/sN0joBHQEsHotXeCJkruqacaCiV83a E5mELXk4rUsh5g0MAS6vT4paegptIUc+uj1BYM3TT9Va5WB82tRPnmtAOzb+bIWEH6p/ +22A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="F6bj/Ti1"; 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 z20-20020aa78894000000b0053e7495a394si30159841pfe.141.2022.10.22.00.51.29; Sat, 22 Oct 2022 00:51:41 -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="F6bj/Ti1"; 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 S231825AbiJVHvM (ORCPT + 99 others); Sat, 22 Oct 2022 03:51:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231787AbiJVHtJ (ORCPT ); Sat, 22 Oct 2022 03:49:09 -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 66DDD29B88E; Sat, 22 Oct 2022 00:45:53 -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 A25B960B8E; Sat, 22 Oct 2022 07:42:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6BCCC433C1; Sat, 22 Oct 2022 07:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424552; bh=KLXaFQT2JlFqTccYwn76fcGTCiyc8m5psLPMQV9qgJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F6bj/Ti1gAPx/Z2OinsRKGSK9Eca/aD2F9O7zGSQx1TqO+EDoeWc4RaUTkPalZiaF Ea103rthdWbVTvvOaIip7Uq9tH2wFhckN8GcxW3dxRqe/jI7WZp6i6D5/INbTXk2zu jqa/kQ1x1MXsJefCRFTyCl90qE2l6AcG6AKc6L1Q= 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.19 188/717] ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd() Date: Sat, 22 Oct 2022 09:21:07 +0200 Message-Id: <20221022072448.891495010@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747373367565509528?= X-GMAIL-MSGID: =?utf-8?q?1747373367565509528?= 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);