From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
containers@lists.linux-foundation.org,
torvalds@linux-foundation.org, xemul@parallels.com,
orenl@cs.columbia.edu, serue@us.ibm.com, dave@linux.vnet.ibm.com,
mingo@elte.hu, Alexey Dobriyan <adobriyan@gmail.com>
Subject: [PATCH 22/38] C/R: i386 xstate
Date: Fri, 22 May 2009 08:55:16 +0400 [thread overview]
Message-ID: <1242968132-1044-22-git-send-email-adobriyan@gmail.com> (raw)
In-Reply-To: <1242968132-1044-1-git-send-email-adobriyan@gmail.com>
The only check is if xstate length doesn't match.
This is insufficient, but posted anyway, because glibc manages
to do FP calculations and create xstate which would prevent
checkpointing.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
include/linux/kstate-image.h | 3 ++
kernel/kstate/kstate-x86_32.c | 44 ++++++++++++++++++++++++++++++++++++----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/include/linux/kstate-image.h b/include/linux/kstate-image.h
index 6f11b4d..3c93432 100644
--- a/include/linux/kstate-image.h
+++ b/include/linux/kstate-image.h
@@ -105,6 +105,9 @@ struct kstate_image_task_struct_i386 {
__u32 dr7;
__u64 tls_array[3];
+
+ __u32 len_xstate;
+ /* __u8 xstate[len_xstate]; */
} __packed;
struct kstate_image_mm_struct {
diff --git a/kernel/kstate/kstate-x86_32.c b/kernel/kstate/kstate-x86_32.c
index c738e16..d5c162b 100644
--- a/kernel/kstate/kstate-x86_32.c
+++ b/kernel/kstate/kstate-x86_32.c
@@ -1,5 +1,6 @@
/* Copyright (C) 2000-2009 Parallels Holdings, Ltd. */
#include <linux/sched.h>
+#include <asm/i387.h>
#include <linux/kstate.h>
#include <linux/kstate-image.h>
@@ -74,12 +75,16 @@ static int check_tls(struct desc_struct *desc)
int kstate_arch_check_image_task_struct(struct kstate_image_task_struct *tsk_i)
{
struct kstate_image_task_struct_i386 *i = (void *)(tsk_i + 1);
+ unsigned int len_xstate;
int rv;
if (tsk_i->tsk_arch != KSTATE_ARCH_I386)
return -EINVAL;
if (tsk_i->hdr.obj_len < sizeof(*tsk_i) + sizeof(*i))
return -EINVAL;
+ len_xstate = i->len_xstate;
+ if (tsk_i->hdr.obj_len - sizeof(*tsk_i) - sizeof(*i) < len_xstate)
+ return -EINVAL;
rv = check_eflags(i->eflags);
if (rv < 0)
@@ -126,22 +131,28 @@ int kstate_arch_check_image_task_struct(struct kstate_image_task_struct *tsk_i)
return rv;
}
+ if (len_xstate > 0 && len_xstate != xstate_size) {
+ WARN(1, "xstate size mismatch %u:%u\n", len_xstate, xstate_size);
+ return -EINVAL;
+ }
+
return 0;
}
unsigned int kstate_arch_len_task_struct(struct task_struct *tsk)
{
- return sizeof(struct kstate_image_task_struct_i386);
+ unsigned int len;
+
+ len = sizeof(struct kstate_image_task_struct_i386);
+ if (tsk->thread.xstate)
+ len += xstate_size;
+ return len;
}
int kstate_arch_check_task_struct(struct task_struct *tsk)
{
struct restart_block *rb;
- if (tsk->thread.xstate) {
- WARN_ON(1);
- return -EINVAL;
- }
rb = &task_thread_info(tsk)->restart_block;
if (rb->fn != current_thread_info()->restart_block.fn) {
WARN(1, "rb->fn = %pF\n", rb->fn);
@@ -237,13 +248,30 @@ int kstate_arch_dump_task_struct(struct kstate_context *ctx, struct task_struct
BUILD_BUG_ON(sizeof(tsk->thread.tls_array) != 3 * 8);
memcpy(i->tls_array, tsk->thread.tls_array, sizeof(i->tls_array));
+ i->len_xstate = 0;
+ if (tsk->thread.xstate) {
+ i->len_xstate = xstate_size;
+ memcpy(i + 1, tsk->thread.xstate, xstate_size);
+ }
+
return 0;
}
+static int restore_xstate(struct task_struct *tsk, void *xstate, unsigned int len)
+{
+ int rv;
+
+ rv = init_fpu(tsk);
+ if (rv == 0)
+ memcpy(tsk->thread.xstate, xstate, len);
+ return rv;
+}
+
asmlinkage void ret_from_fork(void);
static int restore_task_struct_i386(struct task_struct *tsk, struct kstate_image_task_struct_i386 *i)
{
struct pt_regs *regs = task_pt_regs(tsk);
+ int rv;
tsk->thread.sp = (unsigned long)regs;
tsk->thread.sp0 = (unsigned long)(regs + 1);
@@ -281,6 +309,12 @@ static int restore_task_struct_i386(struct task_struct *tsk, struct kstate_image
memcpy(tsk->thread.tls_array, i->tls_array, 3 * 8);
+ if (i->len_xstate) {
+ rv = restore_xstate(tsk, i + 1, i->len_xstate);
+ if (rv < 0)
+ return rv;
+ }
+
return 0;
}
--
1.5.6.5
next prev parent reply other threads:[~2009-05-22 5:01 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 4:54 [PATCH 01/38] cred: #include init.h in cred.h Alexey Dobriyan
2009-05-22 4:54 ` [PATCH 02/38] utsns: extract create_uts_ns() Alexey Dobriyan
2009-05-24 22:37 ` Serge E. Hallyn
2009-05-22 4:54 ` [PATCH 03/38] ipcns 1/4: remove useless get/put while CLONE_NEWIPC Alexey Dobriyan
2009-05-22 9:00 ` Amerigo Wang
2009-05-22 4:54 ` [PATCH 04/38] ipcns 2/4: extract create_ipc_ns() Alexey Dobriyan
2009-05-22 8:59 ` Amerigo Wang
2009-05-22 4:54 ` [PATCH 05/38] ipcns 3/4: make free_ipc_ns() static Alexey Dobriyan
2009-05-24 22:40 ` Serge E. Hallyn
2009-05-22 4:55 ` [PATCH 06/38] ipcns 4/2: move free_ipcs() proto Alexey Dobriyan
2009-05-24 22:49 ` Serge E. Hallyn
2009-05-22 4:55 ` [PATCH 07/38] pidns 1/2: make create_pid_namespace() accept parent pidns Alexey Dobriyan
2009-05-22 9:20 ` Amerigo Wang
2009-05-24 22:44 ` Serge E. Hallyn
2009-06-04 0:20 ` Sukadev Bhattiprolu
2009-05-22 4:55 ` [PATCH 08/38] pidns 2/2: rewrite copy_pid_ns() Alexey Dobriyan
2009-05-22 9:14 ` Amerigo Wang
2009-05-24 22:45 ` Serge E. Hallyn
2009-06-04 0:17 ` Sukadev Bhattiprolu
2009-05-22 4:55 ` [PATCH 09/38] netns 1/2: don't get/put old netns on CLONE_NEWNET Alexey Dobriyan
2009-05-22 6:30 ` David Miller
2009-05-22 4:55 ` [PATCH 10/38] netns 2/2: extract net_create() Alexey Dobriyan
2009-05-22 6:30 ` David Miller
2009-05-22 4:55 ` [PATCH 11/38] nsproxy: extract create_nsproxy() Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 12/38] i386: ifdef out struct thread_struct::fs Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 13/38] x86_64: ifdef out struct thread_struct::ip Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 14/38] Remove struct mm_struct::exe_file et al Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 15/38] dcache: extract and use d_unlinked() Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 16/38] x86: ptrace debugreg checks rewrite Alexey Dobriyan
2009-05-26 23:25 ` Andrew Morton
2009-05-22 4:55 ` [PATCH 17/38] groups: move code to kernel/groups.c Alexey Dobriyan
2009-05-25 0:53 ` Serge E. Hallyn
2009-05-26 14:48 ` Serge E. Hallyn
2009-05-26 18:34 ` Alexey Dobriyan
2009-05-26 23:25 ` Serge E. Hallyn
2009-05-22 4:55 ` [PATCH 18/38] C/R: core stuff Alexey Dobriyan
2009-05-26 13:16 ` Serge E. Hallyn
2009-05-26 19:35 ` Alexey Dobriyan
2009-05-26 23:14 ` Serge E. Hallyn
2009-05-26 23:44 ` Serge E. Hallyn
2009-05-28 15:38 ` Alexey Dobriyan
2009-05-28 18:17 ` Serge E. Hallyn
2009-05-28 22:42 ` Oren Laadan
2009-05-27 18:52 ` Dave Hansen
2009-05-27 20:56 ` Oren Laadan
2009-05-27 22:17 ` Alexey Dobriyan
2009-05-27 22:40 ` Andrew Morton
2009-05-27 22:45 ` Oren Laadan
2009-05-28 15:33 ` Alexey Dobriyan
2009-05-28 22:20 ` Oren Laadan
2009-05-28 22:33 ` Matt Helsley
2009-05-29 6:01 ` Alexey Dobriyan
2009-05-29 17:26 ` Dave Hansen
2009-05-27 22:25 ` Alexey Dobriyan
2009-05-27 16:28 ` Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 19/38] C/R: multiple tasks Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 20/38] C/R: i386 support Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 21/38] C/R: i386 debug registers Alexey Dobriyan
2009-05-22 4:55 ` Alexey Dobriyan [this message]
2009-05-22 4:55 ` [PATCH 23/38] C/R: x86_64 support Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 24/38] C/R: x86_64 debug registers Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 25/38] C/R: x86_64 xstate Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 26/38] C/R: nsproxy Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 27/38] C/R: checkpoint/restore struct uts_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 28/38] C/R: formally checkpoint/restore struct ipc_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 29/38] C/R: formally checkpoint/restore struct mnt_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 30/38] C/R: checkpoint/restore struct pid_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 31/38] C/R: formally checkpoint/restore struct net_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 32/38] C/R: checkpoint/restore struct cred Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 33/38] C/R: checkpoint/restore aux groups (structy group_info) Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 34/38] C/R: checkpoint/restore struct user Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 35/38] C/R: checkpoint/restore struct user_namespace Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 36/38] C/R: checkpoint/restore struct pid Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 37/38] C/R: checkpoint/restore opened files Alexey Dobriyan
2009-05-22 4:55 ` [PATCH 38/38] C/R: checkpoint/restart struct sighand_struct Alexey Dobriyan
2009-05-22 5:02 ` [PATCH 01/38] cred: #include init.h in cred.h Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1242968132-1044-22-git-send-email-adobriyan@gmail.com \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=orenl@cs.columbia.edu \
--cc=serue@us.ibm.com \
--cc=torvalds@linux-foundation.org \
--cc=xemul@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).