diff options
Diffstat (limited to '0071-x86-altp2m-help-gcc13-to-avoid-it-emitting-a-warning.patch')
| -rw-r--r-- | 0071-x86-altp2m-help-gcc13-to-avoid-it-emitting-a-warning.patch | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/0071-x86-altp2m-help-gcc13-to-avoid-it-emitting-a-warning.patch b/0071-x86-altp2m-help-gcc13-to-avoid-it-emitting-a-warning.patch new file mode 100644 index 0000000..b33bd11 --- /dev/null +++ b/0071-x86-altp2m-help-gcc13-to-avoid-it-emitting-a-warning.patch @@ -0,0 +1,129 @@ +From d84612ecab00ab31c09a7c5a5892906edbacaf5b Mon Sep 17 00:00:00 2001 +From: Jan Beulich <jbeulich@suse.com> +Date: Tue, 21 Mar 2023 13:45:47 +0100 +Subject: [PATCH 71/89] x86/altp2m: help gcc13 to avoid it emitting a warning + +Switches of altp2m-s always expect a valid altp2m to be in place (and +indeed altp2m_vcpu_initialise() sets the active one to be at index 0). +The compiler, however, cannot know that, and hence it cannot eliminate +p2m_get_altp2m()'s case of returnin (literal) NULL. If then the compiler +decides to special case that code path in the caller, the dereference in +instances of + + atomic_dec(&p2m_get_altp2m(v)->active_vcpus); + +can, to the code generator, appear to be NULL dereferences, leading to + +In function 'atomic_dec', + inlined from '...' at ...: +./arch/x86/include/asm/atomic.h:182:5: error: array subscript 0 is outside array bounds of 'int[0]' [-Werror=array-bounds=] + +Aid the compiler by adding a BUG_ON() checking the return value of the +problematic p2m_get_altp2m(). Since with the use of the local variable +the 2nd p2m_get_altp2m() each will look questionable at the first glance +(Why is the local variable not used here?), open-code the only relevant +piece of p2m_get_altp2m() there. + +To avoid repeatedly doing these transformations, and also to limit how +"bad" the open-coding really is, convert the entire operation to an +inline helper, used by all three instances (and accepting the redundant +BUG_ON(idx >= MAX_ALTP2M) in two of the three cases). + +Reported-by: Charles Arnold <carnold@suse.com> +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> +master commit: be62b1fc2aa7375d553603fca07299da765a89fe +master date: 2023-03-13 15:16:21 +0100 +--- + xen/arch/x86/hvm/vmx/vmx.c | 8 +------- + xen/arch/x86/include/asm/p2m.h | 20 ++++++++++++++++++++ + xen/arch/x86/mm/p2m.c | 14 ++------------ + 3 files changed, 23 insertions(+), 19 deletions(-) + +diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c +index f0e759eeaf..a8fb4365ad 100644 +--- a/xen/arch/x86/hvm/vmx/vmx.c ++++ b/xen/arch/x86/hvm/vmx/vmx.c +@@ -4072,13 +4072,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) + } + } + +- if ( idx != vcpu_altp2m(v).p2midx ) +- { +- BUG_ON(idx >= MAX_ALTP2M); +- atomic_dec(&p2m_get_altp2m(v)->active_vcpus); +- vcpu_altp2m(v).p2midx = idx; +- atomic_inc(&p2m_get_altp2m(v)->active_vcpus); +- } ++ p2m_set_altp2m(v, idx); + } + + if ( unlikely(currd->arch.monitor.vmexit_enabled) ) +diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h +index bd684d02f3..cd43d8621a 100644 +--- a/xen/arch/x86/include/asm/p2m.h ++++ b/xen/arch/x86/include/asm/p2m.h +@@ -879,6 +879,26 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) + return v->domain->arch.altp2m_p2m[index]; + } + ++/* set current alternate p2m table */ ++static inline bool p2m_set_altp2m(struct vcpu *v, unsigned int idx) ++{ ++ struct p2m_domain *orig; ++ ++ BUG_ON(idx >= MAX_ALTP2M); ++ ++ if ( idx == vcpu_altp2m(v).p2midx ) ++ return false; ++ ++ orig = p2m_get_altp2m(v); ++ BUG_ON(!orig); ++ atomic_dec(&orig->active_vcpus); ++ ++ vcpu_altp2m(v).p2midx = idx; ++ atomic_inc(&v->domain->arch.altp2m_p2m[idx]->active_vcpus); ++ ++ return true; ++} ++ + /* Switch alternate p2m for a single vcpu */ + bool_t p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); + +diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c +index a405ee5fde..b28c899b5e 100644 +--- a/xen/arch/x86/mm/p2m.c ++++ b/xen/arch/x86/mm/p2m.c +@@ -1787,13 +1787,8 @@ bool_t p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) + + if ( d->arch.altp2m_eptp[idx] != mfn_x(INVALID_MFN) ) + { +- if ( idx != vcpu_altp2m(v).p2midx ) +- { +- atomic_dec(&p2m_get_altp2m(v)->active_vcpus); +- vcpu_altp2m(v).p2midx = idx; +- atomic_inc(&p2m_get_altp2m(v)->active_vcpus); ++ if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); +- } + rc = 1; + } + +@@ -2070,13 +2065,8 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) + if ( d->arch.altp2m_visible_eptp[idx] != mfn_x(INVALID_MFN) ) + { + for_each_vcpu( d, v ) +- if ( idx != vcpu_altp2m(v).p2midx ) +- { +- atomic_dec(&p2m_get_altp2m(v)->active_vcpus); +- vcpu_altp2m(v).p2midx = idx; +- atomic_inc(&p2m_get_altp2m(v)->active_vcpus); ++ if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); +- } + + rc = 0; + } +-- +2.40.0 + |