nvdimm.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Joao Martins <joao.m.martins@oracle.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: Linux MM <linux-mm@kvack.org>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Dave Jiang <dave.jiang@intel.com>,
	Naoya Horiguchi <naoya.horiguchi@nec.com>,
	Matthew Wilcox <willy@infradead.org>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	John Hubbard <jhubbard@nvidia.com>,
	Jane Chu <jane.chu@oracle.com>,
	Muchun Song <songmuchun@bytedance.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jonathan Corbet <corbet@lwn.net>,
	Linux NVDIMM <nvdimm@lists.linux.dev>,
	Linux Doc Mailing List <linux-doc@vger.kernel.org>
Subject: Re: [PATCH v3 13/14] mm/gup: grab head page refcount once for group of subpages
Date: Wed, 25 Aug 2021 20:10:39 +0100	[thread overview]
Message-ID: <21939df3-9376-25f2-bf94-acb55ef49307@oracle.com> (raw)
In-Reply-To: <CAPcyv4gkxysWT60P_A+Q18K=Zc9i5P6u69tD5g9_aLV=TW1gpA@mail.gmail.com>

On 7/28/21 9:23 PM, Dan Williams wrote:
> On Wed, Jul 28, 2021 at 1:08 PM Joao Martins <joao.m.martins@oracle.com> wrote:
>> On 7/28/21 8:55 PM, Dan Williams wrote:
>>> On Wed, Jul 14, 2021 at 12:36 PM Joao Martins <joao.m.martins@oracle.com> wrote:
>>>>
>>>> Use try_grab_compound_head() for device-dax GUP when configured with a
>>>> compound pagemap.
>>>>
>>>> Rather than incrementing the refcount for each page, do one atomic
>>>> addition for all the pages to be pinned.
>>>>
>>>> Performance measured by gup_benchmark improves considerably
>>>> get_user_pages_fast() and pin_user_pages_fast() with NVDIMMs:
>>>>
>>>>  $ gup_test -f /dev/dax1.0 -m 16384 -r 10 -S [-u,-a] -n 512 -w
>>>> (get_user_pages_fast 2M pages) ~59 ms -> ~6.1 ms
>>>> (pin_user_pages_fast 2M pages) ~87 ms -> ~6.2 ms
>>>> [altmap]
>>>> (get_user_pages_fast 2M pages) ~494 ms -> ~9 ms
>>>> (pin_user_pages_fast 2M pages) ~494 ms -> ~10 ms
>>>>
>>>>  $ gup_test -f /dev/dax1.0 -m 129022 -r 10 -S [-u,-a] -n 512 -w
>>>> (get_user_pages_fast 2M pages) ~492 ms -> ~49 ms
>>>> (pin_user_pages_fast 2M pages) ~493 ms -> ~50 ms
>>>> [altmap with -m 127004]
>>>> (get_user_pages_fast 2M pages) ~3.91 sec -> ~70 ms
>>>> (pin_user_pages_fast 2M pages) ~3.97 sec -> ~74 ms
>>>>
>>>> Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
>>>> ---
>>>>  mm/gup.c | 53 +++++++++++++++++++++++++++++++++--------------------
>>>>  1 file changed, 33 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/mm/gup.c b/mm/gup.c
>>>> index 42b8b1fa6521..9baaa1c0b7f3 100644
>>>> --- a/mm/gup.c
>>>> +++ b/mm/gup.c
>>>> @@ -2234,31 +2234,55 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
>>>>  }
>>>>  #endif /* CONFIG_ARCH_HAS_PTE_SPECIAL */
>>>>
>>>> +
>>>> +static int record_subpages(struct page *page, unsigned long addr,
>>>> +                          unsigned long end, struct page **pages)
>>>> +{
>>>> +       int nr;
>>>> +
>>>> +       for (nr = 0; addr != end; addr += PAGE_SIZE)
>>>> +               pages[nr++] = page++;
>>>> +
>>>> +       return nr;
>>>> +}
>>>> +
>>>>  #if defined(CONFIG_ARCH_HAS_PTE_DEVMAP) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
>>>>  static int __gup_device_huge(unsigned long pfn, unsigned long addr,
>>>>                              unsigned long end, unsigned int flags,
>>>>                              struct page **pages, int *nr)
>>>>  {
>>>> -       int nr_start = *nr;
>>>> +       int refs, nr_start = *nr;
>>>>         struct dev_pagemap *pgmap = NULL;
>>>>
>>>>         do {
>>>> -               struct page *page = pfn_to_page(pfn);
>>>> +               struct page *pinned_head, *head, *page = pfn_to_page(pfn);
>>>> +               unsigned long next;
>>>>
>>>>                 pgmap = get_dev_pagemap(pfn, pgmap);
>>>>                 if (unlikely(!pgmap)) {
>>>>                         undo_dev_pagemap(nr, nr_start, flags, pages);
>>>>                         return 0;
>>>>                 }
>>>> -               SetPageReferenced(page);
>>>> -               pages[*nr] = page;
>>>> -               if (unlikely(!try_grab_page(page, flags))) {
>>>> -                       undo_dev_pagemap(nr, nr_start, flags, pages);
>>>> +
>>>> +               head = compound_head(page);
>>>> +               /* @end is assumed to be limited at most one compound page */
>>>> +               next = PageCompound(head) ? end : addr + PAGE_SIZE;
>>>
>>> Please no ternary operator for this check, but otherwise this patch
>>> looks good to me.
>>>
>> OK. I take that you prefer this instead:
>>
>> unsigned long next = addr + PAGE_SIZE;
>>
>> [...]
>>
>> /* @end is assumed to be limited at most one compound page */
>> if (PageCompound(head))
>>         next = end;
> 
> Yup.
> 
In addition to abiove, I'll be remove @pinned_head variable and retain the
current style that was with try_grab_page() while retaining the unlikely
that was there before. I'm assuming I can retain the Reviewed-by tag, but let
me know of otherwise (diff below).

diff --git a/mm/gup.c b/mm/gup.c
index ca64bc0b339e..398bee74105a 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2256,7 +2256,7 @@ static int __gup_device_huge(unsigned long pfn, unsigned long addr,
        int ret = 1;

        do {
-               struct page *pinned_head, *head, *page = pfn_to_page(pfn);
+               struct page *head, *page = pfn_to_page(pfn);
                unsigned long next = addr + PAGE_SIZE;

                pgmap = get_dev_pagemap(pfn, pgmap);
@@ -2273,8 +2273,7 @@ static int __gup_device_huge(unsigned long pfn, unsigned long addr,
                refs = record_subpages(page, addr, next, pages + *nr);

                SetPageReferenced(head);
-               pinned_head = try_grab_compound_head(head, refs, flags);
-               if (unlikely(!pinned_head)) {
+               if (unlikely(!try_grab_compound_head(head, refs, flags))) {
                        if (PageCompound(head))
                                ClearPageReferenced(head);
                        else

  reply	other threads:[~2021-08-25 19:11 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 19:35 [PATCH v3 00/14] mm, sparse-vmemmap: Introduce compound pagemaps Joao Martins
2021-07-14 19:35 ` [PATCH v3 01/14] memory-failure: fetch compound_head after pgmap_pfn_valid() Joao Martins
2021-07-15  0:17   ` Dan Williams
2021-07-15  2:51   ` [External] " Muchun Song
2021-07-15  6:40     ` Christoph Hellwig
2021-07-15  9:19       ` Muchun Song
2021-07-15 13:17     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 02/14] mm/page_alloc: split prep_compound_page into head and tail subparts Joao Martins
2021-07-15  0:19   ` Dan Williams
2021-07-15  2:53   ` [External] " Muchun Song
2021-07-15 13:17     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 03/14] mm/page_alloc: refactor memmap_init_zone_device() page init Joao Martins
2021-07-15  0:20   ` Dan Williams
2021-07-14 19:35 ` [PATCH v3 04/14] mm/memremap: add ZONE_DEVICE support for compound pages Joao Martins
2021-07-15  1:08   ` Dan Williams
2021-07-15 12:52     ` Joao Martins
2021-07-15 13:06       ` Joao Martins
2021-07-15 19:48       ` Dan Williams
2021-07-30 16:13         ` Joao Martins
2021-07-22  0:38       ` Jane Chu
2021-07-22 10:56         ` Joao Martins
2021-07-15 12:59     ` Christoph Hellwig
2021-07-15 13:15       ` Joao Martins
2021-07-15  6:48   ` Christoph Hellwig
2021-07-15 13:15     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 05/14] mm/sparse-vmemmap: add a pgmap argument to section activation Joao Martins
2021-07-28  5:56   ` Dan Williams
2021-07-28  9:43     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 06/14] mm/sparse-vmemmap: refactor core of vmemmap_populate_basepages() to helper Joao Martins
2021-07-28  6:04   ` Dan Williams
2021-07-28 10:48     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 07/14] mm/hugetlb_vmemmap: move comment block to Documentation/vm Joao Martins
2021-07-15  2:47   ` [External] " Muchun Song
2021-07-15 13:16     ` Joao Martins
2021-07-28  6:09   ` Dan Williams
2021-07-14 19:35 ` [PATCH v3 08/14] mm/sparse-vmemmap: populate compound pagemaps Joao Martins
2021-07-28  6:55   ` Dan Williams
2021-07-28 15:35     ` Joao Martins
2021-07-28 18:03       ` Dan Williams
2021-07-28 18:54         ` Joao Martins
2021-07-28 20:04           ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 09/14] mm/page_alloc: reuse tail struct pages for " Joao Martins
2021-07-28  7:28   ` Dan Williams
2021-07-28 15:56     ` Joao Martins
2021-07-28 16:08       ` Dan Williams
2021-07-28 16:12         ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 10/14] device-dax: use ALIGN() for determining pgoff Joao Martins
2021-07-28  7:29   ` Dan Williams
2021-07-28 15:56     ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 11/14] device-dax: ensure dev_dax->pgmap is valid for dynamic devices Joao Martins
2021-07-28  7:30   ` Dan Williams
2021-07-28 15:56     ` Joao Martins
2021-08-06 12:28       ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 12/14] device-dax: compound pagemap support Joao Martins
2021-07-14 23:36   ` Dan Williams
2021-07-15 12:00     ` Joao Martins
2021-07-27 23:51       ` Dan Williams
2021-07-28  9:36         ` Joao Martins
2021-07-28 18:51           ` Dan Williams
2021-07-28 18:59             ` Joao Martins
2021-07-28 19:03               ` Dan Williams
2021-07-14 19:35 ` [PATCH v3 13/14] mm/gup: grab head page refcount once for group of subpages Joao Martins
2021-07-28 19:55   ` Dan Williams
2021-07-28 20:07     ` Joao Martins
2021-07-28 20:23       ` Dan Williams
2021-08-25 19:10         ` Joao Martins [this message]
2021-08-25 19:15           ` Matthew Wilcox
2021-08-25 19:26             ` Joao Martins
2021-07-14 19:35 ` [PATCH v3 14/14] mm/sparse-vmemmap: improve memory savings for compound pud geometry Joao Martins
2021-07-28 20:03   ` Dan Williams
2021-07-28 20:08     ` Joao Martins
2021-07-14 21:48 ` [PATCH v3 00/14] mm, sparse-vmemmap: Introduce compound pagemaps Andrew Morton
2021-07-14 23:47   ` Dan Williams
2021-07-22  2:24   ` Matthew Wilcox
2021-07-22 10:53     ` Joao Martins
2021-07-27 23:23       ` Dan Williams
2021-08-02 10:40         ` Joao Martins
2021-08-02 14:06           ` Dan Williams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=21939df3-9376-25f2-bf94-acb55ef49307@oracle.com \
    --to=joao.m.martins@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=corbet@lwn.net \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=jane.chu@oracle.com \
    --cc=jgg@ziepe.ca \
    --cc=jhubbard@nvidia.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mike.kravetz@oracle.com \
    --cc=naoya.horiguchi@nec.com \
    --cc=nvdimm@lists.linux.dev \
    --cc=songmuchun@bytedance.com \
    --cc=vishal.l.verma@intel.com \
    --cc=willy@infradead.org \
    --subject='Re: [PATCH v3 13/14] mm/gup: grab head page refcount once for group of subpages' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).