| Message ID | 357a35c3035d0f8659a64d767791bc41d57494d3.1696232393.git.nicola.vetrini@bugseng.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix or deviate various instances of missing declarations | expand |
On Mon, Oct 02, 2023 at 09:49:44AM +0200, Nicola Vetrini wrote: > Some variables with external linkage used in C code do not have > a visible declaration where they are defined. Providing such > declaration also resolves violations of MISRA C:2012 Rule 8.4. > > Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com> > --- > xen/arch/arm/include/asm/setup.h | 3 +++ > xen/arch/arm/include/asm/smp.h | 3 +++ > xen/arch/x86/cpu/mcheck/mce.c | 6 +++--- > xen/arch/x86/include/asm/setup.h | 3 +++ > xen/arch/x86/irq.c | 2 +- > xen/arch/x86/platform_hypercall.c | 3 --- > xen/common/symbols.c | 17 ----------------- > xen/include/xen/hypercall.h | 3 +++ > xen/include/xen/symbols.h | 18 ++++++++++++++++++ > 9 files changed, 34 insertions(+), 24 deletions(-) > > diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h > index b8866c20f462..8806a74b216d 100644 > --- a/xen/arch/arm/include/asm/setup.h > +++ b/xen/arch/arm/include/asm/setup.h > @@ -183,9 +183,12 @@ int map_range_to_domain(const struct dt_device_node *dev, > extern lpae_t boot_pgtable[XEN_PT_LPAE_ENTRIES]; > > #ifdef CONFIG_ARM_64 > +extern lpae_t boot_first[XEN_PT_LPAE_ENTRIES]; > extern lpae_t boot_first_id[XEN_PT_LPAE_ENTRIES]; > #endif > +extern lpae_t boot_second[XEN_PT_LPAE_ENTRIES]; > extern lpae_t boot_second_id[XEN_PT_LPAE_ENTRIES]; > +extern lpae_t boot_third[XEN_PT_LPAE_ENTRIES * XEN_NR_ENTRIES(2)]; > extern lpae_t boot_third_id[XEN_PT_LPAE_ENTRIES]; > > /* Find where Xen will be residing at runtime and return a PT entry */ > diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h > index 4fabdf5310d8..28bf24a01d95 100644 > --- a/xen/arch/arm/include/asm/smp.h > +++ b/xen/arch/arm/include/asm/smp.h > @@ -6,6 +6,9 @@ > #include <asm/current.h> > #endif > > +extern struct init_info init_data; > +extern unsigned long smp_up_cpu; > + > DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); > DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); > > diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c > index 6141b7eb9cf1..e855f958030d 100644 > --- a/xen/arch/x86/cpu/mcheck/mce.c > +++ b/xen/arch/x86/cpu/mcheck/mce.c > @@ -1682,13 +1682,13 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) > return ret; > } > > -int mcinfo_dumpped; > +static int mcinfo_dumped; > static int cf_check x86_mcinfo_dump_panic(mctelem_cookie_t mctc) > { > struct mc_info *mcip = mctelem_dataptr(mctc); > > x86_mcinfo_dump(mcip); > - mcinfo_dumpped++; > + mcinfo_dumped++; > > return 0; > } > @@ -1702,7 +1702,7 @@ static void mc_panic_dump(void) > for_each_online_cpu(cpu) > mctelem_process_deferred(cpu, x86_mcinfo_dump_panic, > mctelem_has_deferred_lmce(cpu)); > - dprintk(XENLOG_ERR, "End dump mc_info, %x mcinfo dumped\n", mcinfo_dumpped); > + dprintk(XENLOG_ERR, "End dump mc_info, %x mcinfo dumped\n", mcinfo_dumped); > } > > void mc_panic(const char *s) > diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h > index dfdd9e555149..3c27fe915ed4 100644 > --- a/xen/arch/x86/include/asm/setup.h > +++ b/xen/arch/x86/include/asm/setup.h > @@ -13,8 +13,11 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; > extern unsigned long xenheap_initial_phys_start; > extern uint64_t boot_tsc_stamp; > > +extern char cpu0_stack[STACK_SIZE]; > extern void *stack_start; > > +extern unsigned long cr4_pv32_mask; This one might better go in compat.h, albeit that would require it's setting to be gated to CONFIG_PV32. setup.h is IMO for init time stuff. > + > void early_cpu_init(void); > void early_time_init(void); > > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c > index 6abfd8162120..604dba94b052 100644 > --- a/xen/arch/x86/irq.c > +++ b/xen/arch/x86/irq.c > @@ -43,7 +43,7 @@ int __read_mostly opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_DEFAULT; > static unsigned char __read_mostly irq_max_guests; > integer_param("irq-max-guests", irq_max_guests); > > -vmask_t global_used_vector_map; > +static vmask_t global_used_vector_map; > > struct irq_desc __read_mostly *irq_desc = NULL; > > diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c > index 9469de9045c7..e4dbec73d784 100644 > --- a/xen/arch/x86/platform_hypercall.c > +++ b/xen/arch/x86/platform_hypercall.c > @@ -36,9 +36,6 @@ > #include "cpu/mtrr/mtrr.h" > #include <xsm/xsm.h> > > -/* Declarations for items shared with the compat mode handler. */ > -extern spinlock_t xenpf_lock; > - > #define RESOURCE_ACCESS_MAX_ENTRIES 3 > struct resource_access { > unsigned int nr_done; > diff --git a/xen/common/symbols.c b/xen/common/symbols.c > index 691e61792506..7c3514c65f2e 100644 > --- a/xen/common/symbols.c > +++ b/xen/common/symbols.c > @@ -21,23 +21,6 @@ > #include <xen/guest_access.h> > #include <xen/errno.h> > > -#ifdef SYMBOLS_ORIGIN > -extern const unsigned int symbols_offsets[]; > -#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) > -#else > -extern const unsigned long symbols_addresses[]; > -#define symbols_address(n) symbols_addresses[n] > -#endif > -extern const unsigned int symbols_num_syms; > -extern const u8 symbols_names[]; > - > -extern const struct symbol_offset symbols_sorted_offsets[]; > - > -extern const u8 symbols_token_table[]; > -extern const u16 symbols_token_index[]; > - > -extern const unsigned int symbols_markers[]; > - > /* expand a compressed symbol data into the resulting uncompressed string, > given the offset to where the symbol is in the compressed stream */ > static unsigned int symbols_expand_symbol(unsigned int off, char *result) > diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h > index f307dfb59760..12de5a69b5b1 100644 > --- a/xen/include/xen/hypercall.h > +++ b/xen/include/xen/hypercall.h > @@ -24,6 +24,9 @@ > /* Needs to be after asm/hypercall.h. */ > #include <xen/hypercall-defs.h> > > +/* Declarations for items shared with the compat mode handler. */ > +extern spinlock_t xenpf_lock; I'm confused about why this needs to be moved, AFAICT xenpf_lock is only used in platform_hypercall.c, and the declaration is unconditional, so there's no definition without declaration issue. > + > extern long > arch_do_domctl( > struct xen_domctl *domctl, struct domain *d, > diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h > index 20bbb28ef226..92540409265e 100644 > --- a/xen/include/xen/symbols.h > +++ b/xen/include/xen/symbols.h > @@ -33,4 +33,22 @@ struct symbol_offset { > uint32_t stream; /* .. in the compressed stream.*/ > uint32_t addr; /* .. and in the fixed size address array. */ > }; > + > +#ifdef SYMBOLS_ORIGIN > +extern const unsigned int symbols_offsets[]; > +#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) > +#else > +extern const unsigned long symbols_addresses[]; > +#define symbols_address(n) symbols_addresses[n] > +#endif > +extern const unsigned int symbols_num_syms; > +extern const u8 symbols_names[]; > + > +extern const struct symbol_offset symbols_sorted_offsets[]; > + > +extern const u8 symbols_token_table[]; > +extern const u16 symbols_token_index[]; > + > +extern const unsigned int symbols_markers[]; > + > #endif /*_XEN_SYMBOLS_H*/ This one is ugly, but I can't see a better way immediately. Thanks, Roger.
On 02/10/2023 13:07, Roger Pau Monné wrote: > On Mon, Oct 02, 2023 at 09:49:44AM +0200, Nicola Vetrini wrote: >> Some variables with external linkage used in C code do not have >> a visible declaration where they are defined. Providing such >> declaration also resolves violations of MISRA C:2012 Rule 8.4. >> >> Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com> >> --- >> xen/arch/arm/include/asm/setup.h | 3 +++ >> xen/arch/arm/include/asm/smp.h | 3 +++ >> xen/arch/x86/cpu/mcheck/mce.c | 6 +++--- >> xen/arch/x86/include/asm/setup.h | 3 +++ >> xen/arch/x86/irq.c | 2 +- >> xen/arch/x86/platform_hypercall.c | 3 --- >> xen/common/symbols.c | 17 ----------------- >> xen/include/xen/hypercall.h | 3 +++ >> xen/include/xen/symbols.h | 18 ++++++++++++++++++ >> 9 files changed, 34 insertions(+), 24 deletions(-) >> >> diff --git a/xen/arch/x86/include/asm/setup.h >> b/xen/arch/x86/include/asm/setup.h >> index dfdd9e555149..3c27fe915ed4 100644 >> --- a/xen/arch/x86/include/asm/setup.h >> +++ b/xen/arch/x86/include/asm/setup.h >> @@ -13,8 +13,11 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; >> extern unsigned long xenheap_initial_phys_start; >> extern uint64_t boot_tsc_stamp; >> >> +extern char cpu0_stack[STACK_SIZE]; >> extern void *stack_start; >> >> +extern unsigned long cr4_pv32_mask; > > This one might better go in compat.h, albeit that would require it's > setting to be gated to CONFIG_PV32. setup.h is IMO for init time > stuff. > Ok >> + >> void early_cpu_init(void); >> void early_time_init(void); >> >> diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c >> index 6abfd8162120..604dba94b052 100644 >> --- a/xen/arch/x86/irq.c >> +++ b/xen/arch/x86/irq.c >> @@ -43,7 +43,7 @@ int __read_mostly opt_irq_vector_map = >> OPT_IRQ_VECTOR_MAP_DEFAULT; >> static unsigned char __read_mostly irq_max_guests; >> integer_param("irq-max-guests", irq_max_guests); >> >> -vmask_t global_used_vector_map; >> +static vmask_t global_used_vector_map; >> >> struct irq_desc __read_mostly *irq_desc = NULL; >> >> diff --git a/xen/arch/x86/platform_hypercall.c >> b/xen/arch/x86/platform_hypercall.c >> index 9469de9045c7..e4dbec73d784 100644 >> --- a/xen/arch/x86/platform_hypercall.c >> +++ b/xen/arch/x86/platform_hypercall.c >> @@ -36,9 +36,6 @@ >> #include "cpu/mtrr/mtrr.h" >> #include <xsm/xsm.h> >> >> -/* Declarations for items shared with the compat mode handler. */ >> -extern spinlock_t xenpf_lock; >> - >> #define RESOURCE_ACCESS_MAX_ENTRIES 3 >> struct resource_access { >> unsigned int nr_done; >> diff --git a/xen/common/symbols.c b/xen/common/symbols.c >> index 691e61792506..7c3514c65f2e 100644 >> --- a/xen/common/symbols.c >> +++ b/xen/common/symbols.c >> @@ -21,23 +21,6 @@ >> #include <xen/guest_access.h> >> #include <xen/errno.h> >> >> -#ifdef SYMBOLS_ORIGIN >> -extern const unsigned int symbols_offsets[]; >> -#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) >> -#else >> -extern const unsigned long symbols_addresses[]; >> -#define symbols_address(n) symbols_addresses[n] >> -#endif >> -extern const unsigned int symbols_num_syms; >> -extern const u8 symbols_names[]; >> - >> -extern const struct symbol_offset symbols_sorted_offsets[]; >> - >> -extern const u8 symbols_token_table[]; >> -extern const u16 symbols_token_index[]; >> - >> -extern const unsigned int symbols_markers[]; >> - >> /* expand a compressed symbol data into the resulting uncompressed >> string, >> given the offset to where the symbol is in the compressed stream >> */ >> static unsigned int symbols_expand_symbol(unsigned int off, char >> *result) >> diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h >> index f307dfb59760..12de5a69b5b1 100644 >> --- a/xen/include/xen/hypercall.h >> +++ b/xen/include/xen/hypercall.h >> @@ -24,6 +24,9 @@ >> /* Needs to be after asm/hypercall.h. */ >> #include <xen/hypercall-defs.h> >> >> +/* Declarations for items shared with the compat mode handler. */ >> +extern spinlock_t xenpf_lock; > > I'm confused about why this needs to be moved, AFAICT xenpf_lock is > only used in platform_hypercall.c, and the declaration is > unconditional, so there's no definition without declaration issue. > The violation was on ARM code, because of a slight inconsistency: xen/arch/arm/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); xen/arch/x86/platform_hypercall.c:extern spinlock_t xenpf_lock; xen/arch/x86/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); therefore, by moving the extern declaration to the common header there should be no issue. >> + >> extern long >> arch_do_domctl( >> struct xen_domctl *domctl, struct domain *d, >> diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h >> index 20bbb28ef226..92540409265e 100644 >> --- a/xen/include/xen/symbols.h >> +++ b/xen/include/xen/symbols.h >> @@ -33,4 +33,22 @@ struct symbol_offset { >> uint32_t stream; /* .. in the compressed stream.*/ >> uint32_t addr; /* .. and in the fixed size address array. */ >> }; >> + >> +#ifdef SYMBOLS_ORIGIN >> +extern const unsigned int symbols_offsets[]; >> +#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) >> +#else >> +extern const unsigned long symbols_addresses[]; >> +#define symbols_address(n) symbols_addresses[n] >> +#endif >> +extern const unsigned int symbols_num_syms; >> +extern const u8 symbols_names[]; >> + >> +extern const struct symbol_offset symbols_sorted_offsets[]; >> + >> +extern const u8 symbols_token_table[]; >> +extern const u16 symbols_token_index[]; >> + >> +extern const unsigned int symbols_markers[]; >> + >> #endif /*_XEN_SYMBOLS_H*/ > > This one is ugly, but I can't see a better way immediately. > > Thanks, Roger.
On Tue, Oct 03, 2023 at 09:05:34AM +0200, Nicola Vetrini wrote: > On 02/10/2023 13:07, Roger Pau Monné wrote: > > On Mon, Oct 02, 2023 at 09:49:44AM +0200, Nicola Vetrini wrote: > > > Some variables with external linkage used in C code do not have > > > a visible declaration where they are defined. Providing such > > > declaration also resolves violations of MISRA C:2012 Rule 8.4. > > > > > > Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com> > > > --- > > > xen/arch/arm/include/asm/setup.h | 3 +++ > > > xen/arch/arm/include/asm/smp.h | 3 +++ > > > xen/arch/x86/cpu/mcheck/mce.c | 6 +++--- > > > xen/arch/x86/include/asm/setup.h | 3 +++ > > > xen/arch/x86/irq.c | 2 +- > > > xen/arch/x86/platform_hypercall.c | 3 --- > > > xen/common/symbols.c | 17 ----------------- > > > xen/include/xen/hypercall.h | 3 +++ > > > xen/include/xen/symbols.h | 18 ++++++++++++++++++ > > > 9 files changed, 34 insertions(+), 24 deletions(-) > > > > > > > diff --git a/xen/arch/x86/include/asm/setup.h > > > b/xen/arch/x86/include/asm/setup.h > > > index dfdd9e555149..3c27fe915ed4 100644 > > > --- a/xen/arch/x86/include/asm/setup.h > > > +++ b/xen/arch/x86/include/asm/setup.h > > > @@ -13,8 +13,11 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; > > > extern unsigned long xenheap_initial_phys_start; > > > extern uint64_t boot_tsc_stamp; > > > > > > +extern char cpu0_stack[STACK_SIZE]; > > > extern void *stack_start; > > > > > > +extern unsigned long cr4_pv32_mask; > > > > This one might better go in compat.h, albeit that would require it's > > setting to be gated to CONFIG_PV32. setup.h is IMO for init time > > stuff. > > > > Ok > > > > + > > > void early_cpu_init(void); > > > void early_time_init(void); > > > > > > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c > > > index 6abfd8162120..604dba94b052 100644 > > > --- a/xen/arch/x86/irq.c > > > +++ b/xen/arch/x86/irq.c > > > @@ -43,7 +43,7 @@ int __read_mostly opt_irq_vector_map = > > > OPT_IRQ_VECTOR_MAP_DEFAULT; > > > static unsigned char __read_mostly irq_max_guests; > > > integer_param("irq-max-guests", irq_max_guests); > > > > > > -vmask_t global_used_vector_map; > > > +static vmask_t global_used_vector_map; > > > > > > struct irq_desc __read_mostly *irq_desc = NULL; > > > > > > diff --git a/xen/arch/x86/platform_hypercall.c > > > b/xen/arch/x86/platform_hypercall.c > > > index 9469de9045c7..e4dbec73d784 100644 > > > --- a/xen/arch/x86/platform_hypercall.c > > > +++ b/xen/arch/x86/platform_hypercall.c > > > @@ -36,9 +36,6 @@ > > > #include "cpu/mtrr/mtrr.h" > > > #include <xsm/xsm.h> > > > > > > -/* Declarations for items shared with the compat mode handler. */ > > > -extern spinlock_t xenpf_lock; > > > - > > > #define RESOURCE_ACCESS_MAX_ENTRIES 3 > > > struct resource_access { > > > unsigned int nr_done; > > > diff --git a/xen/common/symbols.c b/xen/common/symbols.c > > > index 691e61792506..7c3514c65f2e 100644 > > > --- a/xen/common/symbols.c > > > +++ b/xen/common/symbols.c > > > @@ -21,23 +21,6 @@ > > > #include <xen/guest_access.h> > > > #include <xen/errno.h> > > > > > > -#ifdef SYMBOLS_ORIGIN > > > -extern const unsigned int symbols_offsets[]; > > > -#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) > > > -#else > > > -extern const unsigned long symbols_addresses[]; > > > -#define symbols_address(n) symbols_addresses[n] > > > -#endif > > > -extern const unsigned int symbols_num_syms; > > > -extern const u8 symbols_names[]; > > > - > > > -extern const struct symbol_offset symbols_sorted_offsets[]; > > > - > > > -extern const u8 symbols_token_table[]; > > > -extern const u16 symbols_token_index[]; > > > - > > > -extern const unsigned int symbols_markers[]; > > > - > > > /* expand a compressed symbol data into the resulting uncompressed > > > string, > > > given the offset to where the symbol is in the compressed stream > > > */ > > > static unsigned int symbols_expand_symbol(unsigned int off, char > > > *result) > > > diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h > > > index f307dfb59760..12de5a69b5b1 100644 > > > --- a/xen/include/xen/hypercall.h > > > +++ b/xen/include/xen/hypercall.h > > > @@ -24,6 +24,9 @@ > > > /* Needs to be after asm/hypercall.h. */ > > > #include <xen/hypercall-defs.h> > > > > > > +/* Declarations for items shared with the compat mode handler. */ > > > +extern spinlock_t xenpf_lock; > > > > I'm confused about why this needs to be moved, AFAICT xenpf_lock is > > only used in platform_hypercall.c, and the declaration is > > unconditional, so there's no definition without declaration issue. > > > > The violation was on ARM code, because of a slight inconsistency: > xen/arch/arm/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); > > xen/arch/x86/platform_hypercall.c:extern spinlock_t xenpf_lock; > xen/arch/x86/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); > > therefore, by moving the extern declaration to the common header there > should be no issue. Just make xenpf_lock static on arm, that would be a better solution. The only need for the lock to be global is because of compat code, and arm doesn't seem to need it. Thanks, Roger.
On 03/10/2023 09:18, Roger Pau Monné wrote: > On Tue, Oct 03, 2023 at 09:05:34AM +0200, Nicola Vetrini wrote: >> On 02/10/2023 13:07, Roger Pau Monné wrote: >> > On Mon, Oct 02, 2023 at 09:49:44AM +0200, Nicola Vetrini wrote: >> > > Some variables with external linkage used in C code do not have >> > > a visible declaration where they are defined. Providing such >> > > declaration also resolves violations of MISRA C:2012 Rule 8.4. >> > > >> > > Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com> >> > > --- >> > > xen/arch/arm/include/asm/setup.h | 3 +++ >> > > xen/arch/arm/include/asm/smp.h | 3 +++ >> > > xen/arch/x86/cpu/mcheck/mce.c | 6 +++--- >> > > xen/arch/x86/include/asm/setup.h | 3 +++ >> > > xen/arch/x86/irq.c | 2 +- >> > > xen/arch/x86/platform_hypercall.c | 3 --- >> > > xen/common/symbols.c | 17 ----------------- >> > > xen/include/xen/hypercall.h | 3 +++ >> > > xen/include/xen/symbols.h | 18 ++++++++++++++++++ >> > > 9 files changed, 34 insertions(+), 24 deletions(-) >> > > >> > > diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h >> > > index f307dfb59760..12de5a69b5b1 100644 >> > > --- a/xen/include/xen/hypercall.h >> > > +++ b/xen/include/xen/hypercall.h >> > > @@ -24,6 +24,9 @@ >> > > /* Needs to be after asm/hypercall.h. */ >> > > #include <xen/hypercall-defs.h> >> > > >> > > +/* Declarations for items shared with the compat mode handler. */ >> > > +extern spinlock_t xenpf_lock; >> > >> > I'm confused about why this needs to be moved, AFAICT xenpf_lock is >> > only used in platform_hypercall.c, and the declaration is >> > unconditional, so there's no definition without declaration issue. >> > >> >> The violation was on ARM code, because of a slight inconsistency: >> xen/arch/arm/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); >> >> xen/arch/x86/platform_hypercall.c:extern spinlock_t xenpf_lock; >> xen/arch/x86/platform_hypercall.c:DEFINE_SPINLOCK(xenpf_lock); >> >> therefore, by moving the extern declaration to the common header there >> should be no issue. > > Just make xenpf_lock static on arm, that would be a better solution. > The only need for the lock to be global is because of compat code, and > arm doesn't seem to need it. > > Thanks, Roger. I'll do that, thanks.
diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index b8866c20f462..8806a74b216d 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -183,9 +183,12 @@ int map_range_to_domain(const struct dt_device_node *dev, extern lpae_t boot_pgtable[XEN_PT_LPAE_ENTRIES]; #ifdef CONFIG_ARM_64 +extern lpae_t boot_first[XEN_PT_LPAE_ENTRIES]; extern lpae_t boot_first_id[XEN_PT_LPAE_ENTRIES]; #endif +extern lpae_t boot_second[XEN_PT_LPAE_ENTRIES]; extern lpae_t boot_second_id[XEN_PT_LPAE_ENTRIES]; +extern lpae_t boot_third[XEN_PT_LPAE_ENTRIES * XEN_NR_ENTRIES(2)]; extern lpae_t boot_third_id[XEN_PT_LPAE_ENTRIES]; /* Find where Xen will be residing at runtime and return a PT entry */ diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h index 4fabdf5310d8..28bf24a01d95 100644 --- a/xen/arch/arm/include/asm/smp.h +++ b/xen/arch/arm/include/asm/smp.h @@ -6,6 +6,9 @@ #include <asm/current.h> #endif +extern struct init_info init_data; +extern unsigned long smp_up_cpu; + DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 6141b7eb9cf1..e855f958030d 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1682,13 +1682,13 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) return ret; } -int mcinfo_dumpped; +static int mcinfo_dumped; static int cf_check x86_mcinfo_dump_panic(mctelem_cookie_t mctc) { struct mc_info *mcip = mctelem_dataptr(mctc); x86_mcinfo_dump(mcip); - mcinfo_dumpped++; + mcinfo_dumped++; return 0; } @@ -1702,7 +1702,7 @@ static void mc_panic_dump(void) for_each_online_cpu(cpu) mctelem_process_deferred(cpu, x86_mcinfo_dump_panic, mctelem_has_deferred_lmce(cpu)); - dprintk(XENLOG_ERR, "End dump mc_info, %x mcinfo dumped\n", mcinfo_dumpped); + dprintk(XENLOG_ERR, "End dump mc_info, %x mcinfo dumped\n", mcinfo_dumped); } void mc_panic(const char *s) diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index dfdd9e555149..3c27fe915ed4 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -13,8 +13,11 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; extern unsigned long xenheap_initial_phys_start; extern uint64_t boot_tsc_stamp; +extern char cpu0_stack[STACK_SIZE]; extern void *stack_start; +extern unsigned long cr4_pv32_mask; + void early_cpu_init(void); void early_time_init(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 6abfd8162120..604dba94b052 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -43,7 +43,7 @@ int __read_mostly opt_irq_vector_map = OPT_IRQ_VECTOR_MAP_DEFAULT; static unsigned char __read_mostly irq_max_guests; integer_param("irq-max-guests", irq_max_guests); -vmask_t global_used_vector_map; +static vmask_t global_used_vector_map; struct irq_desc __read_mostly *irq_desc = NULL; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 9469de9045c7..e4dbec73d784 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -36,9 +36,6 @@ #include "cpu/mtrr/mtrr.h" #include <xsm/xsm.h> -/* Declarations for items shared with the compat mode handler. */ -extern spinlock_t xenpf_lock; - #define RESOURCE_ACCESS_MAX_ENTRIES 3 struct resource_access { unsigned int nr_done; diff --git a/xen/common/symbols.c b/xen/common/symbols.c index 691e61792506..7c3514c65f2e 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -21,23 +21,6 @@ #include <xen/guest_access.h> #include <xen/errno.h> -#ifdef SYMBOLS_ORIGIN -extern const unsigned int symbols_offsets[]; -#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) -#else -extern const unsigned long symbols_addresses[]; -#define symbols_address(n) symbols_addresses[n] -#endif -extern const unsigned int symbols_num_syms; -extern const u8 symbols_names[]; - -extern const struct symbol_offset symbols_sorted_offsets[]; - -extern const u8 symbols_token_table[]; -extern const u16 symbols_token_index[]; - -extern const unsigned int symbols_markers[]; - /* expand a compressed symbol data into the resulting uncompressed string, given the offset to where the symbol is in the compressed stream */ static unsigned int symbols_expand_symbol(unsigned int off, char *result) diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index f307dfb59760..12de5a69b5b1 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -24,6 +24,9 @@ /* Needs to be after asm/hypercall.h. */ #include <xen/hypercall-defs.h> +/* Declarations for items shared with the compat mode handler. */ +extern spinlock_t xenpf_lock; + extern long arch_do_domctl( struct xen_domctl *domctl, struct domain *d, diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h index 20bbb28ef226..92540409265e 100644 --- a/xen/include/xen/symbols.h +++ b/xen/include/xen/symbols.h @@ -33,4 +33,22 @@ struct symbol_offset { uint32_t stream; /* .. in the compressed stream.*/ uint32_t addr; /* .. and in the fixed size address array. */ }; + +#ifdef SYMBOLS_ORIGIN +extern const unsigned int symbols_offsets[]; +#define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n]) +#else +extern const unsigned long symbols_addresses[]; +#define symbols_address(n) symbols_addresses[n] +#endif +extern const unsigned int symbols_num_syms; +extern const u8 symbols_names[]; + +extern const struct symbol_offset symbols_sorted_offsets[]; + +extern const u8 symbols_token_table[]; +extern const u16 symbols_token_index[]; + +extern const unsigned int symbols_markers[]; + #endif /*_XEN_SYMBOLS_H*/
Some variables with external linkage used in C code do not have a visible declaration where they are defined. Providing such declaration also resolves violations of MISRA C:2012 Rule 8.4. Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com> --- xen/arch/arm/include/asm/setup.h | 3 +++ xen/arch/arm/include/asm/smp.h | 3 +++ xen/arch/x86/cpu/mcheck/mce.c | 6 +++--- xen/arch/x86/include/asm/setup.h | 3 +++ xen/arch/x86/irq.c | 2 +- xen/arch/x86/platform_hypercall.c | 3 --- xen/common/symbols.c | 17 ----------------- xen/include/xen/hypercall.h | 3 +++ xen/include/xen/symbols.h | 18 ++++++++++++++++++ 9 files changed, 34 insertions(+), 24 deletions(-)