io_uring: don't reuse linked_timeout

[linux-2.6-microblaze.git] / mm / gup_benchmark.c

diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c
index 8dba38e..464cae1 100644 (file)
--- a/mm/gup_benchmark.c
+++ b/mm/gup_benchmark.c
@@ -6,8 +6,10 @@
 #include <linux/debugfs.h>
 
 #define GUP_FAST_BENCHMARK     _IOWR('g', 1, struct gup_benchmark)
-#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark)
-#define GUP_BENCHMARK          _IOWR('g', 3, struct gup_benchmark)
+#define GUP_BENCHMARK          _IOWR('g', 2, struct gup_benchmark)
+#define PIN_FAST_BENCHMARK     _IOWR('g', 3, struct gup_benchmark)
+#define PIN_BENCHMARK          _IOWR('g', 4, struct gup_benchmark)
+#define PIN_LONGTERM_BENCHMARK _IOWR('g', 5, struct gup_benchmark)
 
 struct gup_benchmark {
        __u64 get_delta_usec;
@@ -19,6 +21,49 @@ struct gup_benchmark {
        __u64 expansion[10];    /* For future use */
 };
 
+static void put_back_pages(unsigned int cmd, struct page **pages,
+                          unsigned long nr_pages)
+{
+       unsigned long i;
+
+       switch (cmd) {
+       case GUP_FAST_BENCHMARK:
+       case GUP_BENCHMARK:
+               for (i = 0; i < nr_pages; i++)
+                       put_page(pages[i]);
+               break;
+
+       case PIN_FAST_BENCHMARK:
+       case PIN_BENCHMARK:
+       case PIN_LONGTERM_BENCHMARK:
+               unpin_user_pages(pages, nr_pages);
+               break;
+       }
+}
+
+static void verify_dma_pinned(unsigned int cmd, struct page **pages,
+                             unsigned long nr_pages)
+{
+       unsigned long i;
+       struct page *page;
+
+       switch (cmd) {
+       case PIN_FAST_BENCHMARK:
+       case PIN_BENCHMARK:
+       case PIN_LONGTERM_BENCHMARK:
+               for (i = 0; i < nr_pages; i++) {
+                       page = pages[i];
+                       if (WARN(!page_maybe_dma_pinned(page),
+                                "pages[%lu] is NOT dma-pinned\n", i)) {
+
+                               dump_page(page, "gup_benchmark failure");
+                               break;
+                       }
+               }
+               break;
+       }
+}
+
 static int __gup_benchmark_ioctl(unsigned int cmd,
                struct gup_benchmark *gup)
 {
@@ -57,15 +102,23 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
                        nr = get_user_pages_fast(addr, nr, gup->flags,
                                                 pages + i);
                        break;
-               case GUP_LONGTERM_BENCHMARK:
-                       nr = get_user_pages(addr, nr,
-                                           gup->flags | FOLL_LONGTERM,
-                                           pages + i, NULL);
-                       break;
                case GUP_BENCHMARK:
                        nr = get_user_pages(addr, nr, gup->flags, pages + i,
                                            NULL);
                        break;
+               case PIN_FAST_BENCHMARK:
+                       nr = pin_user_pages_fast(addr, nr, gup->flags,
+                                                pages + i);
+                       break;
+               case PIN_BENCHMARK:
+                       nr = pin_user_pages(addr, nr, gup->flags, pages + i,
+                                           NULL);
+                       break;
+               case PIN_LONGTERM_BENCHMARK:
+                       nr = pin_user_pages(addr, nr,
+                                           gup->flags | FOLL_LONGTERM,
+                                           pages + i, NULL);
+                       break;
                default:
                        kvfree(pages);
                        ret = -EINVAL;
@@ -78,15 +131,22 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
        }
        end_time = ktime_get();
 
+       /* Shifting the meaning of nr_pages: now it is actual number pinned: */
+       nr_pages = i;
+
        gup->get_delta_usec = ktime_us_delta(end_time, start_time);
        gup->size = addr - gup->addr;
 
+       /*
+        * Take an un-benchmark-timed moment to verify DMA pinned
+        * state: print a warning if any non-dma-pinned pages are found:
+        */
+       verify_dma_pinned(cmd, pages, nr_pages);
+
        start_time = ktime_get();
-       for (i = 0; i < nr_pages; i++) {
-               if (!pages[i])
-                       break;
-               put_page(pages[i]);
-       }
+
+       put_back_pages(cmd, pages, nr_pages);
+
        end_time = ktime_get();
        gup->put_delta_usec = ktime_us_delta(end_time, start_time);
 
@@ -103,8 +163,10 @@ static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd,
 
        switch (cmd) {
        case GUP_FAST_BENCHMARK:
-       case GUP_LONGTERM_BENCHMARK:
        case GUP_BENCHMARK:
+       case PIN_FAST_BENCHMARK:
+       case PIN_BENCHMARK:
+       case PIN_LONGTERM_BENCHMARK:
                break;
        default:
                return -EINVAL;