[PATCH 1/2] m_type is long, not int

[PATCH 1/2] m_type is long, not int

[serue-r/Jw6+rmf7HQT0dZR+AlfA]

From: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

So make sure we store a field big enough on 64-bit arch.

Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 include/linux/checkpoint_hdr.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
index 314d967..a80dcdc 100644
--- a/include/linux/checkpoint_hdr.h
+++ b/include/linux/checkpoint_hdr.h
@@ -977,7 +977,7 @@ struct ckpt_hdr_ipc_msg {
 
 struct ckpt_hdr_ipc_msg_msg {
 	struct ckpt_hdr h;
-	__s32 m_type;
+	__s64 m_type;
 	__u32 m_ts;
 	__s32 sec_ref;
 } __attribute__((aligned(8)));
-- 
1.6.0.6

[PATCH 2/2] sem restore: don't free sma if it's an error

[serue-r/Jw6+rmf7HQT0dZR+AlfA]

From: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 ipc/checkpoint_sem.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c
index 53a19ed..395c84d 100644
--- a/ipc/checkpoint_sem.c
+++ b/ipc/checkpoint_sem.c
@@ -186,6 +186,7 @@ int restore_ipc_sem(struct ckpt_ctx *ctx, struct ipc_namespace *ns)
 	sma = restore_sem_array(ctx, h->sem_nsems);
 	if (IS_ERR(sma)) {
 		ret = PTR_ERR(sma);
+		sma = NULL;
 		goto out;
 	}
 
-- 
1.6.0.6

Re: [PATCH 2/2] sem restore: don't free sma if it's an error

[Serge E. Hallyn]

Quoting serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org (serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> From: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> 
> Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  ipc/checkpoint_sem.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c
> index 53a19ed..395c84d 100644
> --- a/ipc/checkpoint_sem.c
> +++ b/ipc/checkpoint_sem.c
> @@ -186,6 +186,7 @@ int restore_ipc_sem(struct ckpt_ctx *ctx, struct ipc_namespace *ns)
>  	sma = restore_sem_array(ctx, h->sem_nsems);
>  	if (IS_ERR(sma)) {
>  		ret = PTR_ERR(sma);
> +		sma = NULL;
>  		goto out;
>  	}
> 
> -- 
> 1.6.0.6

So FWIW on x86-64 many of the tests current pass - the 3 failures I'm seeing
are due to:

	1. message queues for some reason aren't seen by the restarted
	   task (restart does think it is restoring them according to debug
	   info)
	2. self-checkpoint not yet supported
	3. restart block not set up right (or at least cr_tests/sleep fails
	   for some reason, haven't yet looked at why)

I'm trying to track down #1 right now

-serge

Re: [PATCH 2/2] sem restore: don't free sma if it's an error

[Serge E. Hallyn]

Quoting Serge E. Hallyn (serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> Quoting serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org (serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> > From: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> > 
> > Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> > ---
> >  ipc/checkpoint_sem.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c
> > index 53a19ed..395c84d 100644
> > --- a/ipc/checkpoint_sem.c
> > +++ b/ipc/checkpoint_sem.c
> > @@ -186,6 +186,7 @@ int restore_ipc_sem(struct ckpt_ctx *ctx, struct ipc_namespace *ns)
> >  	sma = restore_sem_array(ctx, h->sem_nsems);
> >  	if (IS_ERR(sma)) {
> >  		ret = PTR_ERR(sma);
> > +		sma = NULL;
> >  		goto out;
> >  	}
> > 
> > -- 
> > 1.6.0.6
> 
> So FWIW on x86-64 many of the tests current pass - the 3 failures I'm seeing
> are due to:
> 
> 	1. message queues for some reason aren't seen by the restarted
> 	   task (restart does think it is restoring them according to debug
> 	   info)
> 	2. self-checkpoint not yet supported
> 	3. restart block not set up right (or at least cr_tests/sleep fails
> 	   for some reason, haven't yet looked at why)
> 
> I'm trying to track down #1 right now

Oops, haha - bad selinux policy.  Down to two errors then.

-serge

Re: [PATCH 1/2] m_type is long, not int

[Oren Laadan]

Ack for this and the next one... added.

serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org wrote:
> From: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> 
> So make sure we store a field big enough on 64-bit arch.
> 
> Signed-off-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  include/linux/checkpoint_hdr.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
> index 314d967..a80dcdc 100644
> --- a/include/linux/checkpoint_hdr.h
> +++ b/include/linux/checkpoint_hdr.h
> @@ -977,7 +977,7 @@ struct ckpt_hdr_ipc_msg {
>  
>  struct ckpt_hdr_ipc_msg_msg {
>  	struct ckpt_hdr h;
> -	__s32 m_type;
> +	__s64 m_type;
>  	__u32 m_ts;
>  	__s32 sec_ref;
>  } __attribute__((aligned(8)));