* [PATCH] swapfile: initialize spinlock for swap_cluster_info
@ 2017-02-07 2:35 ` Minchan Kim
0 siblings, 0 replies; 4+ messages in thread
From: Minchan Kim @ 2017-02-07 2:35 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, linux-mm, Minchan Kim, Tim Chen, Huang Ying, Hugh Dickins
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 <tim.c.chen@linux.intel.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] swapfile: initialize spinlock for swap_cluster_info
@ 2017-02-07 2:35 ` Minchan Kim
0 siblings, 0 replies; 4+ messages in thread
From: Minchan Kim @ 2017-02-07 2:35 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, linux-mm, Minchan Kim, Tim Chen, Huang Ying, Hugh Dickins
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 <tim.c.chen@linux.intel.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Minchan Kim <minchan@kernel.org>
---
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] swapfile: initialize spinlock for swap_cluster_info
2017-02-07 2:35 ` Minchan Kim
@ 2017-02-07 2:52 ` Huang, Ying
-1 siblings, 0 replies; 4+ messages in thread
From: Huang, Ying @ 2017-02-07 2:52 UTC (permalink / raw)
To: Minchan Kim
Cc: Andrew Morton, linux-kernel, linux-mm, Tim Chen, Huang Ying,
Hugh Dickins
Hi, Minchan,
Minchan Kim <minchan@kernel.org> writes:
> 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 <tim.c.chen@linux.intel.com>
> Cc: Huang Ying <ying.huang@intel.com>
> Cc: Hugh Dickins <hughd@google.com>
> Signed-off-by: Minchan Kim <minchan@kernel.org>
Good catch! Thanks a lot for your fixing!
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Best Regards,
Huang, Ying
> ---
> 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;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] swapfile: initialize spinlock for swap_cluster_info
@ 2017-02-07 2:52 ` Huang, Ying
0 siblings, 0 replies; 4+ messages in thread
From: Huang, Ying @ 2017-02-07 2:52 UTC (permalink / raw)
To: Minchan Kim
Cc: Andrew Morton, linux-kernel, linux-mm, Tim Chen, Huang Ying,
Hugh Dickins
Hi, Minchan,
Minchan Kim <minchan@kernel.org> writes:
> 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 <tim.c.chen@linux.intel.com>
> Cc: Huang Ying <ying.huang@intel.com>
> Cc: Hugh Dickins <hughd@google.com>
> Signed-off-by: Minchan Kim <minchan@kernel.org>
Good catch! Thanks a lot for your fixing!
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Best Regards,
Huang, Ying
> ---
> 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;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-07 2:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-07 2:35 [PATCH] swapfile: initialize spinlock for swap_cluster_info Minchan Kim
2017-02-07 2:35 ` Minchan Kim
2017-02-07 2:52 ` Huang, Ying
2017-02-07 2:52 ` Huang, Ying
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.