mm/gup_benchmark: support pin_user_pages() and related calls
Up until now, gup_benchmark supported testing of the following kernel functions: * get_user_pages(): via the '-U' command line option * get_user_pages_longterm(): via the '-L' command line option * get_user_pages_fast(): as the default (no options required) Add test coverage for the new corresponding pin_*() functions: * pin_user_pages_fast(): via the '-a' command line option * pin_user_pages(): via the '-b' command line option Also, add an option for clarity: '-u' for what is now (still) the default choice: get_user_pages_fast(). Also, for the commands that set FOLL_PIN, verify that the pages really are dma-pinned, via the new is_dma_pinned() routine. Those commands are: PIN_FAST_BENCHMARK : calls pin_user_pages_fast() PIN_BENCHMARK : calls pin_user_pages() In between the calls to pin_*() and unpin_user_pages(), check each page: if page_maybe_dma_pinned() returns false, then WARN and return. Do this outside of the benchmark timestamps, so that it doesn't affect reported times. Signed-off-by: John Hubbard <jhubbard@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Jan Kara <jack@suse.cz> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@infradead.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Chinner <david@fromorbit.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Vlastimil Babka <vbabka@suse.cz> Link: http://lkml.kernel.org/r/20200211001536.1027652-10-jhubbard@nvidia.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
1970dc6f52
commit
41c45d37b9
@@ -18,6 +18,10 @@
|
||||
#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark)
|
||||
#define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark)
|
||||
|
||||
/* Similar to above, but use FOLL_PIN instead of FOLL_GET. */
|
||||
#define PIN_FAST_BENCHMARK _IOWR('g', 4, struct gup_benchmark)
|
||||
#define PIN_BENCHMARK _IOWR('g', 5, struct gup_benchmark)
|
||||
|
||||
/* Just the flags we need, copied from mm.h: */
|
||||
#define FOLL_WRITE 0x01 /* check pte is writable */
|
||||
|
||||
@@ -40,8 +44,14 @@ int main(int argc, char **argv)
|
||||
char *file = "/dev/zero";
|
||||
char *p;
|
||||
|
||||
while ((opt = getopt(argc, argv, "m:r:n:f:tTLUwSH")) != -1) {
|
||||
while ((opt = getopt(argc, argv, "m:r:n:f:abtTLUuwSH")) != -1) {
|
||||
switch (opt) {
|
||||
case 'a':
|
||||
cmd = PIN_FAST_BENCHMARK;
|
||||
break;
|
||||
case 'b':
|
||||
cmd = PIN_BENCHMARK;
|
||||
break;
|
||||
case 'm':
|
||||
size = atoi(optarg) * MB;
|
||||
break;
|
||||
@@ -63,6 +73,9 @@ int main(int argc, char **argv)
|
||||
case 'U':
|
||||
cmd = GUP_BENCHMARK;
|
||||
break;
|
||||
case 'u':
|
||||
cmd = GUP_FAST_BENCHMARK;
|
||||
break;
|
||||
case 'w':
|
||||
write = 1;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user