xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Dan Magenheimer <dan.magenheimer@oracle.com>
To: xen-devel@lists.xen.org, keir@xen.org
Cc: Kurt Hackel <kurt.hackel@oracle.com>,
	Konrad Wilk <konrad.wilk@oracle.com>
Subject: [PATCH] tmem: fixup 2010 cleanup patch that breaks tmem save/restore
Date: Tue, 4 Sep 2012 14:25:46 -0700 (PDT)	[thread overview]
Message-ID: <f24f5494-5b64-4872-a830-c44859461a9d@default> (raw)

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

20918:a3fa6d444b25 "Fix domain reference leaks" (in Feb 2010, by Jan)
does some cleanup in addition to the leak fixes.  Unfortunately, that
cleanup inadvertently resulted in an incorrect fallthrough in a switch
statement which breaks tmem save/restore.

That broken patch was apparently applied to 4.0-testing and 4.1-testing
so those are broken as well.

What is the process now for requesting back-patches to 4.0 and 4.1?

(Side note: This does not by itself entirely fix save/restore in 4.2.)

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>

diff -r 1dfbae8dd282 xen/common/tmem.c
--- a/xen/common/tmem.c	Fri Aug 31 11:13:49 2012 +0100
+++ b/xen/common/tmem.c	Tue Sep 04 15:17:29 2012 -0600
@@ -2404,6 +2404,7 @@ static NOINLINE int tmemc_save_subop(int
         *uuid++ = pool->uuid[0];
         *uuid = pool->uuid[1];
         rc = 0;
+        break;
     case TMEMC_SAVE_END:
         client->live_migrating = 0;
         if ( !list_empty(&client->persistent_invalidated_list) )
@@ -2412,6 +2413,7 @@ static NOINLINE int tmemc_save_subop(int
                 pgp_free_from_inv_list(client,pgp);
         client->frozen = client->was_frozen;
         rc = 0;
+        break;
     }
     return rc;
 }

[-- Attachment #2: tmem-fix-switch-in-tmemsave.patch --]
[-- Type: application/octet-stream, Size: 661 bytes --]

diff -r 1dfbae8dd282 xen/common/tmem.c
--- a/xen/common/tmem.c	Fri Aug 31 11:13:49 2012 +0100
+++ b/xen/common/tmem.c	Tue Sep 04 15:17:29 2012 -0600
@@ -2404,6 +2404,7 @@ static NOINLINE int tmemc_save_subop(int
         *uuid++ = pool->uuid[0];
         *uuid = pool->uuid[1];
         rc = 0;
+        break;
     case TMEMC_SAVE_END:
         client->live_migrating = 0;
         if ( !list_empty(&client->persistent_invalidated_list) )
@@ -2412,6 +2413,7 @@ static NOINLINE int tmemc_save_subop(int
                 pgp_free_from_inv_list(client,pgp);
         client->frozen = client->was_frozen;
         rc = 0;
+        break;
     }
     return rc;
 }

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

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

             reply	other threads:[~2012-09-04 21:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-04 21:25 Dan Magenheimer [this message]
2012-09-05 11:33 ` [PATCH] tmem: fixup 2010 cleanup patch that breaks tmem save/restore Jan Beulich

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=f24f5494-5b64-4872-a830-c44859461a9d@default \
    --to=dan.magenheimer@oracle.com \
    --cc=keir@xen.org \
    --cc=konrad.wilk@oracle.com \
    --cc=kurt.hackel@oracle.com \
    --cc=xen-devel@lists.xen.org \
    /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).