From: John Hubbard <jhubbard@nvidia•com>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: "Michal Hocko" <mhocko@suse•com>, "Jan Kara" <jack@suse•cz>,
kvm@vger•kernel.org, linux-doc@vger•kernel.org,
"David Airlie" <airlied@linux•ie>,
"Dave Chinner" <david@fromorbit•com>,
dri-devel@lists•freedesktop.org,
LKML <linux-kernel@vger•kernel.org>,
linux-mm@kvack•org, "Paul Mackerras" <paulus@samba•org>,
linux-kselftest@vger•kernel.org,
"Ira Weiny" <ira.weiny@intel•com>,
"Jonathan Corbet" <corbet@lwn•net>,
linux-rdma@vger•kernel.org,
"Christoph Hellwig" <hch@infradead•org>,
"Jason Gunthorpe" <jgg@ziepe•ca>,
"Vlastimil Babka" <vbabka@suse•cz>,
"Björn Töpel" <bjorn.topel@intel•com>,
linux-media@vger•kernel.org, "Shuah Khan" <shuah@kernel•org>,
"John Hubbard" <jhubbard@nvidia•com>,
linux-block@vger•kernel.org, "Jérôme Glisse" <jglisse@redhat•com>,
"Al Viro" <viro@zeniv•linux.org.uk>,
"Dan Williams" <dan.j.williams@intel•com>,
"Mauro Carvalho Chehab" <mchehab@kernel•org>,
"Magnus Karlsson" <magnus.karlsson@intel•com>,
"Jens Axboe" <axboe@kernel•dk>,
netdev@vger•kernel.org,
"Alex Williamson" <alex.williamson@redhat•com>,
"Daniel Vetter" <daniel@ffwll•ch>,
linux-fsdevel@vger•kernel.org, bpf@vger•kernel.org,
linuxppc-dev@lists•ozlabs.org,
"David S . Miller" <davem@davemloft•net>,
"Mike Kravetz" <mike.kravetz@oracle•com>
Subject: [PATCH v6 03/24] mm/gup: move try_get_compound_head() to top, fix minor issues
Date: Tue, 19 Nov 2019 00:16:22 -0800 [thread overview]
Message-ID: <20191119081643.1866232-4-jhubbard@nvidia.com> (raw)
In-Reply-To: <20191119081643.1866232-1-jhubbard@nvidia.com>
An upcoming patch uses try_get_compound_head() more widely,
so move it to the top of gup.c.
Also fix a tiny spelling error and a checkpatch.pl warning.
Reviewed-by: Jan Kara <jack@suse•cz>
Reviewed-by: Ira Weiny <ira.weiny@intel•com>
Signed-off-by: John Hubbard <jhubbard@nvidia•com>
---
mm/gup.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index f3c7d6625817..14fcdc502166 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -29,6 +29,21 @@ struct follow_page_context {
unsigned int page_mask;
};
+/*
+ * Return the compound head page with ref appropriately incremented,
+ * or NULL if that failed.
+ */
+static inline struct page *try_get_compound_head(struct page *page, int refs)
+{
+ struct page *head = compound_head(page);
+
+ if (WARN_ON_ONCE(page_ref_count(head) < 0))
+ return NULL;
+ if (unlikely(!page_cache_add_speculative(head, refs)))
+ return NULL;
+ return head;
+}
+
/**
* put_user_pages_dirty_lock() - release and optionally dirty gup-pinned pages
* @pages: array of pages to be maybe marked dirty, and definitely released.
@@ -1793,20 +1808,6 @@ static void __maybe_unused undo_dev_pagemap(int *nr, int nr_start,
}
}
-/*
- * Return the compund head page with ref appropriately incremented,
- * or NULL if that failed.
- */
-static inline struct page *try_get_compound_head(struct page *page, int refs)
-{
- struct page *head = compound_head(page);
- if (WARN_ON_ONCE(page_ref_count(head) < 0))
- return NULL;
- if (unlikely(!page_cache_add_speculative(head, refs)))
- return NULL;
- return head;
-}
-
#ifdef CONFIG_ARCH_HAS_PTE_SPECIAL
static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
unsigned int flags, struct page **pages, int *nr)
--
2.24.0
next prev parent reply other threads:[~2019-11-19 8:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 8:16 [PATCH v6 00/24] mm/gup: track dma-pinned pages: FOLL_PIN John Hubbard
2019-11-19 8:16 ` [PATCH v6 01/24] mm/gup: pass flags arg to __gup_device_* functions John Hubbard
2019-11-19 8:16 ` [PATCH v6 02/24] mm/gup: factor out duplicate code from four routines John Hubbard
2019-11-19 10:19 ` Jan Kara
2019-11-19 8:16 ` John Hubbard [this message]
2019-11-19 8:16 ` [PATCH v6 04/24] mm: Cleanup __put_devmap_managed_page() vs ->page_free() John Hubbard
2019-11-19 8:16 ` [PATCH v6 05/24] mm: devmap: refactor 1-based refcounting for ZONE_DEVICE pages John Hubbard
2019-11-19 8:16 ` [PATCH v6 06/24] goldish_pipe: rename local pin_user_pages() routine John Hubbard
2019-11-19 8:16 ` [PATCH v6 07/24] IB/umem: use get_user_pages_fast() to pin DMA pages John Hubbard
2019-11-19 8:16 ` [PATCH v6 08/24] media/v4l2-core: set pages dirty upon releasing DMA buffers John Hubbard
2019-11-19 8:16 ` [PATCH v6 09/24] vfio, mm: fix get_user_pages_remote() and FOLL_LONGTERM John Hubbard
2019-11-19 8:16 ` [PATCH v6 10/24] mm/gup: introduce pin_user_pages*() and FOLL_PIN John Hubbard
2019-11-19 8:16 ` [PATCH v6 11/24] goldish_pipe: convert to pin_user_pages() and put_user_page() John Hubbard
2019-11-19 8:16 ` [PATCH v6 12/24] IB/{core, hw, umem}: set FOLL_PIN via pin_user_pages*(), fix up ODP John Hubbard
2019-11-19 8:16 ` [PATCH v6 13/24] mm/process_vm_access: set FOLL_PIN via pin_user_pages_remote() John Hubbard
2019-11-19 8:16 ` [PATCH v6 14/24] drm/via: set FOLL_PIN via pin_user_pages_fast() John Hubbard
2019-11-19 8:16 ` [PATCH v6 15/24] fs/io_uring: set FOLL_PIN via pin_user_pages() John Hubbard
2019-11-19 16:10 ` Jens Axboe
2019-11-20 7:03 ` John Hubbard
2019-11-19 8:16 ` [PATCH v6 16/24] net/xdp: " John Hubbard
2019-11-19 8:16 ` [PATCH v6 17/24] mm/gup: track FOLL_PIN pages John Hubbard
2019-11-19 11:37 ` Jan Kara
2019-11-20 7:17 ` John Hubbard
2019-11-19 8:16 ` [PATCH v6 18/24] media/v4l2-core: pin_user_pages (FOLL_PIN) and put_user_page() conversion John Hubbard
2019-11-19 8:16 ` [PATCH v6 19/24] vfio, mm: " John Hubbard
2019-11-19 8:16 ` [PATCH v6 20/24] powerpc: book3s64: convert to pin_user_pages() and put_user_page() John Hubbard
2019-11-19 8:16 ` [PATCH v6 21/24] mm/gup_benchmark: use proper FOLL_WRITE flags instead of hard-coding "1" John Hubbard
2019-11-19 8:16 ` [PATCH v6 22/24] mm/gup_benchmark: support pin_user_pages() and related calls John Hubbard
2019-11-19 8:16 ` [PATCH v6 23/24] selftests/vm: run_vmtests: invoke gup_benchmark with basic FOLL_PIN coverage John Hubbard
2019-11-19 8:16 ` [PATCH v6 24/24] mm, tree-wide: rename put_user_page*() to unpin_user_page*() John Hubbard
2019-11-19 11:39 ` Jan Kara
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=20191119081643.1866232-4-jhubbard@nvidia.com \
--to=jhubbard@nvidia$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alex.williamson@redhat$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=bjorn.topel@intel$(echo .)com \
--cc=bpf@vger$(echo .)kernel.org \
--cc=corbet@lwn$(echo .)net \
--cc=dan.j.williams@intel$(echo .)com \
--cc=daniel@ffwll$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=david@fromorbit$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=hch@infradead$(echo .)org \
--cc=ira.weiny@intel$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=jgg@ziepe$(echo .)ca \
--cc=jglisse@redhat$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-doc@vger$(echo .)kernel.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-kselftest@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=magnus.karlsson@intel$(echo .)com \
--cc=mchehab@kernel$(echo .)org \
--cc=mhocko@suse$(echo .)com \
--cc=mike.kravetz@oracle$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=paulus@samba$(echo .)org \
--cc=shuah@kernel$(echo .)org \
--cc=vbabka@suse$(echo .)cz \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox