From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756946Ab0I0Fo3 (ORCPT ); Mon, 27 Sep 2010 01:44:29 -0400 Received: from crca.org.au ([74.207.252.120]:53346 "EHLO crca.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755579Ab0I0Fo1 (ORCPT ); Mon, 27 Sep 2010 01:44:27 -0400 X-Bogosity: Ham, spamicity=0.000000 From: Nigel Cunningham To: "Rafael J. Wysocki" , Linux PM , LKML , TuxOnIce-devel Subject: [PATCH 14/23] Hibernation: Store block extents at start of image Date: Mon, 27 Sep 2010 15:43:49 +1000 Message-Id: <1285566238-10966-15-git-send-email-nigel@tuxonice.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1285566238-10966-1-git-send-email-nigel@tuxonice.net> References: <1285566238-10966-1-git-send-email-nigel@tuxonice.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds support for storing the list of extents being used at the start of the image, prior to the header, in preparation for switching from using swap map pages to these extents, then removing the swap map pages. Signed-off-by: Nigel Cunningham --- kernel/power/block_io.c | 59 ++++++++++++++++++++++++++++++++----- kernel/power/extents.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/power/extents.h | 5 +++ 3 files changed, 131 insertions(+), 8 deletions(-) diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c index bf6129b..89601d3 100644 --- a/kernel/power/block_io.c +++ b/kernel/power/block_io.c @@ -14,6 +14,7 @@ #include "power.h" #include "extents.h" +#include "block_io.h" static struct bio *bio_chain; @@ -150,7 +151,9 @@ extern struct hib_extent_state sector_extents; /* Calculate the overhead needed for storing n pages */ unsigned int hib_bio_overhead(unsigned int nr_pages) { - return DIV_ROUND_UP(nr_pages, MAP_PAGE_ENTRIES); + return DIV_ROUND_UP(nr_pages, MAP_PAGE_ENTRIES) + + DIV_ROUND_UP(hib_extents_storage_needed(§or_extents), + PAGE_SIZE); } /* Get the first sector of the image proper, for storing in the signature */ @@ -197,21 +200,34 @@ void release_swap_writer(void) int hib_bio_prepare_write(void) { + int result, result2; + handle.cur = (struct swap_map_page *)get_zeroed_page(GFP_KERNEL); if (!handle.cur) return -ENOMEM; - handle.cur_swap = hib_extent_next(§or_extents); - - if (!handle.cur_swap) { + result = hib_prepare_buffer(); + if (result) { release_swap_writer(); - return -ENOSPC; + return result; } + handle.first_sector = hib_extent_current(§or_extents); + + result = hib_extents_store(§or_extents); + result2 = hib_flush_write_buffer(); + + handle.cur_swap = hib_extent_next(§or_extents); handle.k = 0; - handle.first_sector = handle.cur_swap; - return 0; + + if (!handle.cur_swap) + result = -ENOSPC; + + if (result || result2) + release_swap_writer(); + + return result ? result : result2; } int swap_write_page(void *buf, int sync) @@ -268,6 +284,7 @@ void release_swap_reader(void) int get_swap_reader(unsigned int *flags_p, sector_t first_page) { int error; + sector_t offset; handle.cur = (struct swap_map_page *)get_zeroed_page(__GFP_WAIT | __GFP_HIGH); if (!handle.cur) @@ -278,8 +295,34 @@ int get_swap_reader(unsigned int *flags_p, sector_t first_page) release_swap_reader(); return error; } + + error = hib_prepare_buffer(); + if (error) { + release_swap_reader(); + return error; + } + handle.k = 0; - return 0; + + /* Bootstrap reading the extents */ + memcpy(hib_ppio_buffer, handle.cur, PAGE_SIZE); + error = hib_extents_load(§or_extents, 1); + + if (error) { + release_swap_reader(); + return error; + } + + offset = hib_extent_next(§or_extents); + + /* Now read the first swap_map_page */ + error = hib_bio_read_page(offset, handle.cur, 1); + if (error) { + release_swap_reader(); + return error; + } + + return error; } int swap_read_page(void *buf, int sync) diff --git a/kernel/power/extents.c b/kernel/power/extents.c index 172322d..75d2fb4 100644 --- a/kernel/power/extents.c +++ b/kernel/power/extents.c @@ -14,6 +14,7 @@ #include #include "extents.h" +#include "block_io.h" int hib_extents_empty(struct hib_extent_state *pos) { @@ -123,3 +124,77 @@ void hib_extents_clear(struct hib_extent_state *pos) kfree(ext); } } + +int hib_extents_storage_needed(struct hib_extent_state *pos) +{ + return sizeof(int) + pos->num_extents * 2 * sizeof(unsigned long); +} + +int hib_extents_store(struct hib_extent_state *pos) +{ + struct rb_node *node; + struct hib_extent *ext; + int ret = hib_write_buffer((char *) &pos->num_extents, sizeof(int)); + + if (hib_extents_empty(pos)) + return 0; + + node = rb_first(&pos->root); + while (node) { + ext = container_of(node, struct hib_extent, node); + ret = hib_write_buffer((char *) &ext->start, + 2 * sizeof(unsigned long)); + if (ret) + return ret; + node = rb_next(node); + } + + return 0; +} + +int hib_extents_load(struct hib_extent_state *pos, int bootstrap) +{ + struct rb_node **new = &(pos->root.rb_node); + struct rb_node *parent = NULL; + struct hib_extent *existing, *adding; + int i; + int ret = hib_read_buffer((char *) &pos->num_extents, sizeof(int)); + + if (!pos->num_extents) + return 0; + + for (i = 0; i < pos->num_extents; i++) { + adding = kzalloc(sizeof(struct hib_extent), GFP_KERNEL); + if (!adding) + return -ENOMEM; + + ret = hib_read_buffer((char *) &adding->start, + 2 * sizeof(unsigned long)); + if (ret) + return ret; + + /* + * No need for some of the checks from inserting above - + * they were done when preparing the image. + */ + while (*new) { + existing = container_of(*new, struct hib_extent, node); + parent = *new; + if (adding->end < existing->start) + new = &((*new)->rb_left); + else + new = &((*new)->rb_right); + } + rb_link_node(&adding->node, parent, new); + rb_insert_color(&adding->node, &pos->root); + + if (bootstrap && !i) { + hib_reset_extent_pos(§or_extents); + + /* We have already read the first page */ + hib_extent_next(§or_extents); + } + } + + return 0; +} diff --git a/kernel/power/extents.h b/kernel/power/extents.h index 0b69b8e..4288f9e 100644 --- a/kernel/power/extents.h +++ b/kernel/power/extents.h @@ -33,3 +33,8 @@ unsigned long hib_extent_next(struct hib_extent_state *pos); int hib_extents_insert(struct hib_extent_state *pos, unsigned long value); void hib_extents_clear(struct hib_extent_state *pos); int hib_extents_empty(struct hib_extent_state *pos); + +/* Serialisation support */ +int hib_extents_storage_needed(struct hib_extent_state *pos); +int hib_extents_store(struct hib_extent_state *pos); +int hib_extents_load(struct hib_extent_state *pos, int bootstrap); -- 1.7.0.4