* [PATCH v2] mm/z3fold.c: Reinitialize zhdr structs after migration
@ 2019-07-16 0:05 Henry Burns
2019-07-16 21:20 ` Shakeel Butt
0 siblings, 1 reply; 2+ messages in thread
From: Henry Burns @ 2019-07-16 0:05 UTC (permalink / raw)
To: Vitaly Vul
Cc: Andrew Morton, Shakeel Butt, Jonathan Adams, linux-mm,
linux-kernel, Henry Burns
z3fold_page_migration() calls memcpy(new_zhdr, zhdr, PAGE_SIZE).
However, zhdr contains fields that can't be directly coppied over (ex:
list_head, a circular linked list). We only need to initialize the
linked lists in new_zhdr, as z3fold_isolate_page() already ensures
that these lists are empty
Additionally it is possible that zhdr->work has been placed in a
workqueue. In this case we shouldn't migrate the page, as zhdr->work
references zhdr as opposed to new_zhdr.
Fixes: bba4c5f96ce4 ("mm/z3fold.c: support page migration")
Signed-off-by: Henry Burns <henryburns@google.com>
---
Changelog since v1:
- Made comments explicityly refer to new_zhdr->buddy.
mm/z3fold.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/mm/z3fold.c b/mm/z3fold.c
index 42ef9955117c..f4b2283b19a3 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -1352,12 +1352,22 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
z3fold_page_unlock(zhdr);
return -EBUSY;
}
+ if (work_pending(&zhdr->work)) {
+ z3fold_page_unlock(zhdr);
+ return -EAGAIN;
+ }
new_zhdr = page_address(newpage);
memcpy(new_zhdr, zhdr, PAGE_SIZE);
newpage->private = page->private;
page->private = 0;
z3fold_page_unlock(zhdr);
spin_lock_init(&new_zhdr->page_lock);
+ INIT_WORK(&new_zhdr->work, compact_page_work);
+ /*
+ * z3fold_page_isolate() ensures that new_zhdr->buddy is empty,
+ * so we only have to reinitialize it.
+ */
+ INIT_LIST_HEAD(&new_zhdr->buddy);
new_mapping = page_mapping(page);
__ClearPageMovable(page);
ClearPagePrivate(page);
--
2.22.0.510.g264f2c817a-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mm/z3fold.c: Reinitialize zhdr structs after migration
2019-07-16 0:05 [PATCH v2] mm/z3fold.c: Reinitialize zhdr structs after migration Henry Burns
@ 2019-07-16 21:20 ` Shakeel Butt
0 siblings, 0 replies; 2+ messages in thread
From: Shakeel Butt @ 2019-07-16 21:20 UTC (permalink / raw)
To: Henry Burns; +Cc: Vitaly Vul, Andrew Morton, Jonathan Adams, Linux MM, LKML
On Mon, Jul 15, 2019 at 5:05 PM Henry Burns <henryburns@google.com> wrote:
>
> z3fold_page_migration() calls memcpy(new_zhdr, zhdr, PAGE_SIZE).
> However, zhdr contains fields that can't be directly coppied over (ex:
> list_head, a circular linked list). We only need to initialize the
> linked lists in new_zhdr, as z3fold_isolate_page() already ensures
> that these lists are empty
>
> Additionally it is possible that zhdr->work has been placed in a
> workqueue. In this case we shouldn't migrate the page, as zhdr->work
> references zhdr as opposed to new_zhdr.
>
> Fixes: bba4c5f96ce4 ("mm/z3fold.c: support page migration")
> Signed-off-by: Henry Burns <henryburns@google.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
> ---
> Changelog since v1:
> - Made comments explicityly refer to new_zhdr->buddy.
>
> mm/z3fold.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/mm/z3fold.c b/mm/z3fold.c
> index 42ef9955117c..f4b2283b19a3 100644
> --- a/mm/z3fold.c
> +++ b/mm/z3fold.c
> @@ -1352,12 +1352,22 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
> z3fold_page_unlock(zhdr);
> return -EBUSY;
> }
> + if (work_pending(&zhdr->work)) {
> + z3fold_page_unlock(zhdr);
> + return -EAGAIN;
> + }
> new_zhdr = page_address(newpage);
> memcpy(new_zhdr, zhdr, PAGE_SIZE);
> newpage->private = page->private;
> page->private = 0;
> z3fold_page_unlock(zhdr);
> spin_lock_init(&new_zhdr->page_lock);
> + INIT_WORK(&new_zhdr->work, compact_page_work);
> + /*
> + * z3fold_page_isolate() ensures that new_zhdr->buddy is empty,
> + * so we only have to reinitialize it.
> + */
> + INIT_LIST_HEAD(&new_zhdr->buddy);
> new_mapping = page_mapping(page);
> __ClearPageMovable(page);
> ClearPagePrivate(page);
> --
> 2.22.0.510.g264f2c817a-goog
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-16 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-16 0:05 [PATCH v2] mm/z3fold.c: Reinitialize zhdr structs after migration Henry Burns
2019-07-16 21:20 ` Shakeel Butt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).