From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752512AbdBJObC (ORCPT <rfc822;w@1wt.eu>);
        Fri, 10 Feb 2017 09:31:02 -0500
Received: from foss.arm.com ([217.140.101.70]:35674 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752360AbdBJOa7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 10 Feb 2017 09:30:59 -0500
Date: Fri, 10 Feb 2017 14:29:41 +0000
From: Mark Rutland <mark.rutland@arm.com>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Dmitry Vyukov <dvyukov@google.com>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@kernel.org>,
        "H. Peter Anvin" <hpa@zytor.com>, "x86@kernel.org" <x86@kernel.org>,
        Tobias Regnery <tobias.regnery@gmail.com>,
        "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>,
        Alexander Potapenko <glider@google.com>,
        kasan-dev <kasan-dev@googlegroups.com>,
        LKML <linux-kernel@vger.kernel.org>, stable <stable@vger.kernel.org>
Subject: Re: [PATCH] x86/mm/ptdump: Fix soft lockup in page table walker.
Message-ID: <20170210142928.GA29143@leverpostej>
References: <0d19ac08-88b0-675d-19bd-4cdc543fdb30@virtuozzo.com>
 <20170210095405.31802-1-aryabinin@virtuozzo.com>
 <CACT4Y+YnZ2FhpmxNNmzGmmOQGqrsZShStgg4n_AYx41cUVnXeQ@mail.gmail.com>
 <alpine.DEB.2.20.1702101217220.4036@nanos>
 <4bdfc6e9-0f68-bc30-fd1c-0def4508b472@virtuozzo.com>
 <CACT4Y+YMKBfDuMMhH3pAAJh9DMtyjwMLqZMZ-3SyC7kGRubGXw@mail.gmail.com>
 <730837a1-ee6f-9891-0421-93616dd1c4eb@virtuozzo.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <730837a1-ee6f-9891-0421-93616dd1c4eb@virtuozzo.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi,

On Fri, Feb 10, 2017 at 04:56:19PM +0300, Andrey Ryabinin wrote:
> On 02/10/2017 04:02 PM, Dmitry Vyukov wrote:
> > On Fri, Feb 10, 2017 at 1:15 PM, Andrey Ryabinin
> > <aryabinin@virtuozzo.com> wrote:
> >> On 02/10/2017 02:18 PM, Thomas Gleixner wrote:
> >>> On Fri, 10 Feb 2017, Dmitry Vyukov wrote:

> diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
> index 8aa6bea..1599a5c 100644
> --- a/arch/x86/mm/dump_pagetables.c
> +++ b/arch/x86/mm/dump_pagetables.c
> @@ -373,6 +373,11 @@ static inline bool is_hypervisor_range(int idx)
>  #endif
>  }
>  
> +static bool pgd_already_checked(pgd_t *prev_pgd, pgd_t *pgd, bool checkwx)
> +{
> +       return checkwx && prev_pgd && (pgd_val(*prev_pgd) == pgd_val(*pgd));
> +}
> +
>  static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
>                                        bool checkwx)
>  {
> @@ -381,6 +386,7 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
>  #else
>         pgd_t *start = swapper_pg_dir;
>  #endif
> +       pgd_t *prev_pgd = NULL;
>         pgprotval_t prot;
>         int i;
>         struct pg_state st = {};
> @@ -396,7 +402,8 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
>  
>         for (i = 0; i < PTRS_PER_PGD; i++) {
>                 st.current_address = normalize_addr(i * PGD_LEVEL_MULT);
> -               if (!pgd_none(*start) && !is_hypervisor_range(i)) {
> +               if (!pgd_none(*start) && !is_hypervisor_range(i) &&
> +                               !pgd_already_checked(prev_pgd, start, checkwx)) {

This means we'll fall into the else case...

>                         if (pgd_large(*start) || !pgd_present(*start)) {
>                                 prot = pgd_flags(*start);
>                                 note_page(m, &st, __pgprot(prot), 1);
> @@ -408,6 +415,7 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd,
>                         note_page(m, &st, __pgprot(0), 1);

... i.e. the note_page() here, where we'll claim that the's nothing
present due to the empty prot.

That'll give erroneous output for the userspace pagetable dumps, so I do
not think this is quite right, even though it gives a boot-time speedup.

Thanks,
Mark.