Merge tag 'linux-watchdog-5.10-rc1' of git://www.linux-watchdog.org/linux-watchdog

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

diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c
index 464cae1..8b3e5b5 100644 (file)
--- a/mm/gup_benchmark.c
+++ b/mm/gup_benchmark.c
@@ -72,6 +72,8 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
        int nr;
        struct page **pages;
        int ret = 0;
+       bool needs_mmap_lock =
+               cmd != GUP_FAST_BENCHMARK && cmd != PIN_FAST_BENCHMARK;
 
        if (gup->size > ULONG_MAX)
                return -EINVAL;
@@ -81,6 +83,11 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
        if (!pages)
                return -ENOMEM;
 
+       if (needs_mmap_lock && mmap_read_lock_killable(current->mm)) {
+               ret = -EINTR;
+               goto free_pages;
+       }
+
        i = 0;
        nr = gup->nr_pages_per_call;
        start_time = ktime_get();
@@ -120,9 +127,8 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
                                            pages + i, NULL);
                        break;
                default:
-                       kvfree(pages);
                        ret = -EINVAL;
-                       goto out;
+                       goto unlock;
                }
 
                if (nr <= 0)
@@ -150,8 +156,11 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
        end_time = ktime_get();
        gup->put_delta_usec = ktime_us_delta(end_time, start_time);
 
+unlock:
+       if (needs_mmap_lock)
+               mmap_read_unlock(current->mm);
+free_pages:
        kvfree(pages);
-out:
        return ret;
 }