xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Jan Beulich" <JBeulich@novell.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH] x86: fix improper return value from relinquish_memory()
Date: Wed, 24 Mar 2010 11:07:35 +0000	[thread overview]
Message-ID: <4BAA00870200007800036B93@vpn.id2.novell.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

While apparently only a theoretical possibility (domain_kill() has a
BUG_ON() that wasn't reported to trigger so far), I still think it is
better to have the code cleaned up.

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

--- 2010-03-22.orig/xen/arch/x86/domain.c	2010-03-22 00:00:00.000000000 +0100
+++ 2010-03-22/xen/arch/x86/domain.c	2010-03-24 11:57:49.000000000 +0100
@@ -1821,8 +1821,10 @@ static int relinquish_memory(
         {
         case 0:
             break;
-        case -EAGAIN:
         case -EINTR:
+            ret = -EAGAIN;
+            /* fallthrough */
+        case -EAGAIN:
             page_list_add(page, list);
             set_bit(_PGT_pinned, &page->u.inuse.type_info);
             put_page(page);




[-- Attachment #2: x86-domain-cleanup-EINTR.patch --]
[-- Type: text/plain, Size: 755 bytes --]

While apparently only a theoretical possibility (domain_kill() has a
BUG_ON() that wasn't reported to trigger so far), I still think it is
better to have the code cleaned up.

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

--- 2010-03-22.orig/xen/arch/x86/domain.c	2010-03-22 00:00:00.000000000 +0100
+++ 2010-03-22/xen/arch/x86/domain.c	2010-03-24 11:57:49.000000000 +0100
@@ -1821,8 +1821,10 @@ static int relinquish_memory(
         {
         case 0:
             break;
-        case -EAGAIN:
         case -EINTR:
+            ret = -EAGAIN;
+            /* fallthrough */
+        case -EAGAIN:
             page_list_add(page, list);
             set_bit(_PGT_pinned, &page->u.inuse.type_info);
             put_page(page);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

             reply	other threads:[~2010-03-24 11:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-24 11:07 Jan Beulich [this message]
2010-03-24 11:23 ` [PATCH] x86: fix improper return value from relinquish_memory() Jan Beulich
2010-03-24 14:43   ` Konrad Rzeszutek Wilk
2010-03-24 14:54     ` Keir Fraser

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=4BAA00870200007800036B93@vpn.id2.novell.com \
    --to=jbeulich@novell.com \
    --cc=xen-devel@lists.xensource.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).