Message ID | 20171017102353.31241-1-roger.pau@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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) >
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",
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.
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 >
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>
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",
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(-)