[PATCH -mm 1/5] Hibernation: Introduce SNAPSHOT_GET_IMAGE_SIZE ioctl
From: Rafael J. Wysocki <[EMAIL PROTECTED]>
Add a new ioctl, SNAPSHOT_GET_IMAGE_SIZE, returning the size of the (just
created) hibernation image, to the hibernation userland interface.
This ioctl is necessary so that the userland utilities using the interface need
not access the hibernation image header, owned by the kernel, in order to obtain
the size of the image.
Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
Acked-by: Pavel Machek <[EMAIL PROTECTED]>
---
Documentation/power/userland-swsusp.txt | 12 +---
kernel/power/power.h|4 +++-
kernel/power/snapshot.c |7 ++-
kernel/power/user.c | 18 ++
4 files changed, 28 insertions(+), 13 deletions(-)
Index: linux-2.6.23-rc5/kernel/power/power.h
===
--- linux-2.6.23-rc5.orig/kernel/power/power.h 2007-09-02 12:00:37.0
+0200
+++ linux-2.6.23-rc5/kernel/power/power.h 2007-09-02 12:04:26.0
+0200
@@ -130,6 +130,7 @@ struct snapshot_handle {
#define data_of(handle)((handle).buffer + (handle).buf_offset)
extern unsigned int snapshot_additional_pages(struct zone *zone);
+extern unsigned long snapshot_get_image_size(void);
extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
extern int snapshot_write_next(struct snapshot_handle *handle, size_t count);
extern void snapshot_write_finalize(struct snapshot_handle *handle);
@@ -160,7 +161,8 @@ struct resume_swap_area {
#define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned
int)
#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \
struct resume_swap_area)
-#define SNAPSHOT_IOC_MAXNR 13
+#define SNAPSHOT_GET_IMAGE_SIZE_IOR(SNAPSHOT_IOC_MAGIC, 14,
loff_t)
+#define SNAPSHOT_IOC_MAXNR 14
#define PMOPS_PREPARE 1
#define PMOPS_ENTER2
Index: linux-2.6.23-rc5/kernel/power/user.c
===
--- linux-2.6.23-rc5.orig/kernel/power/user.c 2007-09-02 00:39:24.0
+0200
+++ linux-2.6.23-rc5/kernel/power/user.c2007-09-02 12:04:26.0
+0200
@@ -133,7 +133,7 @@ static int snapshot_ioctl(struct inode *
{
int error = 0;
struct snapshot_data *data;
- loff_t avail;
+ loff_t size;
sector_t offset;
if (_IOC_TYPE(cmd) != SNAPSHOT_IOC_MAGIC)
@@ -210,10 +210,20 @@ static int snapshot_ioctl(struct inode *
image_size = arg;
break;
+ case SNAPSHOT_GET_IMAGE_SIZE:
+ if (!data->ready) {
+ error = -ENODATA;
+ break;
+ }
+ size = snapshot_get_image_size();
+ size <<= PAGE_SHIFT;
+ error = put_user(size, (loff_t __user *)arg);
+ break;
+
case SNAPSHOT_AVAIL_SWAP:
- avail = count_swap_pages(data->swap, 1);
- avail <<= PAGE_SHIFT;
- error = put_user(avail, (loff_t __user *)arg);
+ size = count_swap_pages(data->swap, 1);
+ size <<= PAGE_SHIFT;
+ error = put_user(size, (loff_t __user *)arg);
break;
case SNAPSHOT_GET_SWAP_PAGE:
Index: linux-2.6.23-rc5/kernel/power/snapshot.c
===
--- linux-2.6.23-rc5.orig/kernel/power/snapshot.c 2007-09-02
12:00:37.0 +0200
+++ linux-2.6.23-rc5/kernel/power/snapshot.c2007-09-02 12:04:26.0
+0200
@@ -1263,12 +1263,17 @@ static char *check_image_kernel(struct s
}
#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
+unsigned long snapshot_get_image_size(void)
+{
+ return nr_copy_pages + nr_meta_pages + 1;
+}
+
static int init_header(struct swsusp_info *info)
{
memset(info, 0, sizeof(struct swsusp_info));
info->num_physpages = num_physpages;
info->image_pages = nr_copy_pages;
- info->pages = nr_copy_pages + nr_meta_pages + 1;
+ info->pages = snapshot_get_image_size();
info->size = info->pages;
info->size <<= PAGE_SHIFT;
return init_header_complete(info);
Index: linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt
===
--- linux-2.6.23-rc5.orig/Documentation/power/userland-swsusp.txt
2007-08-29 23:51:50.0 +0200
+++ linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt2007-09-02
12:04:26.0 +0200
@@ -54,6 +54,8 @@ SNAPSHOT_SET_IMAGE_SIZE - set the prefer
this number, but if it turns out to be impossible, the kernel will
create the smallest image possible)
+SNAPSHOT_GET_IMAGE_SIZE - return the actual size of the hibernation image
+
SNAPSHOT_AVAIL_SWAP - return the amount of available swap in bytes (the last
[PATCH -mm 1/5] Hibernation: Introduce SNAPSHOT_GET_IMAGE_SIZE ioctl
From: Rafael J. Wysocki [EMAIL PROTECTED]
Add a new ioctl, SNAPSHOT_GET_IMAGE_SIZE, returning the size of the (just
created) hibernation image, to the hibernation userland interface.
This ioctl is necessary so that the userland utilities using the interface need
not access the hibernation image header, owned by the kernel, in order to obtain
the size of the image.
Signed-off-by: Rafael J. Wysocki [EMAIL PROTECTED]
Acked-by: Pavel Machek [EMAIL PROTECTED]
---
Documentation/power/userland-swsusp.txt | 12 +---
kernel/power/power.h|4 +++-
kernel/power/snapshot.c |7 ++-
kernel/power/user.c | 18 ++
4 files changed, 28 insertions(+), 13 deletions(-)
Index: linux-2.6.23-rc5/kernel/power/power.h
===
--- linux-2.6.23-rc5.orig/kernel/power/power.h 2007-09-02 12:00:37.0
+0200
+++ linux-2.6.23-rc5/kernel/power/power.h 2007-09-02 12:04:26.0
+0200
@@ -130,6 +130,7 @@ struct snapshot_handle {
#define data_of(handle)((handle).buffer + (handle).buf_offset)
extern unsigned int snapshot_additional_pages(struct zone *zone);
+extern unsigned long snapshot_get_image_size(void);
extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
extern int snapshot_write_next(struct snapshot_handle *handle, size_t count);
extern void snapshot_write_finalize(struct snapshot_handle *handle);
@@ -160,7 +161,8 @@ struct resume_swap_area {
#define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned
int)
#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \
struct resume_swap_area)
-#define SNAPSHOT_IOC_MAXNR 13
+#define SNAPSHOT_GET_IMAGE_SIZE_IOR(SNAPSHOT_IOC_MAGIC, 14,
loff_t)
+#define SNAPSHOT_IOC_MAXNR 14
#define PMOPS_PREPARE 1
#define PMOPS_ENTER2
Index: linux-2.6.23-rc5/kernel/power/user.c
===
--- linux-2.6.23-rc5.orig/kernel/power/user.c 2007-09-02 00:39:24.0
+0200
+++ linux-2.6.23-rc5/kernel/power/user.c2007-09-02 12:04:26.0
+0200
@@ -133,7 +133,7 @@ static int snapshot_ioctl(struct inode *
{
int error = 0;
struct snapshot_data *data;
- loff_t avail;
+ loff_t size;
sector_t offset;
if (_IOC_TYPE(cmd) != SNAPSHOT_IOC_MAGIC)
@@ -210,10 +210,20 @@ static int snapshot_ioctl(struct inode *
image_size = arg;
break;
+ case SNAPSHOT_GET_IMAGE_SIZE:
+ if (!data-ready) {
+ error = -ENODATA;
+ break;
+ }
+ size = snapshot_get_image_size();
+ size = PAGE_SHIFT;
+ error = put_user(size, (loff_t __user *)arg);
+ break;
+
case SNAPSHOT_AVAIL_SWAP:
- avail = count_swap_pages(data-swap, 1);
- avail = PAGE_SHIFT;
- error = put_user(avail, (loff_t __user *)arg);
+ size = count_swap_pages(data-swap, 1);
+ size = PAGE_SHIFT;
+ error = put_user(size, (loff_t __user *)arg);
break;
case SNAPSHOT_GET_SWAP_PAGE:
Index: linux-2.6.23-rc5/kernel/power/snapshot.c
===
--- linux-2.6.23-rc5.orig/kernel/power/snapshot.c 2007-09-02
12:00:37.0 +0200
+++ linux-2.6.23-rc5/kernel/power/snapshot.c2007-09-02 12:04:26.0
+0200
@@ -1263,12 +1263,17 @@ static char *check_image_kernel(struct s
}
#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
+unsigned long snapshot_get_image_size(void)
+{
+ return nr_copy_pages + nr_meta_pages + 1;
+}
+
static int init_header(struct swsusp_info *info)
{
memset(info, 0, sizeof(struct swsusp_info));
info-num_physpages = num_physpages;
info-image_pages = nr_copy_pages;
- info-pages = nr_copy_pages + nr_meta_pages + 1;
+ info-pages = snapshot_get_image_size();
info-size = info-pages;
info-size = PAGE_SHIFT;
return init_header_complete(info);
Index: linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt
===
--- linux-2.6.23-rc5.orig/Documentation/power/userland-swsusp.txt
2007-08-29 23:51:50.0 +0200
+++ linux-2.6.23-rc5/Documentation/power/userland-swsusp.txt2007-09-02
12:04:26.0 +0200
@@ -54,6 +54,8 @@ SNAPSHOT_SET_IMAGE_SIZE - set the prefer
this number, but if it turns out to be impossible, the kernel will
create the smallest image possible)
+SNAPSHOT_GET_IMAGE_SIZE - return the actual size of the hibernation image
+
SNAPSHOT_AVAIL_SWAP - return the amount of available swap in bytes (the last
argument should
