Re: [PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-03-04 Thread Nathan Fontenot 
On 03/03/2015 02:16 PM, Tyrel Datwyler wrote:
 On 03/02/2015 10:15 PM, Michael Ellerman wrote:
 On Mon, 2015-03-02 at 13:30 -0800, Tyrel Datwyler wrote:
 On 03/01/2015 08:19 PM, Cyril Bur wrote:
 On Fri, 2015-02-27 at 18:24 -0800, Tyrel Datwyler wrote:
 During suspend/migration operation we must wait for the VASI state 
 reported
 by the hypervisor to become Suspending prior to making the ibm,suspend-me
 RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state 
 variable
 that exposes the VASI state to the caller. This is unnecessary as the 
 caller
 only really cares about the following three conditions; if there is an 
 error
 we should bailout, success indicating we have suspended and woken back up 
 so
 proceed to device tree updated, or we are not suspendable yet so try 
 calling
 rtas_ibm_suspend_me again shortly.

 This patch removes the extraneous vasi_state variable and simply uses the
 return code to communicate how to proceed. We either succeed, fail, or get
 -EAGAIN in which case we sleep for a second before trying to call
 rtas_ibm_suspend_me again.

   u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
 | be32_to_cpu(args.args[1]);
 - rc = rtas_ibm_suspend_me(handle, vasi_rc);
 - args.rets[0] = cpu_to_be32(vasi_rc);
 - if (rc)
 + rc = rtas_ibm_suspend_me(handle);
 + if (rc == -EAGAIN)
 + args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);

 (continuing on...) so perhaps here have
rc = 0;
 else if (rc == -EIO)
args.rets[0] = cpu_to_be32(-1);
rc = 0;
 Which should keep the original behaviour, the last thing we want to do
 is break BE.

 The biggest problem here is we are making what basically equates to a
 fake rtas call from drmgr which we intercept in ppc_rtas(). From there
 we make this special call to rtas_ibm_suspend_me() to check VASI state
 and do a bunch of other specialized work that needs to be setup prior to
 making the actual ibm,suspend-me rtas call. Since, we are cheating PAPR
 here I guess we can really handle it however we want. I chose to simply
 fail the rtas call in the case where rtas_ibm_suspend_me() fails with
 something other than -EAGAIN. In user space librtas will log errno for
 the failure and return RTAS_IO_ASSERT to drmgr which in turn will log
 that error and fail.

 We don't want to change the return values of the syscall unless we absolutely
 have to. And I don't think that's the case here.
 
 I'd like to argue that the one case I changed makes sense, but its just
 as easy to keep the original behavior.
 

 Sure we think drmgr is the only thing that uses this crap, but we don't know
 for sure.
 
 I can't imagine how anybody else could possibly use this hack without a
 streamid from the hmc/hypervisor, but I've been wrong in the past more
 times than I can count. :)

Correct, this will fail if called with a random streamid. The streamid has
to match what is handed to us from the HMC when a migration request is
initiated.

-Nathan
 
 
 -Tyrel
 

 cheers


 

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-03-03 Thread Tyrel Datwyler 
On 03/02/2015 10:15 PM, Michael Ellerman wrote:
 On Mon, 2015-03-02 at 13:30 -0800, Tyrel Datwyler wrote:
 On 03/01/2015 08:19 PM, Cyril Bur wrote:
 On Fri, 2015-02-27 at 18:24 -0800, Tyrel Datwyler wrote:
 During suspend/migration operation we must wait for the VASI state reported
 by the hypervisor to become Suspending prior to making the ibm,suspend-me
 RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state 
 variable
 that exposes the VASI state to the caller. This is unnecessary as the 
 caller
 only really cares about the following three conditions; if there is an 
 error
 we should bailout, success indicating we have suspended and woken back up 
 so
 proceed to device tree updated, or we are not suspendable yet so try 
 calling
 rtas_ibm_suspend_me again shortly.

 This patch removes the extraneous vasi_state variable and simply uses the
 return code to communicate how to proceed. We either succeed, fail, or get
 -EAGAIN in which case we sleep for a second before trying to call
 rtas_ibm_suspend_me again.

u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
  | be32_to_cpu(args.args[1]);
 -  rc = rtas_ibm_suspend_me(handle, vasi_rc);
 -  args.rets[0] = cpu_to_be32(vasi_rc);
 -  if (rc)
 +  rc = rtas_ibm_suspend_me(handle);
 +  if (rc == -EAGAIN)
 +  args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);

 (continuing on...) so perhaps here have
 rc = 0;
 else if (rc == -EIO)
 args.rets[0] = cpu_to_be32(-1);
 rc = 0;
 Which should keep the original behaviour, the last thing we want to do
 is break BE.

 The biggest problem here is we are making what basically equates to a
 fake rtas call from drmgr which we intercept in ppc_rtas(). From there
 we make this special call to rtas_ibm_suspend_me() to check VASI state
 and do a bunch of other specialized work that needs to be setup prior to
 making the actual ibm,suspend-me rtas call. Since, we are cheating PAPR
 here I guess we can really handle it however we want. I chose to simply
 fail the rtas call in the case where rtas_ibm_suspend_me() fails with
 something other than -EAGAIN. In user space librtas will log errno for
 the failure and return RTAS_IO_ASSERT to drmgr which in turn will log
 that error and fail.
 
 We don't want to change the return values of the syscall unless we absolutely
 have to. And I don't think that's the case here.

I'd like to argue that the one case I changed makes sense, but its just
as easy to keep the original behavior.

 
 Sure we think drmgr is the only thing that uses this crap, but we don't know
 for sure.

I can't imagine how anybody else could possibly use this hack without a
streamid from the hmc/hypervisor, but I've been wrong in the past more
times than I can count. :)

-Tyrel

 
 cheers
 
 

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-03-02 Thread Tyrel Datwyler 
On 03/01/2015 08:19 PM, Cyril Bur wrote:
 On Fri, 2015-02-27 at 18:24 -0800, Tyrel Datwyler wrote:
 During suspend/migration operation we must wait for the VASI state reported
 by the hypervisor to become Suspending prior to making the ibm,suspend-me
 RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state 
 variable
 that exposes the VASI state to the caller. This is unnecessary as the caller
 only really cares about the following three conditions; if there is an error
 we should bailout, success indicating we have suspended and woken back up so
 proceed to device tree updated, or we are not suspendable yet so try calling
 rtas_ibm_suspend_me again shortly.

 This patch removes the extraneous vasi_state variable and simply uses the
 return code to communicate how to proceed. We either succeed, fail, or get
 -EAGAIN in which case we sleep for a second before trying to call
 rtas_ibm_suspend_me again.

 Signed-off-by: Tyrel Datwyler tyr...@linux.vnet.ibm.com
 ---
  arch/powerpc/include/asm/rtas.h   |  2 +-
  arch/powerpc/kernel/rtas.c| 15 +++
  arch/powerpc/platforms/pseries/mobility.c |  8 +++-
  3 files changed, 11 insertions(+), 14 deletions(-)

 diff --git a/arch/powerpc/include/asm/rtas.h 
 b/arch/powerpc/include/asm/rtas.h
 index 2e23e92..fc85eb0 100644
 --- a/arch/powerpc/include/asm/rtas.h
 +++ b/arch/powerpc/include/asm/rtas.h
 @@ -327,7 +327,7 @@ extern int rtas_suspend_cpu(struct rtas_suspend_me_data 
 *data);
  extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
  extern int rtas_online_cpus_mask(cpumask_var_t cpus);
  extern int rtas_offline_cpus_mask(cpumask_var_t cpus);
 -extern int rtas_ibm_suspend_me(u64 handle, int *vasi_return);
 +extern int rtas_ibm_suspend_me(u64 handle);
  
 I like ditching vasi_return, I was never happy with myself for doing
 that!
 
  struct rtc_time;
  extern unsigned long rtas_get_boot_time(void);
 diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
 index 21c45a2..603b928 100644
 --- a/arch/powerpc/kernel/rtas.c
 +++ b/arch/powerpc/kernel/rtas.c
 @@ -897,7 +897,7 @@ int rtas_offline_cpus_mask(cpumask_var_t cpus)
  }
  EXPORT_SYMBOL(rtas_offline_cpus_mask);
  
 -int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
 +int rtas_ibm_suspend_me(u64 handle)
 
 That definition is actually in an #ifdef CONFIG_PPC_PSERIES, you'll need
 to change the definition for !CONFIG_PPC_PSERIES

Good catch. I'll fix it there too.

  {
  long state;
  long rc;
 @@ -919,13 +919,11 @@ int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
  printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned 
 %ld\n,rc);
  return rc;
  } else if (state == H_VASI_ENABLED) {
 -*vasi_return = RTAS_NOT_SUSPENDABLE;
 -return 0;
 +return -EAGAIN;
  } else if (state != H_VASI_SUSPENDING) {
  printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned state 
 %ld\n,
 state);
 -*vasi_return = -1;
 -return 0;
 +return -EIO;
 
 I've had a look as to how these return values get passed back up the
 stack and admittedly were dealing with a confusing mess, I've compared
 back to before my patch (which wasn't perfect either it seems).
 Both the state == H_VASI_ENABLED and state == H_VASI_SUSPENDING cause
 ppc_rtas to go to the copy_return and return 0 (albeit with an error
 code in args.rets[0]), because rtas_ppc goes back to out userland, I
 hesitate to change any of that.

Agreed, that this is a bit of a mess. The problem is we have two call
paths into rtas_ibm_suspend_me(). The one from migrate_store() and one
from ppc_rtas(). I'll address each with your other comments below.

  }
  
  if (!alloc_cpumask_var(offline_mask, GFP_TEMPORARY))
 @@ -1060,9 +1058,10 @@ asmlinkage int ppc_rtas(struct rtas_args __user 
 *uargs)
  int vasi_rc = 0;
 
 This generates unused variable warning.

Sloppy on my part. Will remove.

 
  u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
| be32_to_cpu(args.args[1]);
 -rc = rtas_ibm_suspend_me(handle, vasi_rc);
 -args.rets[0] = cpu_to_be32(vasi_rc);
 -if (rc)
 +rc = rtas_ibm_suspend_me(handle);
 +if (rc == -EAGAIN)
 +args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);
 
 (continuing on...) so perhaps here have
   rc = 0;
 else if (rc == -EIO)
   args.rets[0] = cpu_to_be32(-1);
   rc = 0;
 Which should keep the original behaviour, the last thing we want to do
 is break BE.

The biggest problem here is we are making what basically equates to a
fake rtas call from drmgr which we intercept in ppc_rtas(). From there
we make this special call to rtas_ibm_suspend_me() to check VASI state
and do a bunch of other specialized work that needs to be setup prior to
making the actual ibm,suspend-me rtas call. Since, we are

Re: [PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-03-02 Thread Michael Ellerman 
On Mon, 2015-03-02 at 13:30 -0800, Tyrel Datwyler wrote:
 On 03/01/2015 08:19 PM, Cyril Bur wrote:
  On Fri, 2015-02-27 at 18:24 -0800, Tyrel Datwyler wrote:
  During suspend/migration operation we must wait for the VASI state reported
  by the hypervisor to become Suspending prior to making the ibm,suspend-me
  RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state 
  variable
  that exposes the VASI state to the caller. This is unnecessary as the 
  caller
  only really cares about the following three conditions; if there is an 
  error
  we should bailout, success indicating we have suspended and woken back up 
  so
  proceed to device tree updated, or we are not suspendable yet so try 
  calling
  rtas_ibm_suspend_me again shortly.
 
  This patch removes the extraneous vasi_state variable and simply uses the
  return code to communicate how to proceed. We either succeed, fail, or get
  -EAGAIN in which case we sleep for a second before trying to call
  rtas_ibm_suspend_me again.
 
 u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
   | be32_to_cpu(args.args[1]);
  -  rc = rtas_ibm_suspend_me(handle, vasi_rc);
  -  args.rets[0] = cpu_to_be32(vasi_rc);
  -  if (rc)
  +  rc = rtas_ibm_suspend_me(handle);
  +  if (rc == -EAGAIN)
  +  args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);
  
  (continuing on...) so perhaps here have
  rc = 0;
  else if (rc == -EIO)
  args.rets[0] = cpu_to_be32(-1);
  rc = 0;
  Which should keep the original behaviour, the last thing we want to do
  is break BE.
 
 The biggest problem here is we are making what basically equates to a
 fake rtas call from drmgr which we intercept in ppc_rtas(). From there
 we make this special call to rtas_ibm_suspend_me() to check VASI state
 and do a bunch of other specialized work that needs to be setup prior to
 making the actual ibm,suspend-me rtas call. Since, we are cheating PAPR
 here I guess we can really handle it however we want. I chose to simply
 fail the rtas call in the case where rtas_ibm_suspend_me() fails with
 something other than -EAGAIN. In user space librtas will log errno for
 the failure and return RTAS_IO_ASSERT to drmgr which in turn will log
 that error and fail.

We don't want to change the return values of the syscall unless we absolutely
have to. And I don't think that's the case here.

Sure we think drmgr is the only thing that uses this crap, but we don't know
for sure.

cheers


___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-03-01 Thread Cyril Bur 
On Fri, 2015-02-27 at 18:24 -0800, Tyrel Datwyler wrote:
 During suspend/migration operation we must wait for the VASI state reported
 by the hypervisor to become Suspending prior to making the ibm,suspend-me
 RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state variable
 that exposes the VASI state to the caller. This is unnecessary as the caller
 only really cares about the following three conditions; if there is an error
 we should bailout, success indicating we have suspended and woken back up so
 proceed to device tree updated, or we are not suspendable yet so try calling
 rtas_ibm_suspend_me again shortly.
 
 This patch removes the extraneous vasi_state variable and simply uses the
 return code to communicate how to proceed. We either succeed, fail, or get
 -EAGAIN in which case we sleep for a second before trying to call
 rtas_ibm_suspend_me again.
 
 Signed-off-by: Tyrel Datwyler tyr...@linux.vnet.ibm.com
 ---
  arch/powerpc/include/asm/rtas.h   |  2 +-
  arch/powerpc/kernel/rtas.c| 15 +++
  arch/powerpc/platforms/pseries/mobility.c |  8 +++-
  3 files changed, 11 insertions(+), 14 deletions(-)
 
 diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
 index 2e23e92..fc85eb0 100644
 --- a/arch/powerpc/include/asm/rtas.h
 +++ b/arch/powerpc/include/asm/rtas.h
 @@ -327,7 +327,7 @@ extern int rtas_suspend_cpu(struct rtas_suspend_me_data 
 *data);
  extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
  extern int rtas_online_cpus_mask(cpumask_var_t cpus);
  extern int rtas_offline_cpus_mask(cpumask_var_t cpus);
 -extern int rtas_ibm_suspend_me(u64 handle, int *vasi_return);
 +extern int rtas_ibm_suspend_me(u64 handle);
  
I like ditching vasi_return, I was never happy with myself for doing
that!

  struct rtc_time;
  extern unsigned long rtas_get_boot_time(void);
 diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
 index 21c45a2..603b928 100644
 --- a/arch/powerpc/kernel/rtas.c
 +++ b/arch/powerpc/kernel/rtas.c
 @@ -897,7 +897,7 @@ int rtas_offline_cpus_mask(cpumask_var_t cpus)
  }
  EXPORT_SYMBOL(rtas_offline_cpus_mask);
  
 -int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
 +int rtas_ibm_suspend_me(u64 handle)

That definition is actually in an #ifdef CONFIG_PPC_PSERIES, you'll need
to change the definition for !CONFIG_PPC_PSERIES
  {
   long state;
   long rc;
 @@ -919,13 +919,11 @@ int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
   printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned 
 %ld\n,rc);
   return rc;
   } else if (state == H_VASI_ENABLED) {
 - *vasi_return = RTAS_NOT_SUSPENDABLE;
 - return 0;
 + return -EAGAIN;
   } else if (state != H_VASI_SUSPENDING) {
   printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned state 
 %ld\n,
  state);
 - *vasi_return = -1;
 - return 0;
 + return -EIO;

I've had a look as to how these return values get passed back up the
stack and admittedly were dealing with a confusing mess, I've compared
back to before my patch (which wasn't perfect either it seems).
Both the state == H_VASI_ENABLED and state == H_VASI_SUSPENDING cause
ppc_rtas to go to the copy_return and return 0 (albeit with an error
code in args.rets[0]), because rtas_ppc goes back to out userland, I
hesitate to change any of that.
   }
  
   if (!alloc_cpumask_var(offline_mask, GFP_TEMPORARY))
 @@ -1060,9 +1058,10 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
   int vasi_rc = 0;

This generates unused variable warning.

   u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
 | be32_to_cpu(args.args[1]);
 - rc = rtas_ibm_suspend_me(handle, vasi_rc);
 - args.rets[0] = cpu_to_be32(vasi_rc);
 - if (rc)
 + rc = rtas_ibm_suspend_me(handle);
 + if (rc == -EAGAIN)
 + args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);

(continuing on...) so perhaps here have
rc = 0;
else if (rc == -EIO)
args.rets[0] = cpu_to_be32(-1);
rc = 0;
Which should keep the original behaviour, the last thing we want to do
is break BE.

Might be worth checking that rc from rtas_ibm_suspend_me will only be
-EAGAIN and -EIO when they are explicitly set in rtas_ibm_suspend_me and
can't come back out from the hcall.
From reading PAPR we're ok there but just as a thought it might be worth
returning errno as positive because hcall errors are going to be
negative, to make life easier at some point... but then we'll have to
remember to make them negative when going back to userland (and there
are two places...) so there's no perfect win here.

 + else if (rc)
   return rc;
   goto copy_return;
   }
 diff --git

[PATCH 1/3] powerpc/pseries: Simplify check for suspendability during suspend/migration

2015-02-27 Thread Tyrel Datwyler 
During suspend/migration operation we must wait for the VASI state reported
by the hypervisor to become Suspending prior to making the ibm,suspend-me
RTAS call. Calling routines to rtas_ibm_supend_me() pass a vasi_state variable
that exposes the VASI state to the caller. This is unnecessary as the caller
only really cares about the following three conditions; if there is an error
we should bailout, success indicating we have suspended and woken back up so
proceed to device tree updated, or we are not suspendable yet so try calling
rtas_ibm_suspend_me again shortly.

This patch removes the extraneous vasi_state variable and simply uses the
return code to communicate how to proceed. We either succeed, fail, or get
-EAGAIN in which case we sleep for a second before trying to call
rtas_ibm_suspend_me again.

Signed-off-by: Tyrel Datwyler tyr...@linux.vnet.ibm.com
---
 arch/powerpc/include/asm/rtas.h   |  2 +-
 arch/powerpc/kernel/rtas.c| 15 +++
 arch/powerpc/platforms/pseries/mobility.c |  8 +++-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 2e23e92..fc85eb0 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -327,7 +327,7 @@ extern int rtas_suspend_cpu(struct rtas_suspend_me_data 
*data);
 extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
 extern int rtas_online_cpus_mask(cpumask_var_t cpus);
 extern int rtas_offline_cpus_mask(cpumask_var_t cpus);
-extern int rtas_ibm_suspend_me(u64 handle, int *vasi_return);
+extern int rtas_ibm_suspend_me(u64 handle);
 
 struct rtc_time;
 extern unsigned long rtas_get_boot_time(void);
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 21c45a2..603b928 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -897,7 +897,7 @@ int rtas_offline_cpus_mask(cpumask_var_t cpus)
 }
 EXPORT_SYMBOL(rtas_offline_cpus_mask);
 
-int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
+int rtas_ibm_suspend_me(u64 handle)
 {
long state;
long rc;
@@ -919,13 +919,11 @@ int rtas_ibm_suspend_me(u64 handle, int *vasi_return)
printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned 
%ld\n,rc);
return rc;
} else if (state == H_VASI_ENABLED) {
-   *vasi_return = RTAS_NOT_SUSPENDABLE;
-   return 0;
+   return -EAGAIN;
} else if (state != H_VASI_SUSPENDING) {
printk(KERN_ERR rtas_ibm_suspend_me: vasi_state returned state 
%ld\n,
   state);
-   *vasi_return = -1;
-   return 0;
+   return -EIO;
}
 
if (!alloc_cpumask_var(offline_mask, GFP_TEMPORARY))
@@ -1060,9 +1058,10 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
int vasi_rc = 0;
u64 handle = ((u64)be32_to_cpu(args.args[0])  32)
  | be32_to_cpu(args.args[1]);
-   rc = rtas_ibm_suspend_me(handle, vasi_rc);
-   args.rets[0] = cpu_to_be32(vasi_rc);
-   if (rc)
+   rc = rtas_ibm_suspend_me(handle);
+   if (rc == -EAGAIN)
+   args.rets[0] = cpu_to_be32(RTAS_NOT_SUSPENDABLE);
+   else if (rc)
return rc;
goto copy_return;
}
diff --git a/arch/powerpc/platforms/pseries/mobility.c 
b/arch/powerpc/platforms/pseries/mobility.c
index 90cf3dc..29e4f04 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -325,15 +325,13 @@ static ssize_t migrate_store(struct class *class, struct 
class_attribute *attr,
return rc;
 
do {
-   rc = rtas_ibm_suspend_me(streamid, vasi_rc);
-   if (!rc  vasi_rc == RTAS_NOT_SUSPENDABLE)
+   rc = rtas_ibm_suspend_me(streamid);
+   if (rc == -EAGAIN)
ssleep(1);
-   } while (!rc  vasi_rc == RTAS_NOT_SUSPENDABLE);
+   } while (rc == -EAGAIN);
 
if (rc)
return rc;
-   if (vasi_rc)
-   return vasi_rc;
 
post_mobility_fixup();
return count;
-- 
1.7.12.2

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev