We changed swap_cluster_info lock from bit_spin_lock to spinlock so we need to initialize the spinlock before the using. Otherwise, lockdep is broken.
Cc: Tim Chen <[email protected]> Cc: Huang Ying <[email protected]> Cc: Hugh Dickins <[email protected]> Signed-off-by: Minchan Kim <[email protected]> --- Andrew, I think it's no worth to add this patch to separate commit. If you don't mind, it's okay to fold this patch to mm-swap-add-cluster-lock-v5. Thanks. mm/swapfile.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 1fc1824140e1..5ac2cb40dbd3 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2762,6 +2762,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) if (p->bdev && blk_queue_nonrot(bdev_get_queue(p->bdev))) { int cpu; + unsigned long ci, nr_cluster; p->flags |= SWP_SOLIDSTATE; /* @@ -2769,13 +2770,17 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) * SSD */ p->cluster_next = 1 + (prandom_u32() % p->highest_bit); + nr_cluster = DIV_ROUND_UP(maxpages, SWAPFILE_CLUSTER); - cluster_info = vzalloc(DIV_ROUND_UP(maxpages, - SWAPFILE_CLUSTER) * sizeof(*cluster_info)); + cluster_info = vzalloc(nr_cluster * sizeof(*cluster_info)); if (!cluster_info) { error = -ENOMEM; goto bad_swap; } + + for (ci = 0; ci < nr_cluster; ci++) + spin_lock_init(&((cluster_info + ci)->lock)); + p->percpu_cluster = alloc_percpu(struct percpu_cluster); if (!p->percpu_cluster) { error = -ENOMEM; -- 2.7.4
