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;
MIME-Version: 1.0
References: <20230515172608.3558391-1-yuanchu@google.com>
In-Reply-To: <20230515172608.3558391-1-yuanchu@google.com>
From:   Yang Shi <shy828301@gmail.com>
Date:   Tue, 16 May 2023 10:10:09 -0700
Message-ID: <CAHbLzkpuatys2wyM1+R02gggOGE_6iL_2aoCmn1VDMSnAYBQ0A@mail.gmail.com>
Subject: Re: [PATCH] mm: pagemap: restrict pagewalk to the requested range
To:     Yuanchu Xie <yuanchu@google.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>,
        "Zach O'Keefe" <zokeefe@google.com>, Peter Xu <peterx@redhat.com>,
        "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
        Matthew Wilcox <willy@infradead.org>,
        Pasha Tatashin <pasha.tatashin@soleen.com>,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-mm@kvack.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, May 15, 2023 at 10:26=E2=80=AFAM Yuanchu Xie <yuanchu@google.com> w=
rote:
>
> The pagewalk in pagemap_read reads one PTE past the end of the requested
> range, and stops when the buffer runs out of space. While it produces
> the right result, the extra read is unnecessary and less performant.
>
> I timed the following command before and after this patch:
>         dd count=3D100000 if=3D/proc/self/pagemap of=3D/dev/null
> The results are consistently within 0.001s across 5 runs.
>
> Before:
> 100000+0 records in
> 100000+0 records out
> 51200000 bytes (51 MB) copied, 0.0763159 s, 671 MB/s
>
> real    0m0.078s
> user    0m0.012s
> sys     0m0.065s
>
> After:
> 100000+0 records in
> 100000+0 records out
> 51200000 bytes (51 MB) copied, 0.0487928 s, 1.0 GB/s
>
> real    0m0.050s
> user    0m0.011s
> sys     0m0.039s
>
> Signed-off-by: Yuanchu Xie <yuanchu@google.com>

Reviewed-by: Yang Shi <shy828301@gmail.com>

> ---
>  fs/proc/task_mmu.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index 420510f6a545..6259dd432eeb 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -1689,23 +1689,23 @@ static ssize_t pagemap_read(struct file *file, ch=
ar __user *buf,
>         /* watch out for wraparound */
>         start_vaddr =3D end_vaddr;
>         if (svpfn <=3D (ULONG_MAX >> PAGE_SHIFT)) {
> +               unsigned long end;
> +
>                 ret =3D mmap_read_lock_killable(mm);
>                 if (ret)
>                         goto out_free;
>                 start_vaddr =3D untagged_addr_remote(mm, svpfn << PAGE_SH=
IFT);
>                 mmap_read_unlock(mm);
> +
> +               end =3D start_vaddr + ((count / PM_ENTRY_BYTES) << PAGE_S=
HIFT);
> +               if (end >=3D start_vaddr && end < mm->task_size)
> +                       end_vaddr =3D end;
>         }
>
>         /* Ensure the address is inside the task */
>         if (start_vaddr > mm->task_size)
>                 start_vaddr =3D end_vaddr;
>
> -       /*
> -        * The odds are that this will stop walking way
> -        * before end_vaddr, because the length of the
> -        * user buffer is tracked in "pm", and the walk
> -        * will stop when we hit the end of the buffer.
> -        */
>         ret =3D 0;
>         while (count && (start_vaddr < end_vaddr)) {
>                 int len;
> --
> 2.40.1.606.ga4b1b128d6-goog
>