* [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
@ 2016-01-27 12:24 Corneliu ZUZU
2016-02-03 11:48 ` Ian Campbell
0 siblings, 1 reply; 8+ messages in thread
From: Corneliu ZUZU @ 2016-01-27 12:24 UTC (permalink / raw)
To: xen-devel; +Cc: Stefano Stabellini, Ian Campbell
When __p2m_get_mem_access gets called, the p2m lock is already taken
by either get_page_from_gva or p2m_get_mem_access.
Possible code paths:
1) -> get_page_from_gva
-> p2m_mem_access_check_and_get_page
-> __p2m_get_mem_access
2) -> p2m_get_mem_access
-> __p2m_get_mem_access
In both cases if __p2m_get_mem_access subsequently gets to
call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
hang will occur, since p2m_lookup also spin-locks on the p2m lock.
This bug-fix simply replaces the p2m_lookup call from __p2m_get_mem_access
with a call to __p2m_lookup.
Following Ian's suggestion, we also add an ASSERT to ensure that
the p2m lock is taken upon __p2m_get_mem_access entry.
Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
---
xen/arch/arm/p2m.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 2190908..e8e6db4 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -468,6 +468,8 @@ static int __p2m_get_mem_access(struct domain *d, gfn_t gfn,
#undef ACCESS
};
+ ASSERT(spin_is_locked(&p2m->lock));
+
/* If no setting was ever set, just return rwx. */
if ( !p2m->mem_access_enabled )
{
@@ -490,7 +492,7 @@ static int __p2m_get_mem_access(struct domain *d, gfn_t gfn,
* No setting was found in the Radix tree. Check if the
* entry exists in the page-tables.
*/
- paddr_t maddr = p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
+ paddr_t maddr = __p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
if ( INVALID_PADDR == maddr )
return -ESRCH;
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-01-27 12:24 [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access Corneliu ZUZU
@ 2016-02-03 11:48 ` Ian Campbell
2016-02-03 11:54 ` Corneliu ZUZU
0 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2016-02-03 11:48 UTC (permalink / raw)
To: Corneliu ZUZU, xen-devel; +Cc: Stefano Stabellini
On Wed, 2016-01-27 at 14:24 +0200, Corneliu ZUZU wrote:
> When __p2m_get_mem_access gets called, the p2m lock is already taken
> by either get_page_from_gva or p2m_get_mem_access.
>
> Possible code paths:
> 1) -> get_page_from_gva
> -> p2m_mem_access_check_and_get_page
> -> __p2m_get_mem_access
> 2) -> p2m_get_mem_access
> -> __p2m_get_mem_access
>
> In both cases if __p2m_get_mem_access subsequently gets to
> call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
> hang will occur, since p2m_lookup also spin-locks on the p2m lock.
>
> This bug-fix simply replaces the p2m_lookup call from
> __p2m_get_mem_access
> with a call to __p2m_lookup.
>
> Following Ian's suggestion, we also add an ASSERT to ensure that
> the p2m lock is taken upon __p2m_get_mem_access entry.
>
> Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
Acked + applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-02-03 11:48 ` Ian Campbell
@ 2016-02-03 11:54 ` Corneliu ZUZU
2016-02-03 12:23 ` Ian Campbell
0 siblings, 1 reply; 8+ messages in thread
From: Corneliu ZUZU @ 2016-02-03 11:54 UTC (permalink / raw)
To: Ian Campbell, xen-devel; +Cc: Stefano Stabellini
On 2/3/2016 1:48 PM, Ian Campbell wrote:
> On Wed, 2016-01-27 at 14:24 +0200, Corneliu ZUZU wrote:
>> When __p2m_get_mem_access gets called, the p2m lock is already taken
>> by either get_page_from_gva or p2m_get_mem_access.
>>
>> Possible code paths:
>> 1) -> get_page_from_gva
>> -> p2m_mem_access_check_and_get_page
>> -> __p2m_get_mem_access
>> 2) -> p2m_get_mem_access
>> -> __p2m_get_mem_access
>>
>> In both cases if __p2m_get_mem_access subsequently gets to
>> call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
>> hang will occur, since p2m_lookup also spin-locks on the p2m lock.
>>
>> This bug-fix simply replaces the p2m_lookup call from
>> __p2m_get_mem_access
>> with a call to __p2m_lookup.
>>
>> Following Ian's suggestion, we also add an ASSERT to ensure that
>> the p2m lock is taken upon __p2m_get_mem_access entry.
>>
>> Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
> Acked + applied, thanks.
>
>
I thought this mail was not sent properly (didn't find it any longer on
the web (?)) and I resent it just earlier.
I figured it must've been the fact that I forgot to put a "Changed since
v1" section & that I didn't include an
"--in-reply-to" option. Apparently it was actually sent correctly.
Sorry, ignore the last one (which contains a "Changed since v1" section).
Corneliu.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-02-03 11:54 ` Corneliu ZUZU
@ 2016-02-03 12:23 ` Ian Campbell
2016-02-03 12:28 ` Corneliu ZUZU
0 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2016-02-03 12:23 UTC (permalink / raw)
To: Corneliu ZUZU, xen-devel; +Cc: Stefano Stabellini
On Wed, 2016-02-03 at 13:54 +0200, Corneliu ZUZU wrote:
> On 2/3/2016 1:48 PM, Ian Campbell wrote:
> > On Wed, 2016-01-27 at 14:24 +0200, Corneliu ZUZU wrote:
> > > When __p2m_get_mem_access gets called, the p2m lock is already taken
> > > by either get_page_from_gva or p2m_get_mem_access.
> > >
> > > Possible code paths:
> > > 1) -> get_page_from_gva
> > > -> p2m_mem_access_check_and_get_page
> > > -> __p2m_get_mem_access
> > > 2) -> p2m_get_mem_access
> > > -> __p2m_get_mem_access
> > >
> > > In both cases if __p2m_get_mem_access subsequently gets to
> > > call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
> > > hang will occur, since p2m_lookup also spin-locks on the p2m lock.
> > >
> > > This bug-fix simply replaces the p2m_lookup call from
> > > __p2m_get_mem_access
> > > with a call to __p2m_lookup.
> > >
> > > Following Ian's suggestion, we also add an ASSERT to ensure that
> > > the p2m lock is taken upon __p2m_get_mem_access entry.
> > >
> > > Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
> > Acked + applied, thanks.
> >
> >
> I thought this mail was not sent properly (didn't find it any longer on
> the web (?)) and I resent it just earlier.
> I figured it must've been the fact that I forgot to put a "Changed since
> v1" section & that I didn't include an
> "--in-reply-to" option. Apparently it was actually sent correctly.
> Sorry, ignore the last one (which contains a "Changed since v1" section).
OK, please check that what is currently in xen.git#staging is what you
think should be there.
Ian.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-02-03 12:23 ` Ian Campbell
@ 2016-02-03 12:28 ` Corneliu ZUZU
0 siblings, 0 replies; 8+ messages in thread
From: Corneliu ZUZU @ 2016-02-03 12:28 UTC (permalink / raw)
To: Ian Campbell, xen-devel; +Cc: Stefano Stabellini
On 2/3/2016 2:23 PM, Ian Campbell wrote:
> On Wed, 2016-02-03 at 13:54 +0200, Corneliu ZUZU wrote:
>> I thought this mail was not sent properly (didn't find it any longer on
>> the web (?)) and I resent it just earlier.
>> I figured it must've been the fact that I forgot to put a "Changed since
>> v1" section & that I didn't include an
>> "--in-reply-to" option. Apparently it was actually sent correctly.
>> Sorry, ignore the last one (which contains a "Changed since v1" section).
> OK, please check that what is currently in xen.git#staging is what you
> think should be there.
>
> Ian.
Yep, just checked, the changes are there.
Corneliu.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-02-03 11:52 ` Ian Campbell
@ 2016-02-03 11:56 ` Corneliu ZUZU
0 siblings, 0 replies; 8+ messages in thread
From: Corneliu ZUZU @ 2016-02-03 11:56 UTC (permalink / raw)
To: xen-devel
On 2/3/2016 1:52 PM, Ian Campbell wrote:
> On Wed, 2016-02-03 at 13:37 +0200, Corneliu ZUZU wrote:
>
> I just now applied a previous v2 which was already in my queue. Was this
> just an accidental resend of v2 or is there some important change and this
> is really a v3?
>
>> When __p2m_get_mem_access gets called, the p2m lock is already taken
>> by either get_page_from_gva or p2m_get_mem_access.
>> Possible code paths:
>> 1) -> get_page_from_gva
>> -> p2m_mem_access_check_and_get_page
>> -> __p2m_get_mem_access
>> 2) -> p2m_get_mem_access
>> -> __p2m_get_mem_access
>>
>> In both cases if __p2m_get_mem_access subsequently gets to
>> call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
>> hang will occur, since p2m_lookup also spin-locks on the p2m lock.
>>
>> This bug-fix simply replaces the p2m_lookup call from
>> __p2m_get_mem_access
>> with a call to __p2m_lookup and also adds an ASSERT to ensure that the
>> p2m lock
>> is already taken upon __p2m_get_mem_access entry.
>>
>> Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
>>
>> ---
>> Changed since v1:
>> * added p2m-lock ASSERT
>> ---
>> xen/arch/arm/p2m.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
>> index 2190908..e8e6db4 100644
>> --- a/xen/arch/arm/p2m.c
>> +++ b/xen/arch/arm/p2m.c
>> @@ -468,6 +468,8 @@ static int __p2m_get_mem_access(struct domain *d,
>> gfn_t gfn,
>> #undef ACCESS
>> };
>>
>> + ASSERT(spin_is_locked(&p2m->lock));
>> +
>> /* If no setting was ever set, just return rwx. */
>> if ( !p2m->mem_access_enabled )
>> {
>> @@ -490,7 +492,7 @@ static int __p2m_get_mem_access(struct domain *d,
>> gfn_t gfn,
>> * No setting was found in the Radix tree. Check if the
>> * entry exists in the page-tables.
>> */
>> - paddr_t maddr = p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
>> + paddr_t maddr = __p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
>> if ( INVALID_PADDR == maddr )
>> return -ESRCH;
>>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
No, sorry, this is just a duplicate of the 1st v2, I thought the first
one was not sent properly (after waiting a few days and noticing
I was no longer finding it on the web).
Ignore this one. And thanks.
Corneliu.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-02-03 11:37 ` [PATCH v2] " Corneliu ZUZU
@ 2016-02-03 11:52 ` Ian Campbell
2016-02-03 11:56 ` Corneliu ZUZU
0 siblings, 1 reply; 8+ messages in thread
From: Ian Campbell @ 2016-02-03 11:52 UTC (permalink / raw)
To: Corneliu ZUZU, xen-devel; +Cc: Stefano Stabellini
On Wed, 2016-02-03 at 13:37 +0200, Corneliu ZUZU wrote:
I just now applied a previous v2 which was already in my queue. Was this
just an accidental resend of v2 or is there some important change and this
is really a v3?
> When __p2m_get_mem_access gets called, the p2m lock is already taken
> by either get_page_from_gva or p2m_get_mem_access.
> Possible code paths:
> 1) -> get_page_from_gva
> -> p2m_mem_access_check_and_get_page
> -> __p2m_get_mem_access
> 2) -> p2m_get_mem_access
> -> __p2m_get_mem_access
>
> In both cases if __p2m_get_mem_access subsequently gets to
> call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
> hang will occur, since p2m_lookup also spin-locks on the p2m lock.
>
> This bug-fix simply replaces the p2m_lookup call from
> __p2m_get_mem_access
> with a call to __p2m_lookup and also adds an ASSERT to ensure that the
> p2m lock
> is already taken upon __p2m_get_mem_access entry.
>
> Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
>
> ---
> Changed since v1:
> * added p2m-lock ASSERT
> ---
> xen/arch/arm/p2m.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 2190908..e8e6db4 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -468,6 +468,8 @@ static int __p2m_get_mem_access(struct domain *d,
> gfn_t gfn,
> #undef ACCESS
> };
>
> + ASSERT(spin_is_locked(&p2m->lock));
> +
> /* If no setting was ever set, just return rwx. */
> if ( !p2m->mem_access_enabled )
> {
> @@ -490,7 +492,7 @@ static int __p2m_get_mem_access(struct domain *d,
> gfn_t gfn,
> * No setting was found in the Radix tree. Check if the
> * entry exists in the page-tables.
> */
> - paddr_t maddr = p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
> + paddr_t maddr = __p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
> if ( INVALID_PADDR == maddr )
> return -ESRCH;
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
2016-01-26 11:46 [PATCH] " Corneliu ZUZU
@ 2016-02-03 11:37 ` Corneliu ZUZU
2016-02-03 11:52 ` Ian Campbell
0 siblings, 1 reply; 8+ messages in thread
From: Corneliu ZUZU @ 2016-02-03 11:37 UTC (permalink / raw)
To: xen-devel; +Cc: Stefano Stabellini, Ian Campbell
When __p2m_get_mem_access gets called, the p2m lock is already taken
by either get_page_from_gva or p2m_get_mem_access.
Possible code paths:
1) -> get_page_from_gva
-> p2m_mem_access_check_and_get_page
-> __p2m_get_mem_access
2) -> p2m_get_mem_access
-> __p2m_get_mem_access
In both cases if __p2m_get_mem_access subsequently gets to
call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
hang will occur, since p2m_lookup also spin-locks on the p2m lock.
This bug-fix simply replaces the p2m_lookup call from __p2m_get_mem_access
with a call to __p2m_lookup and also adds an ASSERT to ensure that the p2m lock
is already taken upon __p2m_get_mem_access entry.
Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
---
Changed since v1:
* added p2m-lock ASSERT
---
xen/arch/arm/p2m.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 2190908..e8e6db4 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -468,6 +468,8 @@ static int __p2m_get_mem_access(struct domain *d, gfn_t gfn,
#undef ACCESS
};
+ ASSERT(spin_is_locked(&p2m->lock));
+
/* If no setting was ever set, just return rwx. */
if ( !p2m->mem_access_enabled )
{
@@ -490,7 +492,7 @@ static int __p2m_get_mem_access(struct domain *d, gfn_t gfn,
* No setting was found in the Radix tree. Check if the
* entry exists in the page-tables.
*/
- paddr_t maddr = p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
+ paddr_t maddr = __p2m_lookup(d, gfn_x(gfn) << PAGE_SHIFT, NULL);
if ( INVALID_PADDR == maddr )
return -ESRCH;
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-02-03 12:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-27 12:24 [PATCH V2] arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access Corneliu ZUZU
2016-02-03 11:48 ` Ian Campbell
2016-02-03 11:54 ` Corneliu ZUZU
2016-02-03 12:23 ` Ian Campbell
2016-02-03 12:28 ` Corneliu ZUZU
-- strict thread matches above, loose matches on Subject: below --
2016-01-26 11:46 [PATCH] " Corneliu ZUZU
2016-02-03 11:37 ` [PATCH v2] " Corneliu ZUZU
2016-02-03 11:52 ` Ian Campbell
2016-02-03 11:56 ` Corneliu ZUZU
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.