4.0-testing c/s 21405 incomplete?

4.0-testing c/s 21405 incomplete?

[Jan Beulich]

Keir, George,

it in particular doesn't do what its title says: "Remove lock in
ept_get_entry, ..." - the last two hunks are simply missing compared
to -unstable c/s 22526 (I have no cluse how that happened).

Jan

Re: 4.0-testing c/s 21405 incomplete?

[Keir Fraser]

On 02/02/2011 10:04, "Jan Beulich" <JBeulich@novell.com> wrote:

> Keir, George,
> 
> it in particular doesn't do what its title says: "Remove lock in
> ept_get_entry, ..." - the last two hunks are simply missing compared
> to -unstable c/s 22526 (I have no cluse how that happened).

The xen-unstable and xen-4.0-testing patches are merely plucked by me from
postings by George from the following xen-devel thread:

http://lists.xensource.com/archives/html/xen-devel/2010-12/msg00830.html

He owns this stuff.

 -- Keir

> Jan
> 

Re: 4.0-testing c/s 21405 incomplete?

[Jan Beulich]

>>> On 06.02.11 at 18:08, Keir Fraser <keir@xen.org> wrote:
> On 02/02/2011 10:04, "Jan Beulich" <JBeulich@novell.com> wrote:
> 
>> Keir, George,
>> 
>> it in particular doesn't do what its title says: "Remove lock in
>> ept_get_entry, ..." - the last two hunks are simply missing compared
>> to -unstable c/s 22526 (I have no cluse how that happened).
> 
> The xen-unstable and xen-4.0-testing patches are merely plucked by me from
> postings by George from the following xen-devel thread:
> 
> http://lists.xensource.com/archives/html/xen-devel/2010-12/msg00830.html 

Ah, okay - I think the patch there wasn't against 4.0-testing, but
against plain 4.0.x, so it's missing the revert of 4.0-testing c/s
21334.

Jan

Re: 4.0-testing c/s 21405 incomplete?

[George Dunlap]

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

On Mon, 2011-02-07 at 07:45 +0000, Jan Beulich wrote:
> > The xen-unstable and xen-4.0-testing patches are merely plucked by me from
> > postings by George from the following xen-devel thread:
> > 
> > http://lists.xensource.com/archives/html/xen-devel/2010-12/msg00830.html 
> 
> Ah, okay - I think the patch there wasn't against 4.0-testing, but
> against plain 4.0.x, so it's missing the revert of 4.0-testing c/s
> 21334.

Right -- I'm not exactly sure why that bit was left off my 4.0 patch,
but it certainly shouldn't have been.

Keir, can you please apply the attached patch to 4.0-testing.

 -George


[-- Attachment #2: xen-4.0-remove-ept-get-lock.diff --]
[-- Type: text/x-patch, Size: 553 bytes --]

diff -r f7f6fa8665e7 xen/arch/x86/mm/hap/p2m-ept.c
--- a/xen/arch/x86/mm/hap/p2m-ept.c	Thu Feb 03 11:56:05 2011 +0000
+++ b/xen/arch/x86/mm/hap/p2m-ept.c	Mon Feb 07 14:34:20 2011 +0000
@@ -395,10 +395,6 @@
     int i;
     int ret = 0;
     mfn_t mfn = _mfn(INVALID_MFN);
-    int do_locking = !p2m_locked_by_me(d->arch.p2m);
-
-    if ( do_locking )
-        p2m_lock(d->arch.p2m);
 
     *t = p2m_mmio_dm;
 
@@ -476,8 +472,6 @@
     }
 
 out:
-    if ( do_locking )
-        p2m_unlock(d->arch.p2m);
     unmap_domain_page(table);
     return mfn;
 }

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

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