| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1285566238-10966-3-git-send-email-nigel@tuxonice.net>
Date: Mon, 27 Sep 2010 15:43:37 +1000
From: Nigel Cunningham <nigel@...onice.net>
To: "Rafael J. Wysocki" <rjw@...k.pl>,
Linux PM <linux-pm@...ts.linux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
TuxOnIce-devel <tuxonice-devel@...onice.net>
Subject: [PATCH 02/23] Record & display i/o speed post resume.
Record the speed at which the image is written and read, and
display it to the user post-resume.
Signed-off-by: Nigel Cunningham <nigel@...onice.net>
---
kernel/power/hibernate.c | 11 ++++++++++-
kernel/power/power.h | 3 ++-
kernel/power/swap.c | 14 +++++++++++---
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 6c9c9dc..0cd1f05 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -212,7 +212,7 @@ static void platform_recover(int platform_mode)
* @msg - introductory message to print
*/
-void swsusp_show_speed(struct timeval *start, struct timeval *stop,
+int swsusp_show_speed(struct timeval *start, struct timeval *stop,
unsigned nr_pages, char *msg)
{
s64 elapsed_centisecs64;
@@ -231,6 +231,7 @@ void swsusp_show_speed(struct timeval *start, struct timeval *stop,
msg, k,
centisecs / 100, centisecs % 100,
kps / 1000, (kps % 1000) / 10);
+ return kps / 1000;
}
/**
@@ -648,6 +649,14 @@ int hibernate(void)
power_down();
} else {
pr_debug("PM: Image restored successfully.\n");
+ if (write_speed)
+ pr_debug("PM: Image written at %u MB/s.\n",
+ (u8) write_speed);
+ write_speed = 0;
+ if (read_speed)
+ pr_debug("PM: Image read at %u MB/s.\n",
+ (u8) read_speed);
+ read_speed = 0;
}
Thaw:
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 03634be..22f8607 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -53,6 +53,7 @@ extern int hibernation_snapshot(int platform_mode);
extern int hibernation_restore(int platform_mode);
extern int hibernation_platform_enter(void);
+extern char __nosavedata write_speed, read_speed;
#else /* !CONFIG_HIBERNATION */
static inline void hibernate_image_size_init(void) {}
@@ -161,7 +162,7 @@ extern int hib_wait_on_bio_chain(struct bio **bio_chain);
struct timeval;
/* kernel/power/swsusp.c */
-extern void swsusp_show_speed(struct timeval *, struct timeval *,
+extern int swsusp_show_speed(struct timeval *, struct timeval *,
unsigned int, char *);
#ifdef CONFIG_SUSPEND
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 3c01105..caf4db8 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -45,7 +45,8 @@ struct swap_map_page {
};
struct swsusp_header {
- char reserved[PAGE_SIZE - 20 - sizeof(sector_t) - sizeof(int)];
+ char reserved[PAGE_SIZE - 21 - sizeof(sector_t) - sizeof(int)];
+ char write_speed;
sector_t image;
unsigned int flags; /* Flags to pass to the "boot" kernel */
char orig_sig[10];
@@ -161,6 +162,7 @@ int swsusp_swap_in_use(void)
static unsigned short root_swap = 0xffff;
struct block_device *hib_resume_bdev;
+char __nosavedata write_speed, read_speed;
/*
* Saving part
@@ -175,6 +177,7 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
!memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
memcpy(swsusp_header->sig,SWSUSP_SIG, 10);
+ swsusp_header->write_speed = write_speed;
swsusp_header->image = handle->first_sector;
swsusp_header->flags = flags;
error = hib_bio_write_page(swsusp_resume_block,
@@ -354,6 +357,7 @@ static int save_image(struct swap_map_handle *handle,
struct bio *bio;
struct timeval start;
struct timeval stop;
+ int mps;
printk(KERN_INFO "PM: Saving image data pages (%u pages) ... ",
nr_to_write);
@@ -383,7 +387,8 @@ static int save_image(struct swap_map_handle *handle,
printk(KERN_CONT "\b\b\b\bdone\n");
else
printk(KERN_CONT "\n");
- swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
+ mps = swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
+ write_speed = (mps < 256) ? (char) mps : 0;
return ret;
}
@@ -545,6 +550,7 @@ static int load_image(struct swap_map_handle *handle,
struct bio *bio;
int err2;
unsigned nr_pages;
+ int mps;
printk(KERN_INFO "PM: Loading image data pages (%u pages) ... ",
nr_to_read);
@@ -580,7 +586,8 @@ static int load_image(struct swap_map_handle *handle,
error = -ENODATA;
} else
printk("\n");
- swsusp_show_speed(&start, &stop, nr_to_read, "Read");
+ mps = swsusp_show_speed(&start, &stop, nr_to_read, "Read");
+ read_speed = (mps < 256) ? mps : 0;
return error;
}
@@ -646,6 +653,7 @@ int swsusp_check(void)
goto put;
if (!memcmp(SWSUSP_SIG, swsusp_header->sig, 10)) {
+ write_speed = swsusp_header->write_speed;
memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
/* Reset swap signature now */
error = hib_bio_write_page(swsusp_resume_block,
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists