From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] common/memory: fix an XSM error path Date: Mon, 12 Jan 2015 11:09:03 +0000 Message-ID: <54B3AB4F.3080609@citrix.com> References: <54B3921A0200007800053746@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1238917931111754873==" Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YAcrt-0006bS-7e for xen-devel@lists.xenproject.org; Mon, 12 Jan 2015 11:09:09 +0000 In-Reply-To: <54B3921A0200007800053746@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel Cc: Ian Campbell , Ian Jackson , dgdegra@tycho.nsa.gov, Keir Fraser , Tim Deegan List-Id: xen-devel@lists.xenproject.org --===============1238917931111754873== Content-Type: multipart/alternative; boundary="------------010403000209030302000000" --------------010403000209030302000000 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit On 12/01/15 08:21, Jan Beulich wrote: > XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap > return the extent at which failure was detected, not error indicators. > > Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper > > --- a/xen/common/memory.c > +++ b/xen/common/memory.c > @@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN > return start_extent; > args.domain = d; > > - rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d); > - if ( rc ) > + if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) ) > { > rcu_unlock_domain(d); > - return rc; > + return start_extent; > } > > switch ( op ) > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel --------------010403000209030302000000 Content-Type: text/html; charset="windows-1252" Content-Transfer-Encoding: 7bit
On 12/01/15 08:21, Jan Beulich wrote:
XENMEM_{in,de}crease_reservation as well as XENMEM_populate_physmap
return the extent at which failure was detected, not error indicators.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>


--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -747,11 +747,10 @@ long do_memory_op(unsigned long cmd, XEN
             return start_extent;
         args.domain = d;
 
-        rc = xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d);
-        if ( rc )
+        if ( xsm_memory_adjust_reservation(XSM_TARGET, current->domain, d) )
         {
             rcu_unlock_domain(d);
-            return rc;
+            return start_extent;
         }
 
         switch ( op )





_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------010403000209030302000000-- --===============1238917931111754873== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1238917931111754873==--