Message ID | 20190722154210.42799-15-steven.price@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D2B414F6 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 22 Jul 2019 15:43:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C98927F86 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 22 Jul 2019 15:43:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F39F283BB; Mon, 22 Jul 2019 15:43:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A03B727F86 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 22 Jul 2019 15:43:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C7558E0010; Mon, 22 Jul 2019 11:43:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 354238E000E; Mon, 22 Jul 2019 11:43:07 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A52C8E0010; Mon, 22 Jul 2019 11:43:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id BFF158E000E for <linux-mm@kvack.org>; Mon, 22 Jul 2019 11:43:06 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id y3so26523716edm.21 for <linux-mm@kvack.org>; Mon, 22 Jul 2019 08:43:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=x9omYML0fpa2kR4hvPDbBVUFNLXAt+KfSjpOjGilB2I=; b=iiQ/vfSX5bqrY5rlfOFvCZfUwlSowv3jfrRs2J8nRhr6e6m17weZeU3VtmstFh72Zf b1lS8IiOpEjHgTZy0TE7V0Z+6DX1a6o531UU5ia5S9zegt8Dfl7rhiXMSYC8rT5zvDIw 1pLaoCaeQPbJ4IwZbP31YkJdCYfIRs+8TJKdiu7Hv7ciKVSdO5p7qTs/WgRXlNqtF5qf XyOH+TLHJj+sonOZtx5d9v47S9hkakKHFem0TQvKbYAZLTR+PF08n4DdGkRibg+q/K3k sRk7hkFOEVSCBLL6SiH3MwwJ9cqu4Wzwx6fA0/QEiGcm9jE3/Nugdgr+75lmZMl40AvV AsnA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com X-Gm-Message-State: APjAAAXobPZ7o9DcfLBjnD7J0BsOQQAWnq8Ulcx5G42nvH1QVpHR0l0A ldF1W1nTVS3pXy0nOpRw6fo7Wr+wv3DRLAxsSkF456VPuarN2IUqzq+tWxAlwQ+d0e1uxeRnfq3 DIRrBQU+oxSXMsd2iUGWSi74mkLUyyjRuLC1nHfGZ9R7pvn8D7QRoTvmdUw7zKvYCWA== X-Received: by 2002:a05:6402:12d2:: with SMTP id k18mr55712591edx.197.1563810186379; Mon, 22 Jul 2019 08:43:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqziY2d/Sp3BCPwcM+E0j69f19djjV7nkbnV6exIWXipYe2V4Q8bojMLTVhEUHx3VbPRB5/e X-Received: by 2002:a05:6402:12d2:: with SMTP id k18mr55712530edx.197.1563810185603; Mon, 22 Jul 2019 08:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563810185; cv=none; d=google.com; s=arc-20160816; b=zLjw1uQSxRVDGpLyGh1RfK/8LbLiBhTlEt3E/X8BqJJecABDgOOuef0sTfzgcwwfzu jxra3MrsqWT/4+mVyQOjLaYa9C2BvNanWpdXbCRMGmZ6QuVldNa2JFYRgLZ6zwAeArO1 lAzd40w0Lyk6FjJfwEXhOouL1HPT5tQY+wQBHvbeFO12/vsFk0vK6QjARggFpuY1lLtL qgTorz24tAkxKWsXxtdaClcaU+gY4XFae55N4RdQ5ZiqslIy1wWwx4c37DrFJGlj+YgV gEhUesjxduAlNwmyNRP9cBvhuYeoucC5dYHajfeKvd+AN9TYoi0sTmK8Q6hA7enxR3nM vlHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=x9omYML0fpa2kR4hvPDbBVUFNLXAt+KfSjpOjGilB2I=; b=kQjEHhakMGmCWE8a2CIUx4V9Xhzd9nCLj7caMXt50N5FkyzPnhcPjJkNcY0G5ac0Fv 9yxW5FAHH5lYXTWXDT7YD6+NHiMxc+peZm58CFSHdX4sjX5PkH2SAEVWf2ENjKdIj9m5 BPHHOxu8JL+ppWFrQIGG+LEPjkMb3pDcOAwx030eeoY72cb+RTePmSLkLL6OSXofHdPG vaQLYAw8N2aUrzRlGHnLQEofdDS6CaUkYlBqKBRAtjKNq1FJfWCMOF9mG/jhLih9dvsW stwC5Ds2UOPYkIjMjaXDwlZiZVMutp6h/XzFb/qgSU0z/N8zbGOdAMVCmGEK8CY5cCQI SIWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.110.172]) by mx.google.com with ESMTP id bq14si5387003ejb.15.2019.07.22.08.43.05 for <linux-mm@kvack.org>; Mon, 22 Jul 2019 08:43:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) client-ip=217.140.110.172; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C90AE15BF; Mon, 22 Jul 2019 08:43:04 -0700 (PDT) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.133]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3192C3F694; Mon, 22 Jul 2019 08:43:02 -0700 (PDT) From: Steven Price <steven.price@arm.com> To: linux-mm@kvack.org Cc: Steven Price <steven.price@arm.com>, Andy Lutomirski <luto@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Arnd Bergmann <arnd@arndb.de>, Borislav Petkov <bp@alien8.de>, Catalin Marinas <catalin.marinas@arm.com>, Dave Hansen <dave.hansen@linux.intel.com>, Ingo Molnar <mingo@redhat.com>, James Morse <james.morse@arm.com>, =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= <jglisse@redhat.com>, Peter Zijlstra <peterz@infradead.org>, Thomas Gleixner <tglx@linutronix.de>, Will Deacon <will@kernel.org>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland <Mark.Rutland@arm.com>, "Liang, Kan" <kan.liang@linux.intel.com>, Andrew Morton <akpm@linux-foundation.org> Subject: [PATCH v9 14/21] x86: mm: Don't display pages which aren't present in debugfs Date: Mon, 22 Jul 2019 16:42:03 +0100 Message-Id: <20190722154210.42799-15-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722154210.42799-1-steven.price@arm.com> References: <20190722154210.42799-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Generic page walk and ptdump
|
expand
|
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index ab67822fd2f4..95728027dd3b 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -301,8 +301,8 @@ static void note_page(struct seq_file *m, struct pg_state *st, /* * Now print the actual finished series */ - if (!st->marker->max_lines || - st->lines < st->marker->max_lines) { + if ((cur & _PAGE_PRESENT) && (!st->marker->max_lines || + st->lines < st->marker->max_lines)) { pt_dump_seq_printf(m, st->to_dmesg, "0x%0*lx-0x%0*lx ", width, st->start_address, @@ -318,7 +318,8 @@ static void note_page(struct seq_file *m, struct pg_state *st, printk_prot(m, st->current_prot, st->level, st->to_dmesg); } - st->lines++; + if (cur & _PAGE_PRESENT) + st->lines++; /* * We print markers for special areas of address space,
For the /sys/kernel/debug/page_tables/ files, rather than outputing a mostly empty line when a block of memory isn't present just skip the line. This keeps the output shorter and will help with a future change switching to using the generic page walk code as we no longer care about the 'level' that the page table holes are at. Signed-off-by: Steven Price <steven.price@arm.com> --- arch/x86/mm/dump_pagetables.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)