| Message ID | 1538082779.246sm0vb2p.astroid@alex-archsus.none (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] mm: fix z3fold warnings on CONFIG_SMP=n | expand |
On Thu, Sep 27, 2018 at 5:15 PM Alex Xu (Hello71) <alex_y_xu@yahoo.ca> wrote: > > Spinlocks are always lockable on UP systems, even if they were just > locked. > > Cc: Dan Streetman <ddstreet@ieee.org> I cc'ed Vitaly also, as this code is from him, but the change certainly looks correct to me. Acked-by: Dan Streetman <ddstreet@ieee.org> > Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> > --- > mm/z3fold.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/z3fold.c b/mm/z3fold.c > index 4b366d181..2e8d268ac 100644 > --- a/mm/z3fold.c > +++ b/mm/z3fold.c > @@ -277,7 +277,7 @@ static void release_z3fold_page_locked(struct kref *ref) > { > struct z3fold_header *zhdr = container_of(ref, struct z3fold_header, > refcount); > - WARN_ON(z3fold_page_trylock(zhdr)); > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > __release_z3fold_page(zhdr, true); > } > > @@ -289,7 +289,7 @@ static void release_z3fold_page_locked_list(struct kref *ref) > list_del_init(&zhdr->buddy); > spin_unlock(&zhdr->pool->lock); > > - WARN_ON(z3fold_page_trylock(zhdr)); > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > __release_z3fold_page(zhdr, true); > } > > @@ -403,7 +403,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked) > > page = virt_to_page(zhdr); > if (locked) > - WARN_ON(z3fold_page_trylock(zhdr)); > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > else > z3fold_page_lock(zhdr); > if (WARN_ON(!test_and_clear_bit(NEEDS_COMPACTING, &page->private))) { > -- > 2.19.0 >
Den fre 28 sep. 2018 kl 13:31 skrev Dan Streetman <ddstreet@ieee.org>: > On Thu, Sep 27, 2018 at 5:15 PM Alex Xu (Hello71) <alex_y_xu@yahoo.ca> > wrote: > > > > Spinlocks are always lockable on UP systems, even if they were just > > locked. > > > > Cc: Dan Streetman <ddstreet@ieee.org> > > I cc'ed Vitaly also, as this code is from him, but the change > certainly looks correct to me. > > Acked-by: Dan Streetman <ddstreet@ieee.org> > Acked-by: Vitaly Wool <vitalywool@gmail.com> > > > Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> > > --- > > mm/z3fold.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/mm/z3fold.c b/mm/z3fold.c > > index 4b366d181..2e8d268ac 100644 > > --- a/mm/z3fold.c > > +++ b/mm/z3fold.c > > @@ -277,7 +277,7 @@ static void release_z3fold_page_locked(struct kref > *ref) > > { > > struct z3fold_header *zhdr = container_of(ref, struct > z3fold_header, > > refcount); > > - WARN_ON(z3fold_page_trylock(zhdr)); > > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > > __release_z3fold_page(zhdr, true); > > } > > > > @@ -289,7 +289,7 @@ static void release_z3fold_page_locked_list(struct > kref *ref) > > list_del_init(&zhdr->buddy); > > spin_unlock(&zhdr->pool->lock); > > > > - WARN_ON(z3fold_page_trylock(zhdr)); > > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > > __release_z3fold_page(zhdr, true); > > } > > > > @@ -403,7 +403,7 @@ static void do_compact_page(struct z3fold_header > *zhdr, bool locked) > > > > page = virt_to_page(zhdr); > > if (locked) > > - WARN_ON(z3fold_page_trylock(zhdr)); > > + WARN_ON_SMP(z3fold_page_trylock(zhdr)); > > else > > z3fold_page_lock(zhdr); > > if (WARN_ON(!test_and_clear_bit(NEEDS_COMPACTING, > &page->private))) { > > -- > > 2.19.0 > > > <div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">Den fre 28 sep. 2018 kl 13:31 skrev Dan Streetman <<a href="mailto:ddstreet@ieee.org">ddstreet@ieee.org</a>>:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, Sep 27, 2018 at 5:15 PM Alex Xu (Hello71) <<a href="mailto:alex_y_xu@yahoo.ca" target="_blank">alex_y_xu@yahoo.ca</a>> wrote:<br> ><br> > Spinlocks are always lockable on UP systems, even if they were just<br> > locked.<br> ><br> > Cc: Dan Streetman <<a href="mailto:ddstreet@ieee.org" target="_blank">ddstreet@ieee.org</a>><br> <br> I cc'ed Vitaly also, as this code is from him, but the change<br> certainly looks correct to me.<br> <br> Acked-by: Dan Streetman <<a href="mailto:ddstreet@ieee.org" target="_blank">ddstreet@ieee.org</a>><br></blockquote><div><br></div><div>Acked-by: Vitaly Wool <<a href="mailto:vitalywool@gmail.com">vitalywool@gmail.com</a>> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> > Signed-off-by: Alex Xu (Hello71) <<a href="mailto:alex_y_xu@yahoo.ca" target="_blank">alex_y_xu@yahoo.ca</a>><br> > ---<br> > mm/z3fold.c | 6 +++---<br> > 1 file changed, 3 insertions(+), 3 deletions(-)<br> ><br> > diff --git a/mm/z3fold.c b/mm/z3fold.c<br> > index 4b366d181..2e8d268ac 100644<br> > --- a/mm/z3fold.c<br> > +++ b/mm/z3fold.c<br> > @@ -277,7 +277,7 @@ static void release_z3fold_page_locked(struct kref *ref)<br> > {<br> > struct z3fold_header *zhdr = container_of(ref, struct z3fold_header,<br> > refcount);<br> > - WARN_ON(z3fold_page_trylock(zhdr));<br> > + WARN_ON_SMP(z3fold_page_trylock(zhdr));<br> > __release_z3fold_page(zhdr, true);<br> > }<br> ><br> > @@ -289,7 +289,7 @@ static void release_z3fold_page_locked_list(struct kref *ref)<br> > list_del_init(&zhdr->buddy);<br> > spin_unlock(&zhdr->pool->lock);<br> ><br> > - WARN_ON(z3fold_page_trylock(zhdr));<br> > + WARN_ON_SMP(z3fold_page_trylock(zhdr));<br> > __release_z3fold_page(zhdr, true);<br> > }<br> ><br> > @@ -403,7 +403,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked)<br> ><br> > page = virt_to_page(zhdr);<br> > if (locked)<br> > - WARN_ON(z3fold_page_trylock(zhdr));<br> > + WARN_ON_SMP(z3fold_page_trylock(zhdr));<br> > else<br> > z3fold_page_lock(zhdr);<br> > if (WARN_ON(!test_and_clear_bit(NEEDS_COMPACTING, &page->private))) {<br> > --<br> > 2.19.0<br> ><br> </blockquote></div></div>
diff --git a/mm/z3fold.c b/mm/z3fold.c index 4b366d181..2e8d268ac 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -277,7 +277,7 @@ static void release_z3fold_page_locked(struct kref *ref) { struct z3fold_header *zhdr = container_of(ref, struct z3fold_header, refcount); - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); __release_z3fold_page(zhdr, true); } @@ -289,7 +289,7 @@ static void release_z3fold_page_locked_list(struct kref *ref) list_del_init(&zhdr->buddy); spin_unlock(&zhdr->pool->lock); - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); __release_z3fold_page(zhdr, true); } @@ -403,7 +403,7 @@ static void do_compact_page(struct z3fold_header *zhdr, bool locked) page = virt_to_page(zhdr); if (locked) - WARN_ON(z3fold_page_trylock(zhdr)); + WARN_ON_SMP(z3fold_page_trylock(zhdr)); else z3fold_page_lock(zhdr); if (WARN_ON(!test_and_clear_bit(NEEDS_COMPACTING, &page->private))) {
Spinlocks are always lockable on UP systems, even if they were just locked. Cc: Dan Streetman <ddstreet@ieee.org> Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> --- mm/z3fold.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)