Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[karo-tx-linux.git] / kernel / locking / test-ww_mutex.c

diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 6b7abb334ca6027dd2b189a211671fa98a33be82..39f56c870051b505611746ff0033cc6a7f6e1a10 100644 (file)
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -353,8 +353,8 @@ static int test_cycle(unsigned int ncpus)
 struct stress {
        struct work_struct work;
        struct ww_mutex *locks;
+       unsigned long timeout;
        int nlocks;
-       int nloops;
 };
 
 static int *get_random_order(int count)
@@ -398,12 +398,11 @@ static void stress_inorder_work(struct work_struct *work)
        if (!order)
                return;
 
-       ww_acquire_init(&ctx, &ww_class);
-
        do {
                int contended = -1;
                int n, err;
 
+               ww_acquire_init(&ctx, &ww_class);
 retry:
                err = 0;
                for (n = 0; n < nlocks; n++) {
@@ -433,9 +432,9 @@ retry:
                                    __func__, err);
                        break;
                }
-       } while (--stress->nloops);
 
-       ww_acquire_fini(&ctx);
+               ww_acquire_fini(&ctx);
+       } while (!time_after(jiffies, stress->timeout));
 
        kfree(order);
        kfree(stress);
@@ -470,9 +469,9 @@ static void stress_reorder_work(struct work_struct *work)
        kfree(order);
        order = NULL;
 
-       ww_acquire_init(&ctx, &ww_class);
-
        do {
+               ww_acquire_init(&ctx, &ww_class);
+
                list_for_each_entry(ll, &locks, link) {
                        err = ww_mutex_lock(ll->lock, &ctx);
                        if (!err)
@@ -495,9 +494,9 @@ static void stress_reorder_work(struct work_struct *work)
                dummy_load(stress);
                list_for_each_entry(ll, &locks, link)
                        ww_mutex_unlock(ll->lock);
-       } while (--stress->nloops);
 
-       ww_acquire_fini(&ctx);
+               ww_acquire_fini(&ctx);
+       } while (!time_after(jiffies, stress->timeout));
 
 out:
        list_for_each_entry_safe(ll, ln, &locks, link)
@@ -523,7 +522,7 @@ static void stress_one_work(struct work_struct *work)
                                    __func__, err);
                        break;
                }
-       } while (--stress->nloops);
+       } while (!time_after(jiffies, stress->timeout));
 
        kfree(stress);
 }
@@ -533,7 +532,7 @@ static void stress_one_work(struct work_struct *work)
 #define STRESS_ONE BIT(2)
 #define STRESS_ALL (STRESS_INORDER | STRESS_REORDER | STRESS_ONE)
 
-static int stress(int nlocks, int nthreads, int nloops, unsigned int flags)
+static int stress(int nlocks, int nthreads, unsigned int flags)
 {
        struct ww_mutex *locks;
        int n;
@@ -575,7 +574,7 @@ static int stress(int nlocks, int nthreads, int nloops, unsigned int flags)
                INIT_WORK(&stress->work, fn);
                stress->locks = locks;
                stress->nlocks = nlocks;
-               stress->nloops = nloops;
+               stress->timeout = jiffies + 2*HZ;
 
                queue_work(wq, &stress->work);
                nthreads--;
@@ -619,15 +618,15 @@ static int __init test_ww_mutex_init(void)
        if (ret)
                return ret;
 
-       ret = stress(16, 2*ncpus, 1<<10, STRESS_INORDER);
+       ret = stress(16, 2*ncpus, STRESS_INORDER);
        if (ret)
                return ret;
 
-       ret = stress(16, 2*ncpus, 1<<10, STRESS_REORDER);
+       ret = stress(16, 2*ncpus, STRESS_REORDER);
        if (ret)
                return ret;
 
-       ret = stress(4095, hweight32(STRESS_ALL)*ncpus, 1<<12, STRESS_ALL);
+       ret = stress(4095, hweight32(STRESS_ALL)*ncpus, STRESS_ALL);
        if (ret)
                return ret;