xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm/shadow: fix declaration of fetch_type_names
@ 2017-10-17 10:23 Roger Pau Monne
  2017-10-17 10:25 ` Roger Pau Monné
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Roger Pau Monne @ 2017-10-17 10:23 UTC (permalink / raw)
  To: xen-devel
  Cc: George Dunlap, Andrew Cooper, Tim Deegan, Julien Grall,
	Jan Beulich, Roger Pau Monne

fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
SHADOW_DEBUG, fix the declaration so it's also guarded by
SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Tim Deegan <tim@xen.org>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Julien Grall <julien.grall@citrix.com>
---
IMHO, this is a simple compile-time fix, so it should be accepted for
4.10. Any breaking caused by this commit will be spotted at compile
time.
---
 xen/arch/x86/mm/shadow/multi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index d540af11d7..9156382056 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -77,7 +77,7 @@ typedef enum {
 
 extern const char *const fetch_type_names[];
 
-#if defined(DEBUG_TRACE_DUMP) && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
+#if SHADOW_DEBUG_PROPAGATE && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
 const char *const fetch_type_names[] = {
     [ft_prefetch]     = "prefetch",
     [ft_demand_read]  = "demand read",
-- 
2.13.5 (Apple Git-94)


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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shadow: fix declaration of fetch_type_names
  2017-10-17 10:23 [PATCH] mm/shadow: fix declaration of fetch_type_names Roger Pau Monne
@ 2017-10-17 10:25 ` Roger Pau Monné
  2017-10-17 10:29 ` Andrew Cooper
  2017-10-17 13:39 ` Tim Deegan
  2 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monné @ 2017-10-17 10:25 UTC (permalink / raw)
  To: Roger Pau Monne
  Cc: George Dunlap, Andrew Cooper, Tim Deegan, Julien Grall,
	Jan Beulich, xen-devel

Fix Julien Grall address, sorry.

On Tue, Oct 17, 2017 at 11:23:53AM +0100, Roger Pau Monne wrote:
> fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
> SHADOW_DEBUG, fix the declaration so it's also guarded by
> SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Tim Deegan <tim@xen.org>
> Cc: George Dunlap <george.dunlap@eu.citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Julien Grall <julien.grall@citrix.com>
> ---
> IMHO, this is a simple compile-time fix, so it should be accepted for
> 4.10. Any breaking caused by this commit will be spotted at compile
> time.
> ---
>  xen/arch/x86/mm/shadow/multi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
> index d540af11d7..9156382056 100644
> --- a/xen/arch/x86/mm/shadow/multi.c
> +++ b/xen/arch/x86/mm/shadow/multi.c
> @@ -77,7 +77,7 @@ typedef enum {
>  
>  extern const char *const fetch_type_names[];
>  
> -#if defined(DEBUG_TRACE_DUMP) && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
> +#if SHADOW_DEBUG_PROPAGATE && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
>  const char *const fetch_type_names[] = {
>      [ft_prefetch]     = "prefetch",
>      [ft_demand_read]  = "demand read",
> -- 
> 2.13.5 (Apple Git-94)
> 

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shadow: fix declaration of fetch_type_names
  2017-10-17 10:23 [PATCH] mm/shadow: fix declaration of fetch_type_names Roger Pau Monne
  2017-10-17 10:25 ` Roger Pau Monné
@ 2017-10-17 10:29 ` Andrew Cooper
  2017-10-17 10:49   ` Roger Pau Monné
  2017-10-17 13:15   ` Julien Grall
  2017-10-17 13:39 ` Tim Deegan
  2 siblings, 2 replies; 6+ messages in thread
From: Andrew Cooper @ 2017-10-17 10:29 UTC (permalink / raw)
  To: Roger Pau Monne, xen-devel
  Cc: George Dunlap, Julien Grall, Tim Deegan, Jan Beulich

On 17/10/17 11:23, Roger Pau Monne wrote:
> fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
> SHADOW_DEBUG, fix the declaration so it's also guarded by
> SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Possibly worth noting that this is exposed by Clang when building with
UBSAN ?

Either way, thanks for getting to the bottom of this issue.  (It's been
on my TODO list to figure out for a rather long time.)

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>, and I agree that
this should go into 4.10.

> ---
> Cc: Tim Deegan <tim@xen.org>
> Cc: George Dunlap <george.dunlap@eu.citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Julien Grall <julien.grall@citrix.com>
> ---
> IMHO, this is a simple compile-time fix, so it should be accepted for
> 4.10. Any breaking caused by this commit will be spotted at compile
> time.
> ---
>  xen/arch/x86/mm/shadow/multi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
> index d540af11d7..9156382056 100644
> --- a/xen/arch/x86/mm/shadow/multi.c
> +++ b/xen/arch/x86/mm/shadow/multi.c
> @@ -77,7 +77,7 @@ typedef enum {
>  
>  extern const char *const fetch_type_names[];
>  
> -#if defined(DEBUG_TRACE_DUMP) && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
> +#if SHADOW_DEBUG_PROPAGATE && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
>  const char *const fetch_type_names[] = {
>      [ft_prefetch]     = "prefetch",
>      [ft_demand_read]  = "demand read",


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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shadow: fix declaration of fetch_type_names
  2017-10-17 10:29 ` Andrew Cooper
@ 2017-10-17 10:49   ` Roger Pau Monné
  2017-10-17 13:15   ` Julien Grall
  1 sibling, 0 replies; 6+ messages in thread
From: Roger Pau Monné @ 2017-10-17 10:49 UTC (permalink / raw)
  To: Andrew Cooper
  Cc: George Dunlap, xen-devel, Julien Grall, Tim Deegan, Jan Beulich

On Tue, Oct 17, 2017 at 11:29:14AM +0100, Andrew Cooper wrote:
> On 17/10/17 11:23, Roger Pau Monne wrote:
> > fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
> > SHADOW_DEBUG, fix the declaration so it's also guarded by
> > SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Possibly worth noting that this is exposed by Clang when building with
> UBSAN ?

Yes, I hope this can be done upon commit if there are no further
changes required. I would add:

"Noted while building with clang and ubsan enabled"

Thanks, Roger.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shadow: fix declaration of fetch_type_names
  2017-10-17 10:29 ` Andrew Cooper
  2017-10-17 10:49   ` Roger Pau Monné
@ 2017-10-17 13:15   ` Julien Grall
  1 sibling, 0 replies; 6+ messages in thread
From: Julien Grall @ 2017-10-17 13:15 UTC (permalink / raw)
  To: Andrew Cooper, Roger Pau Monne, xen-devel
  Cc: George Dunlap, Julien Grall, Tim Deegan, Jan Beulich

Hi,

On 17/10/17 11:29, Andrew Cooper wrote:
> On 17/10/17 11:23, Roger Pau Monne wrote:
>> fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
>> SHADOW_DEBUG, fix the declaration so it's also guarded by
>> SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.
>>
>> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Possibly worth noting that this is exposed by Clang when building with
> UBSAN ?
> 
> Either way, thanks for getting to the bottom of this issue.  (It's been
> on my TODO list to figure out for a rather long time.)
> 
> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>, and I agree that
> this should go into 4.10.

Release-acked-by: Julien Grall <julien.grall@linaro.org>

Cheers,

> 
>> ---
>> Cc: Tim Deegan <tim@xen.org>
>> Cc: George Dunlap <george.dunlap@eu.citrix.com>
>> Cc: Jan Beulich <jbeulich@suse.com>
>> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
>> Cc: Julien Grall <julien.grall@citrix.com>
>> ---
>> IMHO, this is a simple compile-time fix, so it should be accepted for
>> 4.10. Any breaking caused by this commit will be spotted at compile
>> time.
>> ---
>>   xen/arch/x86/mm/shadow/multi.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
>> index d540af11d7..9156382056 100644
>> --- a/xen/arch/x86/mm/shadow/multi.c
>> +++ b/xen/arch/x86/mm/shadow/multi.c
>> @@ -77,7 +77,7 @@ typedef enum {
>>   
>>   extern const char *const fetch_type_names[];
>>   
>> -#if defined(DEBUG_TRACE_DUMP) && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
>> +#if SHADOW_DEBUG_PROPAGATE && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
>>   const char *const fetch_type_names[] = {
>>       [ft_prefetch]     = "prefetch",
>>       [ft_demand_read]  = "demand read",
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel
> 

-- 
Julien Grall

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mm/shadow: fix declaration of fetch_type_names
  2017-10-17 10:23 [PATCH] mm/shadow: fix declaration of fetch_type_names Roger Pau Monne
  2017-10-17 10:25 ` Roger Pau Monné
  2017-10-17 10:29 ` Andrew Cooper
@ 2017-10-17 13:39 ` Tim Deegan
  2 siblings, 0 replies; 6+ messages in thread
From: Tim Deegan @ 2017-10-17 13:39 UTC (permalink / raw)
  To: Roger Pau Monne
  Cc: George Dunlap, xen-devel, Julien Grall, Jan Beulich,
	Andrew Cooper

At 11:23 +0100 on 17 Oct (1508239433), Roger Pau Monne wrote:
> fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
> SHADOW_DEBUG, fix the declaration so it's also guarded by
> SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Acked-by: Tim Deegan <tim@xen.org>

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-10-17 13:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 10:23 [PATCH] mm/shadow: fix declaration of fetch_type_names Roger Pau Monne
2017-10-17 10:25 ` Roger Pau Monné
2017-10-17 10:29 ` Andrew Cooper
2017-10-17 10:49   ` Roger Pau Monné
2017-10-17 13:15   ` Julien Grall
2017-10-17 13:39 ` Tim Deegan

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).