arm32 randconfig failure

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

Hi all,

gitlab-ci spotted another randconfig build issue on arm32. To repro, use
the attached Xen config file and build with XEN_TARGET_ARCH=arm32 (you
need an appropriate cross-compiler.)  This is the error:

https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/1888385010

Also appended below for your convenience. It affects the null scheduler.
I couldn't spot anything obvious so I ran a bisection.  This is the
offending commit:

commit ab6ba8c6753fa7642de2ffc84f6decadc6c40c2c
Author: Jan Beulich <jbeulich@xxxxxxxx>
Date:   Fri Dec 10 10:25:44 2021 +0100

    perfc: conditionalize credit/credit2 counters
    
    There's no point including them when the respective scheduler isn't
    enabled in the build.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Luca Fancellu <luca.fancellu@xxxxxxx>

 xen/include/xen/perfc_defn.h | 4 ++++
 1 file changed, 4 insertions(+)


Ideas on how to fix it?

Cheers,

Stefano



In file included from /local/repos/xen-upstream/xen/include/xen/mm.h:58,
                 from 
/local/repos/xen-upstream/xen/arch/arm/include/asm/p2m.h:4,
                 from 
/local/repos/xen-upstream/xen/arch/arm/include/asm/domain.h:7,
                 from /local/repos/xen-upstream/xen/include/xen/domain.h:8,
                 from /local/repos/xen-upstream/xen/include/xen/sched.h:11,
                 from null.c:31:
null.c: In function ‘null_unit_migrate’:
/local/repos/xen-upstream/xen/include/xen/perfc.h:65:53: error: 
‘PERFC_migrate_on_runq’ undeclared (first use in this function); did you mean 
‘PERFC_migrate_running’?
   65 | #define perfc_incr(x)     (++this_cpu(perfcounters)[PERFC_ ## x])
      |                                                     ^~~~~~
/local/repos/xen-upstream/xen/include/xen/sched.h:47:46: note: in expansion of 
macro ‘perfc_incr’
   47 | #define SCHED_STAT_CRANK(_X)                (perfc_incr(_X))
      |                                              ^~~~~~~~~~
null.c:713:9: note: in expansion of macro ‘SCHED_STAT_CRANK’
  713 |         SCHED_STAT_CRANK(migrate_on_runq);
      |         ^~~~~~~~~~~~~~~~
/local/repos/xen-upstream/xen/include/xen/perfc.h:65:53: note: each undeclared 
identifier is reported only once for each function it appears in
   65 | #define perfc_incr(x)     (++this_cpu(perfcounters)[PERFC_ ## x])
      |                                                     ^~~~~~
/local/repos/xen-upstream/xen/include/xen/sched.h:47:46: note: in expansion of 
macro ‘perfc_incr’
   47 | #define SCHED_STAT_CRANK(_X)                (perfc_incr(_X))
      |                                              ^~~~~~~~~~
null.c:713:9: note: in expansion of macro ‘SCHED_STAT_CRANK’
  713 |         SCHED_STAT_CRANK(migrate_on_runq);
      |         ^~~~~~~~~~~~~~~~
/local/repos/xen-upstream/xen/include/xen/perfc.h:65:53: error: 
‘PERFC_migrated’ undeclared (first use in this function); did you mean 
‘PSCI_migrate’?
   65 | #define perfc_incr(x)     (++this_cpu(perfcounters)[PERFC_ ## x])
      |                                                     ^~~~~~
/local/repos/xen-upstream/xen/include/xen/sched.h:47:46: note: in expansion of 
macro ‘perfc_incr’
   47 | #define SCHED_STAT_CRANK(_X)                (perfc_incr(_X))
      |                                              ^~~~~~~~~~
null.c:715:5: note: in expansion of macro ‘SCHED_STAT_CRANK’
  715 |     SCHED_STAT_CRANK(migrated);
      |     ^~~~~~~~~~~~~~~~
  LD      built_in.o
make[4]: *** [/local/repos/xen-upstream/xen/Rules.mk:197: null.o] Error 1

Attachment: xen-config
Description: Text document