From: Dan Magenheimer Subject: [PATCH] tmem: fix regression from c/s 19886 "Remove page-scrub lists and async scrubbing" Date: Mon, 16 Nov 2009 13:44:52 -0800 (PST) Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__125840789952531678abhmt009.oracle.com" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "Xen-Devel (E-mail)" List-Id: xen-devel@lists.xenproject.org --__125840789952531678abhmt009.oracle.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Fix incorrect page_list macro choice from page-scrub code cleanup. Signed-off-by: Dan Magenheimer diff -r bec27eb6f72c xen/common/tmem_xen.c --- a/xen/common/tmem_xen.c=09Sat Nov 14 10:32:59 2009 +0000 +++ b/xen/common/tmem_xen.c=09Mon Nov 16 11:09:17 2009 -0700 @@ -213,12 +213,13 @@ EXPORT void tmh_release_avail_pages_to_h spin_lock(&tmh_page_list_lock); while ( !page_list_empty(&tmh_page_list) ) { - struct page_info *pg =3D page_list_first(&tmh_page_list); + struct page_info *pg =3D page_list_remove_head(&tmh_page_list); scrub_one_page(pg); + tmh_page_list_pages--; free_domheap_page(pg); } + ASSERT(tmh_page_list_pages =3D=3D 0); INIT_PAGE_LIST_HEAD(&tmh_page_list); - tmh_page_list_pages =3D 0; spin_unlock(&tmh_page_list_lock); } --__125840789952531678abhmt009.oracle.com Content-Type: application/octet-stream; name="tmem-scrub-regress.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="tmem-scrub-regress.patch" ZGlmZiAtciBiZWMyN2ViNmY3MmMgeGVuL2NvbW1vbi90bWVtX3hlbi5jCi0tLSBhL3hlbi9jb21t b24vdG1lbV94ZW4uYwlTYXQgTm92IDE0IDEwOjMyOjU5IDIwMDkgKzAwMDAKKysrIGIveGVuL2Nv bW1vbi90bWVtX3hlbi5jCU1vbiBOb3YgMTYgMTE6MDk6MTcgMjAwOSAtMDcwMApAQCAtMjEzLDEy ICsyMTMsMTMgQEAgRVhQT1JUIHZvaWQgdG1oX3JlbGVhc2VfYXZhaWxfcGFnZXNfdG9faAogICAg IHNwaW5fbG9jaygmdG1oX3BhZ2VfbGlzdF9sb2NrKTsKICAgICB3aGlsZSAoICFwYWdlX2xpc3Rf ZW1wdHkoJnRtaF9wYWdlX2xpc3QpICkKICAgICB7Ci0gICAgICAgIHN0cnVjdCBwYWdlX2luZm8g KnBnID0gcGFnZV9saXN0X2ZpcnN0KCZ0bWhfcGFnZV9saXN0KTsKKyAgICAgICAgc3RydWN0IHBh Z2VfaW5mbyAqcGcgPSBwYWdlX2xpc3RfcmVtb3ZlX2hlYWQoJnRtaF9wYWdlX2xpc3QpOwogICAg ICAgICBzY3J1Yl9vbmVfcGFnZShwZyk7CisgICAgICAgIHRtaF9wYWdlX2xpc3RfcGFnZXMtLTsK ICAgICAgICAgZnJlZV9kb21oZWFwX3BhZ2UocGcpOwogICAgIH0KKyAgICBBU1NFUlQodG1oX3Bh Z2VfbGlzdF9wYWdlcyA9PSAwKTsKICAgICBJTklUX1BBR0VfTElTVF9IRUFEKCZ0bWhfcGFnZV9s aXN0KTsKLSAgICB0bWhfcGFnZV9saXN0X3BhZ2VzID0gMDsKICAgICBzcGluX3VubG9jaygmdG1o X3BhZ2VfbGlzdF9sb2NrKTsKIH0KIAo= --__125840789952531678abhmt009.oracle.com 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.xensource.com http://lists.xensource.com/xen-devel --__125840789952531678abhmt009.oracle.com--