| Message ID | 1377169317-5959-14-git-send-email-jlee@suse.com (mailing list archive) |
|---|---|
| State | RFC, archived |
| Headers | show |
On Thu 2013-08-22 19:01:52, Lee, Chun-Yi wrote: > This patch add swsusp_page_is_sign_key() method to hibernate_key.c and > check the page is S4 sign key data when collect saveable page in > snapshot.c to avoid sign key data included in snapshot image. > > Reviewed-by: Jiri Kosina <jkosina@suse.cz> > Signed-off-by: Lee, Chun-Yi <jlee@suse.com> > --- > kernel/power/snapshot.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c > index 72e2911..9e4c94b 100644 > --- a/kernel/power/snapshot.c > +++ b/kernel/power/snapshot.c > @@ -860,6 +860,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) > > BUG_ON(!PageHighMem(page)); > > + if (swsusp_page_is_sign_key(page)) > + return NULL; > + > if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page) || > PageReserved(page)) > return NULL; Just do set_page_forbidden() on your page?
? ??2013-08-25 ? 18:39 +0200?Pavel Machek ??? > On Thu 2013-08-22 19:01:52, Lee, Chun-Yi wrote: > > This patch add swsusp_page_is_sign_key() method to hibernate_key.c and > > check the page is S4 sign key data when collect saveable page in > > snapshot.c to avoid sign key data included in snapshot image. > > > > Reviewed-by: Jiri Kosina <jkosina@suse.cz> > > Signed-off-by: Lee, Chun-Yi <jlee@suse.com> > > --- > > kernel/power/snapshot.c | 6 ++++++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c > > index 72e2911..9e4c94b 100644 > > --- a/kernel/power/snapshot.c > > +++ b/kernel/power/snapshot.c > > @@ -860,6 +860,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) > > > > BUG_ON(!PageHighMem(page)); > > > > + if (swsusp_page_is_sign_key(page)) > > + return NULL; > > + > > if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page) || > > PageReserved(page)) > > return NULL; > > Just do set_page_forbidden() on your page? Before call swsusp_unset_page_forbidden(), we need make sure the create_basic_memory_bitmaps() function already called to initial forbidden_pages_map. That means need careful the timing, otherwise the page of private key will not register to forbidden pages map. So, I choice to refuse the page of private key when snapshot finding which page is saveable. It has clearer code and we don't need worry the future change of hibernate.c or user.c for when they call create_basic_memory_bitmaps() and when the code clear forbidden pages map. Thanks a lot! Joey Lee -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 72e2911..9e4c94b 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -860,6 +860,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) BUG_ON(!PageHighMem(page)); + if (swsusp_page_is_sign_key(page)) + return NULL; + if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page) || PageReserved(page)) return NULL; @@ -922,6 +925,9 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn) BUG_ON(PageHighMem(page)); + if (swsusp_page_is_sign_key(page)) + return NULL; + if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page)) return NULL;