[Xen-devel] [ovmf test] 147474: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147474 ovmf real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147474/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-amd64-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 
145767
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 145767

version targeted for testing:
 ovmf 1d3215fd24f47eaa4877542a59b4bbf5afc0cfe8
baseline version:
 ovmf 70911f1f4aee0366b6122f2b90d367ec0f066beb

Last test of basis   145767  2020-01-08 00:39:09 Z   47 days
Failing since145774  2020-01-08 02:50:20 Z   47 days  130 attempts
Testing same since   147395  2020-02-21 10:01:20 Z2 days2 attempts


People who touched revisions under test:
  Aaron Li 
  Albecki, Mateusz 
  Amol N Sukerkar 
  Anthony PERARD 
  Antoine Coeur 
  Ard Biesheuvel 
  Ashish Singhal 
  Bob Feng 
  Bret Barkelew 
  Brian R Haug 
  Chasel Chiu 
  Dandan Bi 
  Eric Dong 
  Fan, ZhijuX 
  Felix Polyudov 
  Guo Dong 
  GuoMinJ 
  Hao A Wu 
  Heinrich Schuchardt 
  Heng Luo 
  Jason Voelz 
  Jeff Brasen 
  Jian J Wang 
  Jiaxin Wu 
  Kinney, Michael D 
  Krzysztof Koch 
  Laszlo Ersek 
  Leif Lindholm 
  Li, Aaron 
  Liming Gao 
  Liu, Zhiguang 
  Mateusz Albecki 
  Matthew Carlson 
  Michael D Kinney 
  Michael Kubacki 
  Nicholas Armour 
  Pavana.K 
  Philippe Mathieu-Daud? 
  Philippe Mathieu-Daude 
  Philippe Mathieu-Daudé 
  Philippe Mathieu-Daudé 
  Pierre Gondois 
  Ray Ni 
  Sami Mujawar 
  Sean Brogan 
  Siyuan Fu 
  Siyuan, Fu 
  Star Zeng 
  Steven 
  Steven Shi 
  Sudipto Paul 
  Vitaly Cheptsov 
  Vitaly Cheptsov via Groups.Io 
  Wei6 Xu 
  Wu Jiaxin 
  Xu, Wei6 
  Zeng, Star 
  Zhichao Gao 
  Zhiguang Liu 
  Zhiju.Fan 

jobs:
 build-amd64-xsm  pass
 build-i386-xsm   pass
 build-amd64  pass
 build-i386   pass
 build-amd64-libvirt  pass
 build-i386-libvirt   pass
 build-amd64-pvopspass
 build-i386-pvops pass
 test-amd64-amd64-xl-qemuu-ovmf-amd64 fail
 test-amd64-i386-xl-qemuu-ovmf-amd64  fail



sg-report-flight on osstest.test-lab.xenproject.org
logs: /home/logs/logs
images: /home/logs/images

Logs, config files, etc. are available at
http://logs.test-lab.xenproject.org/osstest/logs

Explanation of these reports, and of osstest in general, is at
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README.email;hb=master
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README;hb=master

Test harness code can be found at
http://xenbits.xen.org/gitweb?p=osstest.git;a=summary


Not pushing.

(No revision log; it would be 5738 lines long.)

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [linux-4.19 test] 147470: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147470 linux-4.19 real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147470/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail REGR. vs. 
142932
 test-amd64-amd64-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 
142932
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 142932

Tests which are failing intermittently (not blocking):
 test-armhf-armhf-xl-arndale   7 xen-boot fail in 147394 pass in 147470
 test-amd64-i386-libvirt  21 leak-check/check fail in 147394 pass in 147470
 test-amd64-i386-xl-raw   22 leak-check/check   fail pass in 147394

Tests which did not succeed, but are not blocking:
 test-armhf-armhf-xl-rtds 16 guest-start/debian.repeatfail  like 142880
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop fail like 142932
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  14 saverestore-support-checkfail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-arm64-arm64-xl-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-armhf-armhf-xl-arndale  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-libvirt 13 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt 14 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stop fail never pass
 test-armhf-armhf-xl-credit1  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-xl-rtds 13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-multivcpu 13 migrate-support-checkfail  never pass
 test-armhf-armhf-xl-multivcpu 14 saverestore-support-checkfail  never pass
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-libvirt-raw 12 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt-raw 13 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  12 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  13 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stop fail never pass
 test-armhf-armhf-xl-credit2  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  14 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stop fail never pass

version 

Re: [Xen-devel] [PATCH] tools/configure: generate stubs and long-double 32-bit headers if needed

2020-02-23 Thread Christopher Clark
On Mon, Feb 10, 2020 at 8:21 AM Ian Jackson  wrote:
>
> Christopher Clark writes ("[PATCH] tools/configure: generate stubs and 
> long-double 32-bit headers if needed"):
> > The gnu/stubs-32.h and bits/long-double-32.h headers are required to
> > build hvmloader but are not always available in 64-bit build
> > environments. To avoid introducing a build requirement on 32-bit
> > multilib generate versions of them from the 64-bit equivalent header.
> >
> > This patch enables the removal of downstream patching that has been
> > carried in the Yocto/OpenEmbedded meta-virtualization layer since 2012.
>
> Thanks for this patch.  However, I'm quite doubtful about the
> approach.

Thanks for the review and recommendation for an alternative direction.

> > +echo '#include ' >conf-stubs.c
> > +SIXTY_FOUR_HDR=`$CC -M conf-stubs.c | grep '/stubs-64.h$'`
> > +rm conf-stubs.c
> > +mkdir -p include/gnu
> > +cat "${SIXTY_FOUR_HDR}" | \
> > +grep -v 'stub_bdflush\|stub_getmsg\|stub_putmsg' 
> > >include/gnu/stubs-32.h
> > +echo \#define __stub___kernel_cosl >> include/gnu/stubs-32.h
> > +echo \#define __stub___kernel_sinl >> include/gnu/stubs-32.h
> > +echo \#define __stub___kernel_tanl >> include/gnu/stubs-32.h
>
> This code seems to be ad-hoc seddery which depends on the details of
> the existing header file.  That seems like it is unprincipled and
> fragile, to me.
>
> I don't understand why you wouldn't just make a small package or
> tarball or something containing the relevant headers and install
> that ?
>
> Also, don't you need a 32-bit libgcc too ?

OK, I've produced a revised proposal downstream that retires this
header file generation altogether and applies OpenEmbedded's multilib
support  to make a populated 32-bit sysroot with headers and libraries
available to build with.

The remaining challenge is that the OE build populates and makes this
32-bit sysroot available in a different directory to the primary
target architecture sysroot, so: do you have a recommendation for how
to plumb an additional CFLAG into Xen's tools/firmware build?

At the moment, I'm appending this single line:
CFLAGS += "--sysroot=/this/is/my/sysroot32"

to tools/firmware/Rules.mk but I think a dedicated top-level variable
for the purpose, plumbed through, could be more appropriate?

Christopher

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH] block: refactor duplicated macros

2020-02-23 Thread Matteo Croce
The macros PAGE_SECTORS, PAGE_SECTORS_SHIFT and SECTOR_MASK are defined
several times in different flavours across the whole tree.
Define them just once in a common header.

Signed-off-by: Matteo Croce 
---
 block/blk-lib.c  |  2 +-
 drivers/block/brd.c  |  3 ---
 drivers/block/null_blk_main.c|  4 
 drivers/block/zram/zram_drv.c|  8 
 drivers/block/zram/zram_drv.h|  2 --
 drivers/dax/super.c  |  2 +-
 drivers/md/bcache/util.h |  2 --
 drivers/md/dm-bufio.c|  6 +++---
 drivers/md/dm-integrity.c| 10 +-
 drivers/md/md.c  |  4 ++--
 drivers/md/raid1.c   |  2 +-
 drivers/mmc/core/host.c  |  3 ++-
 drivers/scsi/xen-scsifront.c |  4 ++--
 fs/iomap/buffered-io.c   |  2 +-
 fs/nfs/blocklayout/blocklayout.h |  2 --
 include/linux/blkdev.h   |  4 
 include/linux/device-mapper.h|  1 -
 17 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 5f2c429d4378..f5e705d307e0 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -260,7 +260,7 @@ static int __blkdev_issue_write_zeroes(struct block_device 
*bdev,
  */
 static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects)
 {
-   sector_t pages = DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SIZE / 512);
+   sector_t pages = DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SECTORS);
 
return min(pages, (sector_t)BIO_MAX_PAGES);
 }
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 220c5e18aba0..33e2cbe11400 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -25,9 +25,6 @@
 
 #include 
 
-#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)
-#define PAGE_SECTORS   (1 << PAGE_SECTORS_SHIFT)
-
 /*
  * Each block ramdisk device has a radix_tree brd_pages of pages that stores
  * the pages containing the block device's contents. A brd page's ->index is
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 16510795e377..c42af6cf0b97 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -11,10 +11,6 @@
 #include 
 #include "null_blk.h"
 
-#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)
-#define PAGE_SECTORS   (1 << PAGE_SECTORS_SHIFT)
-#define SECTOR_MASK(PAGE_SECTORS - 1)
-
 #define FREE_BATCH 16
 
 #define TICKS_PER_SEC  50ULL
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 1bdb5793842b..6ee59da4a6e2 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1548,9 +1548,9 @@ static void __zram_make_request(struct zram *zram, struct 
bio *bio)
struct bio_vec bvec;
struct bvec_iter iter;
 
-   index = bio->bi_iter.bi_sector >> SECTORS_PER_PAGE_SHIFT;
+   index = bio->bi_iter.bi_sector >> PAGE_SECTORS_SHIFT;
offset = (bio->bi_iter.bi_sector &
- (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT;
+ SECTOR_MASK) << SECTOR_SHIFT;
 
switch (bio_op(bio)) {
case REQ_OP_DISCARD:
@@ -1643,8 +1643,8 @@ static int zram_rw_page(struct block_device *bdev, 
sector_t sector,
goto out;
}
 
-   index = sector >> SECTORS_PER_PAGE_SHIFT;
-   offset = (sector & (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT;
+   index = sector >> PAGE_SECTORS_SHIFT;
+   offset = (sector & SECTOR_MASK) << SECTOR_SHIFT;
 
bv.bv_page = page;
bv.bv_len = PAGE_SIZE;
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index f2fd46daa760..12309175d55e 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -21,8 +21,6 @@
 
 #include "zcomp.h"
 
-#define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)
-#define SECTORS_PER_PAGE   (1 << SECTORS_PER_PAGE_SHIFT)
 #define ZRAM_LOGICAL_BLOCK_SHIFT 12
 #define ZRAM_LOGICAL_BLOCK_SIZE(1 << ZRAM_LOGICAL_BLOCK_SHIFT)
 #define ZRAM_SECTOR_PER_LOGICAL_BLOCK  \
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 0aa4b6bc5101..7f7672f72085 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -92,7 +92,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
return false;
}
 
-   last_page = PFN_DOWN((start + sectors - 1) * 512) * PAGE_SIZE / 512;
+   last_page = PFN_DOWN((start + sectors - 1) * 512) * PAGE_SECTORS;
err = bdev_dax_pgoff(bdev, last_page, PAGE_SIZE, _end);
if (err) {
pr_debug("%s: error: unaligned partition for dax\n",
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
index c029f7443190..55196e0f37c3 100644
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@ -15,8 +15,6 @@
 
 #include "closure.h"
 
-#define PAGE_SECTORS   (PAGE_SIZE / 512)
-
 struct closure;
 
 #ifdef CONFIG_BCACHE_DEBUG
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 

[Xen-devel] [linux-4.14 bisection] complete test-armhf-armhf-libvirt-raw

2020-02-23 Thread osstest service owner
branch xen-unstable
xenbranch xen-unstable
job test-armhf-armhf-libvirt-raw
testid xen-boot

Tree: libvirt git://xenbits.xen.org/libvirt.git
Tree: libvirt_gnulib https://git.savannah.gnu.org/git/gnulib.git/
Tree: libvirt_keycodemapdb https://gitlab.com/keycodemap/keycodemapdb.git
Tree: linux 
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
Tree: linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git
Tree: ovmf git://xenbits.xen.org/osstest/ovmf.git
Tree: qemuu git://xenbits.xen.org/qemu-xen.git
Tree: seabios git://xenbits.xen.org/osstest/seabios.git
Tree: xen git://xenbits.xen.org/xen.git

*** Found and reproduced problem changeset ***

  Bug is in tree:  linux 
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
  Bug introduced:  7b72dc2f100d1fe8e969d645050c8ee64b5dd301
  Bug not present: 00843344c6871cde6b8c85bf88bd2197d6eb1da6
  Last fail repro: http://logs.test-lab.xenproject.org/osstest/logs/147517/


  commit 7b72dc2f100d1fe8e969d645050c8ee64b5dd301
  Author: Marek Szyprowski 
  Date:   Thu Sep 6 17:41:35 2018 +0200
  
  ARM: dts: exynos: Disable pull control for S5M8767 PMIC
  
  [ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ]
  
  S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has
  external pull-up resistors, so disable any pull control for it in
  in controller node. This fixes support for S5M8767 interrupts and
  enables operation of wakeup from S5M8767 RTC alarm.
  
  Signed-off-by: Marek Szyprowski 
  Signed-off-by: Krzysztof Kozlowski 
  Signed-off-by: Sasha Levin 


For bisection revision-tuple graph see:
   
http://logs.test-lab.xenproject.org/osstest/results/bisect/linux-4.14/test-armhf-armhf-libvirt-raw.xen-boot.html
Revision IDs in each graph node refer, respectively, to the Trees above.


Running cs-bisection-step 
--graph-out=/home/logs/results/bisect/linux-4.14/test-armhf-armhf-libvirt-raw.xen-boot
 --summary-out=tmp/147517.bisection-summary --basis-template=142849 
--blessings=real,real-bisect linux-4.14 test-armhf-armhf-libvirt-raw xen-boot
Searching for failure / basis pass:
 147418 fail [host=arndale-westfield] / 146857 [host=cubietruck-picasso] 143911 
[host=cubietruck-braque] 143834 [host=cubietruck-braque] 143610 
[host=cubietruck-braque] 143513 [host=cubietruck-braque] 143409 
[host=cubietruck-braque] 143327 [host=cubietruck-braque] 142849 
[host=cubietruck-picasso] 142690 [host=arndale-bluewater] 142660 
[host=arndale-metrocentre] 142410 [host=cubietruck-gleizes] 142320 
[host=cubietruck-braque] 141762 [host=cubietruck-picasso] 141640 
[host=cubietruck-gleizes] 14158\
 9 [host=cubietruck-braque] 141505 [host=arndale-lakeside] 141471 
[host=arndale-metrocentre] 141442 ok.
Failure / basis pass flights: 147418 / 141442
Tree: libvirt git://xenbits.xen.org/libvirt.git
Tree: libvirt_gnulib https://git.savannah.gnu.org/git/gnulib.git/
Tree: libvirt_keycodemapdb https://gitlab.com/keycodemap/keycodemapdb.git
Tree: linux 
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
Tree: linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git
Tree: ovmf git://xenbits.xen.org/osstest/ovmf.git
Tree: qemuu git://xenbits.xen.org/qemu-xen.git
Tree: seabios git://xenbits.xen.org/osstest/seabios.git
Tree: xen git://xenbits.xen.org/xen.git
Latest a1cd25b919509be2645dbe6f952d5263e0d4e4e5 
611869be9f1083e53305446d90a2909fc89914ef 
317d3eeb963a515e15a63fa356d8ebcda7041a51 
98db2bf27b9ed2d5ed0b6c9c8a4bfcb127a19796 
c530a75c1e6a472b0eb9558310b518f0dfcd8860 
70911f1f4aee0366b6122f2b90d367ec0f066beb 
933ebad2470a169504799a1d95b8e410bd9847ef 
76551856b28d227cb0386a1ab0e774329b941f7d 
c47984aabead53918e5ba6d43cdb3f1467452739
Basis pass 7d84ce059e2c1b93948211c35ad7ae76a0f0d67a 
1f6fb368c04919243e2c70f2aa514a5f88e95309 
6280c94f306df6a20bbc100ba15a5a81af0366e6 
968722f5371ad5deee23fc20269fdc44c23014b1 
c530a75c1e6a472b0eb9558310b518f0dfcd8860 
18be724e302295164f00c955b6c407991f57b172 
cef9660618a880ced798375a0fd16a8ad80bd0f0 
43f5df79dad6738d52ea79d072de2b56eb96a91f 
1014f47c7a808e025b8920ab80bfe73a2888b3e5
Generating revisions with ./adhoc-revtuple-generator  
git://xenbits.xen.org/libvirt.git#7d84ce059e2c1b93948211c35ad7ae76a0f0d67a-a1cd25b919509be2645dbe6f952d5263e0d4e4e5
 
https://git.savannah.gnu.org/git/gnulib.git/#1f6fb368c04919243e2c70f2aa514a5f88e95309-611869be9f1083e53305446d90a2909fc89914ef
 
https://gitlab.com/keycodemap/keycodemapdb.git#6280c94f306df6a20bbc100ba15a5a81af0366e6-317d3eeb963a515e15a63fa356d8ebcda7041a51
 git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git#9687\
 22f5371ad5deee23fc20269fdc44c23014b1-98db2bf27b9ed2d5ed0b6c9c8a4bfcb127a19796 
git://xenbits.xen.org/osstest/linux-firmware.git#c530a75c1e6a472b0eb9558310b518f0dfcd8860-c530a75c1e6a472b0eb9558310b518f0dfcd8860
 

[Xen-devel] [xen-unstable test] 147458: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147458 xen-unstable real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147458/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-i386-qemut-rhel6hvm-amd 12 guest-start/redhat.repeat fail REGR. vs. 
147298
 test-armhf-armhf-xl-credit1   7 xen-boot fail REGR. vs. 147298

Regressions which are regarded as allowable (not blocking):
 test-armhf-armhf-xl-rtds 15 guest-stop   fail REGR. vs. 147298

Tests which did not succeed, but are not blocking:
 test-amd64-amd64-xl-rtds 18 guest-localmigrate/x10  fail blocked in 147298
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail like 
147298
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stopfail like 147298
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stopfail like 147298
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop fail like 147298
 test-armhf-armhf-libvirt-raw 13 saverestore-support-checkfail  like 147298
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop fail like 147298
 test-armhf-armhf-libvirt 14 saverestore-support-checkfail  like 147298
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stopfail like 147298
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stopfail like 147298
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop fail like 147298
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-arm64-arm64-xl  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-multivcpu 13 migrate-support-checkfail  never pass
 test-armhf-armhf-xl-multivcpu 14 saverestore-support-checkfail  never pass
 test-armhf-armhf-xl-credit2  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-libvirt-raw 12 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  12 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  13 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop  fail never pass

version targeted for testing:
 xen  4cdd4fa29fc24d2d898ac01988b2b10936556d72
baseline version:
 xen  c47984aabead53918e5ba6d43cdb3f1467452739

Last test of basis   147298  2020-02-19 12:16:32 Z4 days
Failing since147392  2020-02-21 09:03:04 Z2 days2 attempts
Testing same 

[Xen-devel] [libvirt test] 147477: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147477 libvirt real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147477/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 build-amd64-libvirt   6 libvirt-buildfail REGR. vs. 146182
 build-i386-libvirt6 libvirt-buildfail REGR. vs. 146182
 build-arm64-libvirt   6 libvirt-buildfail REGR. vs. 146182
 build-armhf-libvirt   6 libvirt-buildfail REGR. vs. 146182

Tests which did not succeed, but are not blocking:
 test-amd64-i386-libvirt-xsm   1 build-check(1)   blocked  n/a
 test-armhf-armhf-libvirt  1 build-check(1)   blocked  n/a
 test-amd64-i386-libvirt-pair  1 build-check(1)   blocked  n/a
 test-amd64-amd64-libvirt  1 build-check(1)   blocked  n/a
 test-arm64-arm64-libvirt-qcow2  1 build-check(1)   blocked  n/a
 test-amd64-amd64-libvirt-pair  1 build-check(1)   blocked  n/a
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 1 build-check(1) blocked n/a
 test-arm64-arm64-libvirt-xsm  1 build-check(1)   blocked  n/a
 test-amd64-amd64-libvirt-vhd  1 build-check(1)   blocked  n/a
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 1 build-check(1) blocked n/a
 test-armhf-armhf-libvirt-raw  1 build-check(1)   blocked  n/a
 test-arm64-arm64-libvirt  1 build-check(1)   blocked  n/a
 test-amd64-amd64-libvirt-xsm  1 build-check(1)   blocked  n/a
 test-amd64-i386-libvirt   1 build-check(1)   blocked  n/a

version targeted for testing:
 libvirt  f4b1c020a2c8493473bf868231cee6a952d57e6f
baseline version:
 libvirt  a1cd25b919509be2645dbe6f952d5263e0d4e4e5

Last test of basis   146182  2020-01-17 06:00:23 Z   37 days
Failing since146211  2020-01-18 04:18:52 Z   36 days   35 attempts
Testing same since   147477  2020-02-23 01:48:07 Z1 days1 attempts


People who touched revisions under test:
  Andrea Bolognani 
  Arnaud Patard 
  Boris Fiuczynski 
  Christian Ehrhardt 
  Collin Walling 
  Daniel Henrique Barboza 
  Daniel P. Berrangé 
  Dario Faggioli 
  Erik Skultety 
  Han Han 
  Jim Fehlig 
  Jiri Denemark 
  Jonathon Jongsma 
  Julio Faracco 
  Ján Tomko 
  Laine Stump 
  Marek Marczykowski-Górecki 
  Michal Privoznik 
  Nikolay Shirokovskiy 
  Pavel Hrdina 
  Pavel Mores 
  Peter Krempa 
  Richard W.M. Jones 
  Ryan Moeller 
  Sahid Orentino Ferdjaoui 
  Stefan Berger 
  Stefan Berger 
  Thomas Huth 
  Your Name 
  zhenwei pi 

jobs:
 build-amd64-xsm  pass
 build-arm64-xsm  pass
 build-i386-xsm   pass
 build-amd64  pass
 build-arm64  pass
 build-armhf  pass
 build-i386   pass
 build-amd64-libvirt  fail
 build-arm64-libvirt  fail
 build-armhf-libvirt  fail
 build-i386-libvirt   fail
 build-amd64-pvopspass
 build-arm64-pvopspass
 build-armhf-pvopspass
 build-i386-pvops pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm   blocked 
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsmblocked 
 test-amd64-amd64-libvirt-xsm blocked 
 test-arm64-arm64-libvirt-xsm blocked 
 test-amd64-i386-libvirt-xsm  blocked 
 test-amd64-amd64-libvirt blocked 
 test-arm64-arm64-libvirt blocked 
 test-armhf-armhf-libvirt blocked 
 test-amd64-i386-libvirt  blocked 
 test-amd64-amd64-libvirt-pairblocked 
 test-amd64-i386-libvirt-pair blocked 
 test-arm64-arm64-libvirt-qcow2   blocked 
 test-armhf-armhf-libvirt-raw blocked 
 test-amd64-amd64-libvirt-vhd blocked 



sg-report-flight on osstest.test-lab.xenproject.org
logs: /home/logs/logs
images: /home/logs/images

Logs, config files, etc. are available at
http://logs.test-lab.xenproject.org/osstest/logs


[Xen-devel] [PATCH v5] ns16550: Add ACPI support for ARM only

2020-02-23 Thread Wei Xu
Parse the ACPI SPCR table and initialize the 16550 compatible serial port
for ARM only. Currently we only support one UART on ARM. Some fields
which we do not care yet on ARM are ignored.

Signed-off-by: Wei Xu 
Reviewed-by: Jan Beulich 
Acked-by: Julien Grall 

---
Changes in v5:
- check the serial port address space before checking the address

Changes in v4:
- change the print when the serial port address is 0
- check the serial port address space id before initializing
- change the comment for the ignored PCIe fields

Changes in v3:
- address the code style comments from Jan
- use container_of to do cast
- list all fields we ignored
- check the console redirection is disabled or not before init the uart
- init the uart io_size and width via spcr->serial_port

Changes in v2:
- improve commit message
- remove the spcr initialization
- add comments for the uart initialization and configuration
- adjust the code style issue
- limit the code only built on ACPI and ARM
---
 xen/drivers/char/ns16550.c | 79 ++
 1 file changed, 79 insertions(+)

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index aa87c57..425e044 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -1620,6 +1620,85 @@ DT_DEVICE_START(ns16550, "NS16550 UART", DEVICE_SERIAL)
 DT_DEVICE_END

 #endif /* HAS_DEVICE_TREE */
+
+#if defined(CONFIG_ACPI) && defined(CONFIG_ARM)
+#include 
+
+static int __init ns16550_acpi_uart_init(const void *data)
+{
+struct acpi_table_header *table;
+struct acpi_table_spcr *spcr;
+acpi_status status;
+/*
+ * Same as the DT part.
+ * Only support one UART on ARM which happen to be ns16550_com[0].
+ */
+struct ns16550 *uart = _com[0];
+
+status = acpi_get_table(ACPI_SIG_SPCR, 0, );
+if ( ACPI_FAILURE(status) )
+{
+printk("ns16550: Failed to get SPCR table\n");
+return -EINVAL;
+}
+
+spcr = container_of(table, struct acpi_table_spcr, header);
+
+if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
+{
+printk("ns16550: Address space type is not mmio\n");
+return -EINVAL;
+}
+
+/*
+ * The serial port address may be 0 for example
+ * if the console redirection is disabled.
+ */
+if ( unlikely(!spcr->serial_port.address) )
+{
+printk("ns16550: Console redirection is disabled\n");
+return -EINVAL;
+}
+
+ns16550_init_common(uart);
+
+/*
+ * The baud rate is pre-configured by the firmware.
+ * And currently the ACPI part is only targeting ARM so the flow_control
+ * field and all PCI related ones which we do not care yet are ignored.
+ */
+uart->baud = BAUD_AUTO;
+uart->data_bits = 8;
+uart->parity = spcr->parity;
+uart->stop_bits = spcr->stop_bits;
+uart->io_base = spcr->serial_port.address;
+uart->io_size = spcr->serial_port.bit_width;
+uart->reg_shift = spcr->serial_port.bit_offset;
+uart->reg_width = spcr->serial_port.access_width;
+
+/* The trigger/polarity information is not available in spcr. */
+irq_set_type(spcr->interrupt, IRQ_TYPE_LEVEL_HIGH);
+uart->irq = spcr->interrupt;
+
+uart->vuart.base_addr = uart->io_base;
+uart->vuart.size = uart->io_size;
+uart->vuart.data_off = UART_THR << uart->reg_shift;
+uart->vuart.status_off = UART_LSR << uart->reg_shift;
+uart->vuart.status = UART_LSR_THRE | UART_LSR_TEMT;
+
+/* Register with generic serial driver. */
+serial_register_uart(SERHND_DTUART, _driver, uart);
+
+return 0;
+}
+
+ACPI_DEVICE_START(ans16550, "NS16550 UART", DEVICE_SERIAL)
+.class_type = ACPI_DBG2_16550_COMPATIBLE,
+.init = ns16550_acpi_uart_init,
+ACPI_DEVICE_END
+
+#endif /* CONFIG_ACPI && CONFIG_ARM */
+
 /*
  * Local variables:
  * mode: C
-- 
2.8.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH v4] ns16550: Add ACPI support for ARM only

2020-02-23 Thread Wei Xu
Hi Jan,

On 2020/2/21 23:07, Jan Beulich wrote:
> On 21.02.2020 15:57, Julien Grall wrote:
>> On 21/02/2020 14:02, Jan Beulich wrote:
>>> On 21.02.2020 03:22, Wei Xu wrote:
 --- a/xen/drivers/char/ns16550.c
 +++ b/xen/drivers/char/ns16550.c
 @@ -1620,6 +1620,85 @@ DT_DEVICE_START(ns16550, "NS16550 UART", 
 DEVICE_SERIAL)
   DT_DEVICE_END

   #endif /* HAS_DEVICE_TREE */
 +
 +#if defined(CONFIG_ACPI) && defined(CONFIG_ARM)
 +#include 
 +
 +static int __init ns16550_acpi_uart_init(const void *data)
 +{
 +struct acpi_table_header *table;
 +struct acpi_table_spcr *spcr;
 +acpi_status status;
 +/*
 + * Same as the DT part.
 + * Only support one UART on ARM which happen to be ns16550_com[0].
 + */
 +struct ns16550 *uart = _com[0];
 +
 +status = acpi_get_table(ACPI_SIG_SPCR, 0, );
 +if ( ACPI_FAILURE(status) )
 +{
 +printk("ns16550: Failed to get SPCR table\n");
 +return -EINVAL;
 +}
 +
 +spcr = container_of(table, struct acpi_table_spcr, header);
 +
 +/*
 + * The serial port address may be 0 for example
 + * if the console redirection is disabled.
 + */
 +if ( unlikely(!spcr->serial_port.address) )
 +{
 +printk("ns16550: Console redirection is disabled\n");
 +return -EINVAL;
 +}
 +
 +if ( unlikely(spcr->serial_port.space_id != 
 ACPI_ADR_SPACE_SYSTEM_MEMORY) )
 +{
 +printk("ns16550: Address space type is not mmio\n");
 +return -EINVAL;
 +}
>>>
>>> The space_id field qualifies the address one, i.e. whether a value of
>>> zero can sensibly mean "disabled" depends on the address space. Hence
>>> logically the address space check should come first.
>>>
>>> This is the last thing I'd like to see changed. I won't give the
>>> patch my ack though, as I think it should be an Arm maintainer to ack
>>> it.
>>
>> Acked-by: Julien Grall 
>>
>> Although, a reviewed-by tag from you would be nice as you did most of 
>> the review for this patch.
> 
> Well, to clarify - this is one of the very few (afaict) cases where our
> R-b implying A-b (when people are entitled to ack the respective code)
> gets in the way. If this wasn't the case, I'd have given the former,
> making it clear (also later from just looking at the resulting commit)
> that the (only) ack came from an Arm person.

I will check the address space in the v5 and add your R-b.
Thanks!

Best Regards,
Wei

> 
> Jan
> 
> .
> 


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH v4] ns16550: Add ACPI support for ARM only

2020-02-23 Thread Wei Xu
Hi Julien,

On 2020/2/21 22:57, Julien Grall wrote:
> 
> 
> On 21/02/2020 14:02, Jan Beulich wrote:
>> On 21.02.2020 03:22, Wei Xu wrote:
>>> --- a/xen/drivers/char/ns16550.c
>>> +++ b/xen/drivers/char/ns16550.c
>>> @@ -1620,6 +1620,85 @@ DT_DEVICE_START(ns16550, "NS16550 UART", 
>>> DEVICE_SERIAL)
>>>   DT_DEVICE_END
>>>
>>>   #endif /* HAS_DEVICE_TREE */
>>> +
>>> +#if defined(CONFIG_ACPI) && defined(CONFIG_ARM)
>>> +#include 
>>> +
>>> +static int __init ns16550_acpi_uart_init(const void *data)
>>> +{
>>> +struct acpi_table_header *table;
>>> +struct acpi_table_spcr *spcr;
>>> +acpi_status status;
>>> +/*
>>> + * Same as the DT part.
>>> + * Only support one UART on ARM which happen to be ns16550_com[0].
>>> + */
>>> +struct ns16550 *uart = _com[0];
>>> +
>>> +status = acpi_get_table(ACPI_SIG_SPCR, 0, );
>>> +if ( ACPI_FAILURE(status) )
>>> +{
>>> +printk("ns16550: Failed to get SPCR table\n");
>>> +return -EINVAL;
>>> +}
>>> +
>>> +spcr = container_of(table, struct acpi_table_spcr, header);
>>> +
>>> +/*
>>> + * The serial port address may be 0 for example
>>> + * if the console redirection is disabled.
>>> + */
>>> +if ( unlikely(!spcr->serial_port.address) )
>>> +{
>>> +printk("ns16550: Console redirection is disabled\n");
>>> +return -EINVAL;
>>> +}
>>> +
>>> +if ( unlikely(spcr->serial_port.space_id != 
>>> ACPI_ADR_SPACE_SYSTEM_MEMORY) )
>>> +{
>>> +printk("ns16550: Address space type is not mmio\n");
>>> +return -EINVAL;
>>> +}
>>
>> The space_id field qualifies the address one, i.e. whether a value of
>> zero can sensibly mean "disabled" depends on the address space. Hence
>> logically the address space check should come first.
>>
>> This is the last thing I'd like to see changed. I won't give the
>> patch my ack though, as I think it should be an Arm maintainer to ack
>> it.
> 
> Acked-by: Julien Grall 

Thanks!

Best Regards,
Wei

> 
> Although, a reviewed-by tag from you would be nice as you did most of the 
> review for this patch.
> 
> Cheers,
> 


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [examine test] 147499: tolerable trouble: starved

2020-02-23 Thread osstest service owner
flight 147499 examine real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147499/

Failures :-/ but no regressions.

Tests which did not succeed, but are not blocking:
 examine-godello1  2 hosts-allocate   starved  n/a
 examine-chardonnay1   2 hosts-allocate   starved  n/a
 examine-chardonnay0   2 hosts-allocate   starved  n/a
 examine-rochester12 hosts-allocate   starved  n/a
 examine-fiano12 hosts-allocate   starved  n/a
 examine-pinot12 hosts-allocate   starved  n/a
 examine-godello0  2 hosts-allocate   starved  n/a
 examine-huxelrebe02 hosts-allocate   starved  n/a
 examine-arndale-metrocentre   2 hosts-allocate   starved  n/a
 examine-elbling0  2 hosts-allocate   starved  n/a
 examine-cubietruck-braque 2 hosts-allocate   starved  n/a
 examine-debina0   2 hosts-allocate   starved  n/a
 examine-fiano02 hosts-allocate   starved  n/a
 examine-laxton0   2 hosts-allocate   starved  n/a
 examine-rimava1   2 hosts-allocate   starved  n/a
 examine-arndale-bluewater 2 hosts-allocate   starved  n/a
 examine-cubietruck-gleizes2 hosts-allocate   starved  n/a
 examine-huxelrebe12 hosts-allocate   starved  n/a
 examine-pinot02 hosts-allocate   starved  n/a
 examine-albana1   2 hosts-allocate   starved  n/a
 examine-rochester02 hosts-allocate   starved  n/a
 examine-arndale-westfield 2 hosts-allocate   starved  n/a
 examine-cubietruck-picasso2 hosts-allocate   starved  n/a
 examine-albana0   2 hosts-allocate   starved  n/a
 examine-elbling1  2 hosts-allocate   starved  n/a
 examine-debina1   2 hosts-allocate   starved  n/a
 examine-laxton1   2 hosts-allocate   starved  n/a
 examine-italia0   2 hosts-allocate   starved  n/a
 examine-arndale-lakeside  2 hosts-allocate   starved  n/a
 examine-cubietruck-metzinger  2 hosts-allocate   starved  n/a

baseline version:
 flight   146421

jobs:
 examine-albana0  starved 
 examine-albana1  starved 
 examine-arndale-bluewaterstarved 
 examine-cubietruck-braquestarved 
 examine-chardonnay0  starved 
 examine-chardonnay1  starved 
 examine-debina0  starved 
 examine-debina1  starved 
 examine-elbling0 starved 
 examine-elbling1 starved 
 examine-fiano0   starved 
 examine-fiano1   starved 
 examine-cubietruck-gleizes   starved 
 examine-godello0 starved 
 examine-godello1 starved 
 examine-huxelrebe0   starved 
 examine-huxelrebe1   starved 
 examine-italia0  starved 
 examine-arndale-lakeside starved 
 examine-laxton0  starved 
 examine-laxton1  starved 
 examine-arndale-metrocentre  starved 
 examine-cubietruck-metzinger starved 
 examine-cubietruck-picasso   starved 
 examine-pinot0   starved 
 examine-pinot1   starved 
 examine-rimava1  starved 
 examine-rochester0   starved 
 examine-rochester1   starved 
 examine-arndale-westfieldstarved 



sg-report-flight on osstest.test-lab.xenproject.org
logs: /home/logs/logs
images: /home/logs/images

Logs, config files, etc. are available at
http://logs.test-lab.xenproject.org/osstest/logs

Explanation of these reports, and of osstest in general, is at

[Xen-devel] [PATCH] x86/dom0_build: PVH ABI is now in pvh.markdown

2020-02-23 Thread Wei Liu
Signed-off-by: Wei Liu 
---
 xen/arch/x86/hvm/dom0_build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index 380412151b..ffbb2bd584 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -617,7 +617,7 @@ static int __init pvh_setup_cpus(struct domain *d, paddr_t 
entry,
 int rc;
 /*
  * This sets the vCPU state according to the state described in
- * docs/misc/hvmlite.markdown.
+ * docs/misc/pvh.markdown.
  */
 vcpu_hvm_context_t cpu_ctx = {
 .mode = VCPU_HVM_MODE_32B,
-- 
2.20.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [linux-5.4 test] 147442: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147442 linux-5.4 real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147442/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail REGR. vs. 
146121
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 146121
 test-amd64-amd64-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 
146121

Tests which are failing intermittently (not blocking):
 test-amd64-amd64-xl-rtds15 guest-saverestore fail in 147366 pass in 147442
 test-amd64-i386-qemut-rhel6hvm-amd 12 guest-start/redhat.repeat fail pass in 
147366
 test-armhf-armhf-xl-rtds 16 guest-start/debian.repeat  fail pass in 147366

Tests which did not succeed, but are not blocking:
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-arm64-arm64-xl-thunderx 13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stop fail never pass
 test-armhf-armhf-xl  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stop fail never pass
 test-armhf-armhf-xl-multivcpu 13 migrate-support-checkfail  never pass
 test-armhf-armhf-xl-multivcpu 14 saverestore-support-checkfail  never pass
 test-armhf-armhf-libvirt 13 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt 14 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-libvirt-raw 12 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt-raw 13 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop  fail never pass
 test-arm64-arm64-xl  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-xl-rtds 13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  12 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  13 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stop fail never pass

version targeted for testing:
 linux

[Xen-devel] [PATCH v3 01/15] cpu: Add new {add, remove}_cpu() functions

2020-02-23 Thread Qais Yousef
The new functions use device_{online,offline}() which are userspace
safe.

This is in preparation to move cpu_{up, down} kernel users to use
a safer interface that is not racy with userspace.

Suggested-by: "Paul E. McKenney" 
Signed-off-by: Qais Yousef 
CC: Thomas Gleixner 
CC: "Paul E. McKenney" 
CC: Helge Deller 
CC: Michael Ellerman 
CC: "David S. Miller" 
CC: Juergen Gross 
CC: Mark Rutland 
CC: Lorenzo Pieralisi 
CC: xen-devel@lists.xenproject.org
CC: linux-par...@vger.kernel.org
CC: sparcli...@vger.kernel.org
CC: linuxppc-...@lists.ozlabs.org
CC: linux-arm-ker...@lists.infradead.org
CC: x...@kernel.org
CC: linux-ker...@vger.kernel.org
---
 include/linux/cpu.h |  2 ++
 kernel/cpu.c| 24 
 2 files changed, 26 insertions(+)

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 1ca2baf817ed..cf8cf38dca43 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -89,6 +89,7 @@ extern ssize_t arch_cpu_release(const char *, size_t);
 #ifdef CONFIG_SMP
 extern bool cpuhp_tasks_frozen;
 int cpu_up(unsigned int cpu);
+int add_cpu(unsigned int cpu);
 void notify_cpu_starting(unsigned int cpu);
 extern void cpu_maps_update_begin(void);
 extern void cpu_maps_update_done(void);
@@ -118,6 +119,7 @@ extern void cpu_hotplug_disable(void);
 extern void cpu_hotplug_enable(void);
 void clear_tasks_mm_cpumask(int cpu);
 int cpu_down(unsigned int cpu);
+int remove_cpu(unsigned int cpu);
 
 #else /* CONFIG_HOTPLUG_CPU */
 
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 9c706af713fb..069802f7010f 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1057,6 +1057,18 @@ int cpu_down(unsigned int cpu)
 }
 EXPORT_SYMBOL(cpu_down);
 
+int remove_cpu(unsigned int cpu)
+{
+   int ret;
+
+   lock_device_hotplug();
+   ret = device_offline(get_cpu_device(cpu));
+   unlock_device_hotplug();
+
+   return ret;
+}
+EXPORT_SYMBOL_GPL(remove_cpu);
+
 #else
 #define takedown_cpu   NULL
 #endif /*CONFIG_HOTPLUG_CPU*/
@@ -1209,6 +1221,18 @@ int cpu_up(unsigned int cpu)
 }
 EXPORT_SYMBOL_GPL(cpu_up);
 
+int add_cpu(unsigned int cpu)
+{
+   int ret;
+
+   lock_device_hotplug();
+   ret = device_online(get_cpu_device(cpu));
+   unlock_device_hotplug();
+
+   return ret;
+}
+EXPORT_SYMBOL_GPL(add_cpu);
+
 #ifdef CONFIG_PM_SLEEP_SMP
 static cpumask_var_t frozen_cpus;
 
-- 
2.17.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH v3 11/15] driver: xen: Replace cpu_up/down with device_online/offline

2020-02-23 Thread Qais Yousef
The core device API performs extra housekeeping bits that are missing
from directly calling cpu_up/down.

See commit a6717c01ddc2 ("powerpc/rtas: use device model APIs and
serialization during LPM") for an example description of what might go
wrong.

This also prepares to make cpu_up/down a private interface for anything
but the cpu subsystem.

Reviewed-by: Juergen Gross 
Signed-off-by: Qais Yousef 
CC: Boris Ostrovsky 
CC: Juergen Gross 
CC: Stefano Stabellini 
CC: xen-devel@lists.xenproject.org
CC: linux-ker...@vger.kernel.org
---

Juergen, there's a new add_cpu() which you should be CCed on. I wasn't sure if
I could safely convert this to use it since I couldn't find whether the
notifier already hold the lock or not. If you think remove_cpu() is safe, let
me know and I can send an updated patch.

 drivers/xen/cpu_hotplug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index f192b6f42da9..ec975decb5de 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -94,7 +94,7 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
 
for_each_possible_cpu(cpu) {
if (vcpu_online(cpu) == 0) {
-   (void)cpu_down(cpu);
+   device_offline(get_cpu_device(cpu));
set_cpu_present(cpu, false);
}
}
-- 
2.17.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH v3 00/15] Convert cpu_up/down to device_online/offline

2020-02-23 Thread Qais Yousef
Changes in v3:
* Fixup smp_shutdown_nonboot_cpus() to hold the right lock as suggested
  by Russel King.
* Split the combined arm/arm64 patch into 2 separate patches.
* Add new add/remove_cpu() functions that wraps lock,
  device_online/offline, unlock as suggested by Paul McKenney
* Use the new add/remove instead of device_online/offline where
  appropriate
* Dropped a patch that exported device_online/offline() since
  the new add/remove_cpu() are exported and used by torture test which
  could build as a module
* Rebsed on top 5.6-rc1 from linus/master


git clone git://linux-arm.org/linux-qy.git -b cpu-hp-cleanup-v3


Older post can be found here:

https://lore.kernel.org/linuxppc-dev/20191125112754.25223-1-qais.you...@arm.com/
https://lore.kernel.org/lkml/20191125112754.25223-2-qais.you...@arm.com/


Using cpu_up/down directly to bring cpus online/offline loses synchronization
with sysfs and could suffer from a race similar to what is described in
commit a6717c01ddc2 ("powerpc/rtas: use device model APIs and serialization
during LPM").

cpu_up/down seem to be more of a internal implementation detail for the cpu
subsystem to use to boot up cpus, perform suspend/resume and low level hotplug
operations. Users outside of the cpu subsystem would be better using the device
core API to bring a cpu online/offline which is the interface used to hotplug
memory and other system devices.

Several users have already migrated to use the device core API, this series
converts the remaining users and hides cpu_up/down from internal users at the
end.

I noticed this problem while working on a hack to disable offlining
a particular CPU but noticed that setting the offline_disabled attribute in the
device struct isn't enough because users can easily bypass the device core.
While my hack isn't a valid use case but it did highlight the inconsistency in
the way cpus are being onlined/offlined and this attempt hopefully improves on
this.

The first 9 patches fix arch users.

The remaining 6 patches fix generic code users. Particularly creating a new
special exported API for the device core to use instead of cpu_up/down.

The last patch removes cpu_up/down from cpu.h and unexport the functions.

In some cases where the use of cpu_up/down seemed legitimate, I encapsulated
the logic in a higher level - special purposed function; and converted the code
to use that instead.

I did re-run the rcu torture, lock torture and psci checker tests and no
problem was noticed. I did perform build tests on all arch affected except for
parisc.

Hopefully I got the CC list right for all the patches. Apologies in advance if
some people were omitted from some patches but they should have been CCed.

CC: Armijn Hemel 
CC: Benjamin Herrenschmidt 
CC: Bjorn Helgaas 
CC: Borislav Petkov 
CC: Boris Ostrovsky 
CC: Catalin Marinas 
CC: Christophe Leroy 
CC: Daniel Lezcano 
CC: Davidlohr Bueso 
CC: "David S. Miller" 
CC: Eiichi Tsukata 
CC: Enrico Weigelt 
CC: Fenghua Yu 
CC: Greg Kroah-Hartman 
CC: Helge Deller 
CC: "H. Peter Anvin" 
CC: Ingo Molnar 
CC: "James E.J. Bottomley" 
CC: James Morse 
CC: Jiri Kosina 
CC: Josh Poimboeuf 
CC: Josh Triplett 
CC: Juergen Gross 
CC: Lorenzo Pieralisi 
CC: Mark Rutland 
CC: Michael Ellerman 
CC: Nadav Amit 
CC: Nicholas Piggin 
CC: "Paul E. McKenney" 
CC: Paul Mackerras 
CC: Pavankumar Kondeti 
CC: "Peter Zijlstra (Intel)" 
CC: "Rafael J. Wysocki" 
CC: Ram Pai 
CC: Richard Fontana 
CC: Russell King 
CC: Sakari Ailus 
CC: Stefano Stabellini 
CC: Steve Capper 
CC: Thiago Jung Bauermann 
CC: Thomas Gleixner 
CC: Tony Luck 
CC: Will Deacon 
CC: Zhenzhong Duan 
CC: linux-arm-ker...@lists.infradead.org
CC: linux-i...@vger.kernel.org
CC: linux-ker...@vger.kernel.org
CC: linux-par...@vger.kernel.org
CC: linuxppc-...@lists.ozlabs.org
CC: sparcli...@vger.kernel.org
CC: x...@kernel.org
CC: xen-devel@lists.xenproject.org


Qais Yousef (15):
  cpu: Add new {add,remove}_cpu() functions
  smp: Create a new function to shutdown nonboot cpus
  ia64: Replace cpu_down with smp_shutdown_nonboot_cpus()
  arm: Don't use disable_nonboot_cpus()
  arm64: Don't use disable_nonboot_cpus()
  arm64: hibernate.c: Create a new function to handle cpu_up(sleep_cpu)
  x86: Replace cpu_up/down with add/remove_cpu
  powerpc: Replace cpu_up/down with add/remove_cpu
  sparc: Replace cpu_up/down with add/remove_cpu
  parisc: Replace cpu_up/down with add/remove_cpu
  driver: xen: Replace cpu_up/down with device_online/offline
  firmware: psci: Replace cpu_up/down with add/remove_cpu
  torture: Replace cpu_up/down with add/remove_cpu
  smp: Create a new function to bringup nonboot cpus online
  cpu: Hide cpu_up/down

 arch/arm/kernel/reboot.c |   4 +-
 arch/arm64/kernel/hibernate.c|  13 +--
 arch/arm64/kernel/process.c  |   4 +-
 arch/ia64/kernel/process.c   |   8 +-
 arch/parisc/kernel/processor.c   |  

[Xen-devel] [linux-4.4 test] 147435: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147435 linux-4.4 real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147435/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail REGR. vs. 
139698
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 139698

Tests which are failing intermittently (not blocking):
 test-amd64-amd64-xl-rtds   16 guest-localmigrate fail in 147186 pass in 147435
 test-armhf-armhf-libvirt-raw 11 guest-start  fail in 147279 pass in 147355
 test-amd64-i386-libvirt-xsm  18 guest-start/debian.repeat  fail pass in 147186
 test-armhf-armhf-xl-rtds 16 guest-start/debian.repeat  fail pass in 147279
 test-armhf-armhf-libvirt-raw 10 debian-di-install  fail pass in 147355

Regressions which are regarded as allowable (not blocking):
 test-amd64-amd64-xl-rtds 18 guest-localmigrate/x10   fail REGR. vs. 139698

Tests which did not succeed, but are not blocking:
 test-armhf-armhf-libvirt-raw 12 migrate-support-check fail in 147186 never pass
 test-armhf-armhf-libvirt-raw 13 saverestore-support-check fail in 147186 never 
pass
 test-amd64-i386-xl-qemuu-dmrestrict-amd64-dmrestrict 10 debian-hvm-install 
fail never pass
 test-amd64-amd64-xl-pvhv2-intel 12 guest-start fail never pass
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-amd64-xl-qemuu-dmrestrict-amd64-dmrestrict 10 debian-hvm-install 
fail never pass
 test-amd64-amd64-xl-pvhv2-amd 12 guest-start  fail  never pass
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-armhf-armhf-xl-arndale  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stop fail never pass
 test-armhf-armhf-xl-rtds 13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-libvirt 13 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-xl-multivcpu 13 migrate-support-checkfail  never pass
 test-armhf-armhf-xl-multivcpu 14 saverestore-support-checkfail  never pass
 test-armhf-armhf-xl-credit1  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-xl-vhd  12 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  13 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop  fail never pass
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop  fail never pass

version targeted for testing:
 linux76e5c6fd6d163f1aa63969cc982e79be1fee87a7
baseline version:
 linuxdc16a7e5f36d65b25a1b66ade14356773ed52875

Last test of basis   139698  2019-08-04 07:48:30 Z  203 days
Failing since139773  2019-08-06 16:40:26 Z  200 days  112 attempts
Testing same since   147111  2020-02-16 03:37:56 Z7 days5 attempts


1097 people touched revisions under test,
not listing them all

jobs:
 build-amd64-xsm  pass
 build-i386-xsm  

Re: [Xen-devel] [PATCH v2 0/4] xen/rcu: let rcu work better with core scheduling

2020-02-23 Thread Jürgen Groß

On 22.02.20 17:42, Igor Druzhinin wrote:

On 22/02/2020 06:05, Jürgen Groß wrote:

On 22.02.20 03:29, Igor Druzhinin wrote:

On 18/02/2020 12:21, Juergen Gross wrote:

Today the RCU handling in Xen is affecting scheduling in several ways.
It is raising sched softirqs without any real need and it requires
tasklets for rcu_barrier(), which interacts badly with core scheduling.

This small series repairs those issues.

Additionally some ASSERT()s are added for verification of sane rcu
handling. In order to avoid those triggering right away the obvious
violations are fixed.


I've done more testing of this with [1] and, unfortunately, it quite easily
deadlocks while without this series it doesn't.

Steps to repro:
- apply [1]
- take a host with considerable CPU count (~64)
- run a loop: xen-hptool smt-disable; xen-hptool smt-enable

[1] https://lists.xenproject.org/archives/html/xen-devel/2020-02/msg01383.html


Yeah, the reason for that is that rcu_barrier() is a nop in this
situation without my patch, as the then called stop_machine_run() in
rcu_barrier() will just return -EBUSY.


Are you sure that's ther reason? I always have the following stack on CPU0:

(XEN) [  120.891143] *** Dumping CPU0 host state: ***
(XEN) [  120.895909] [ Xen-4.13.0  x86_64  debug=y   Not tainted ]
(XEN) [  120.902487] CPU:0
(XEN) [  120.905269] RIP:e008:[] 
smp_send_call_function_mask+0x40/0x43
(XEN) [  120.913415] RFLAGS: 0286   CONTEXT: hypervisor
(XEN) [  120.919389] rax:    rbx: 82d0805ddb78   rcx: 
0001
(XEN) [  120.927362] rdx: 82d0805cdb00   rsi: 82d0805c7cd8   rdi: 
0007
(XEN) [  120.935341] rbp: 8300920bfbc0   rsp: 8300920bfbb8   r8:  
003b
(XEN) [  120.943310] r9:  0432   r10:    r11: 
0001
(XEN) [  120.951282] r12: 82d0805ddb78   r13: 0001   r14: 
8300920bfc18
(XEN) [  120.959251] r15: 82d0802af646   cr0: 8005003b   cr4: 
003506e0
(XEN) [  120.967223] cr3: 920b   cr2: 88820dffe7f8
(XEN) [  120.973125] fsb:    gsb: 88821e3c   gss: 

(XEN) [  120.981094] ds:    es:    fs:    gs:    ss: e010   cs: 
e008
(XEN) [  120.988548] Xen code around  
(smp_send_call_function_mask+0x40/0x43):
(XEN) [  120.997037]  85 f9 ff fb 48 83 c4 08 <5b> 5d c3 9c 58 f6 c4 02 74 02 
0f 0b 55 48 89 e5
(XEN) [  121.005442] Xen stack trace from rsp=8300920bfbb8:
(XEN) [  121.011080]8300920bfc18 8300920bfc00 82d080242c84 
82d080389845
(XEN) [  121.019145]8300920bfc18 82d0802af178  
001c1d27aff8
(XEN) [  121.027200] 8300920bfc80 82d0802af1fa 
82d080289adf
(XEN) [  121.035255]fd55   

(XEN) [  121.043320]   

(XEN) [  121.051375]003b 001c25e54bf1  
8300920bfc80
(XEN) [  121.059443]82d0805c7300 8300920bfcb0 82d080245f4d 
82d0802af4a2
(XEN) [  121.067498]82d0805c7300 83042bb24f60 82d08060f400 
8300920bfd00
(XEN) [  121.075553]82d080246781 82d0805cdb00 8300920bfd80 
82d0805c7040
(XEN) [  121.083621]82d0805cdb00 82d0805cdb00 fff9 
8300920b
(XEN) [  121.091674] 8300920bfd30 82d0802425a5 
82d0805c7040
(XEN) [  121.099739]82d0805cdb00 fff9 8300920b 
8300920bfd40
(XEN) [  121.107797]82d0802425e5 8300920bfd80 82d08022bc0f 

(XEN) [  121.115852]82d08022b600 82d0804b3888 82d0805cdb00 
82d0805cdb00
(XEN) [  121.123917]fff9 8300920bfdb0 82d0802425a5 
0003
(XEN) [  121.131975]0001 ffef 8300920b 
8300920bfdc0
(XEN) [  121.140037]82d0802425e5 8300920bfdd0 82d08022b91b 
8300920bfdf0
(XEN) [  121.148093]82d0802addb1 83042b3b 0003 
8300920bfe30
(XEN) [  121.156150]82d0802ae086 8300920bfe10 83042b7e81e0 
83042b3b
(XEN) [  121.164216]   
8300920bfe50
(XEN) [  121.172271] Xen call trace:
(XEN) [  121.175573][] R 
smp_send_call_function_mask+0x40/0x43
(XEN) [  121.183024][] F on_selected_cpus+0xa4/0xde
(XEN) [  121.189520][] F 
arch/x86/time.c#time_calibration+0x82/0x89
(XEN) [  121.197403][] F 
common/timer.c#execute_timer+0x49/0x64
(XEN) [  121.204951][] F 
common/timer.c#timer_softirq_action+0x116/0x24e
(XEN) [  121.213271][] F 
common/softirq.c#__do_softirq+0x85/0x90
(XEN) [  121.220890][] F 
process_pending_softirqs+0x35/0x37
(XEN) [  121.228086][] F 
common/rcupdate.c#rcu_process_callbacks+0x1ef/0x20d
(XEN) [  121.236758]

[Xen-devel] [linux-4.9 test] 147429: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147429 linux-4.9 real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147429/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail REGR. vs. 
142947
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install fail REGR. vs. 142947

Tests which are failing intermittently (not blocking):
 test-amd64-i386-libvirt 18 guest-start/debian.repeat fail in 147349 pass in 
147429
 test-amd64-i386-xl-xsm 20 guest-start/debian.repeat fail in 147349 pass in 
147429
 test-armhf-armhf-xl-rtds  7 xen-boot   fail pass in 147349
 test-armhf-armhf-libvirt 19 leak-check/check   fail pass in 147349

Tests which did not succeed, but are not blocking:
 test-armhf-armhf-xl-rtds13 migrate-support-check fail in 147349 never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-check fail in 147349 never pass
 test-amd64-amd64-xl-rtds 18 guest-localmigrate/x10   fail  like 142947
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stopfail like 142947
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stopfail like 142947
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop fail like 142947
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stopfail like 142947
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop fail like 142947
 test-amd64-i386-xl-qemuu-dmrestrict-amd64-dmrestrict 10 debian-hvm-install 
fail never pass
 test-amd64-amd64-xl-qemuu-dmrestrict-amd64-dmrestrict 10 debian-hvm-install 
fail never pass
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-pvhv2-intel 12 guest-start fail never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-pvhv2-amd 12 guest-start  fail  never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-armhf-armhf-xl-multivcpu 13 migrate-support-checkfail  never pass
 test-armhf-armhf-xl-multivcpu 14 saverestore-support-checkfail  never pass
 test-armhf-armhf-libvirt 13 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt 14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-xl-credit2  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit2  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-libvirt-raw 12 migrate-support-checkfail   never pass
 test-armhf-armhf-libvirt-raw 13 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-credit1  14 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-xl-arndale  13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-arndale  14 saverestore-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  12 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-vhd  13 saverestore-support-checkfail   never pass

version targeted for testing:
 linux7ce439266f602f60f05dccf964a8685e53684a9a
baseline version:
 linux364ef83db0273acc89c6ba8ae1aebee70a133056

Last test of basis   142947  2019-10-20 03:26:28 Z  126 days
Failing since143328  2019-10-29 08:51:20 Z  117 days   14 attempts
Testing same since   147105  2020-02-15 23:41:43 Z7 days5 attempts


1082 people touched revisions under test,
not listing them all

jobs:
 build-amd64-xsm  pass
 build-i386-xsm   pass
 build-amd64  pass
 build-armhf 

[Xen-devel] [xen-unstable-coverity test] 147488: all pass - PUSHED

2020-02-23 Thread osstest service owner
flight 147488 xen-unstable-coverity real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147488/

Perfect :-)
All tests in this flight passed as required
version targeted for testing:
 xen  4cdd4fa29fc24d2d898ac01988b2b10936556d72
baseline version:
 xen  c47984aabead53918e5ba6d43cdb3f1467452739

Last test of basis   147290  2020-02-19 09:18:50 Z4 days
Testing same since   147488  2020-02-23 09:18:55 Z0 days1 attempts


People who touched revisions under test:
  Andrew Cooper 
  George Dunlap 
  Hongyan Xia 
  Ian Jackson 
  Jan Beulich 
  Juergen Gross 
  Julien Grall 
  Paul Durrant 
  Roger Pau Monne 
  Roger Pau Monné 
  Sander Eikelenboom 
  Tamas K Lengyel 
  Wei Liu 
  Wei Liu 
  Wei Xu 

jobs:
 coverity-amd64   pass



sg-report-flight on osstest.test-lab.xenproject.org
logs: /home/logs/logs
images: /home/logs/images

Logs, config files, etc. are available at
http://logs.test-lab.xenproject.org/osstest/logs

Explanation of these reports, and of osstest in general, is at
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README.email;hb=master
http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README;hb=master

Test harness code can be found at
http://xenbits.xen.org/gitweb?p=osstest.git;a=summary


Pushing revision :

To xenbits.xen.org:/home/xen/git/xen.git
   c47984aabe..4cdd4fa29f  4cdd4fa29fc24d2d898ac01988b2b10936556d72 -> 
coverity-tested/smoke

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH v7 03/11] scripts: add coccinelle script to use auto propagated errp

2020-02-23 Thread Markus Armbruster
Vladimir Sementsov-Ogievskiy  writes:

> Script adds ERRP_AUTO_PROPAGATE macro invocation where appropriate and
> does corresponding changes in code (look for details in
> include/qapi/error.h)
>
> Usage example:
> spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \
>  --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff \
>  blockdev-nbd.c qemu-nbd.c {block/nbd*,nbd/*,include/block/nbd*}.[hc]
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>
> CC: Eric Blake 
> CC: Kevin Wolf 
> CC: Max Reitz 
> CC: Greg Kurz 
> CC: Stefano Stabellini 
> CC: Anthony Perard 
> CC: Paul Durrant 
> CC: Stefan Hajnoczi 
> CC: "Philippe Mathieu-Daudé" 
> CC: Laszlo Ersek 
> CC: Gerd Hoffmann 
> CC: Stefan Berger 
> CC: Markus Armbruster 
> CC: Michael Roth 
> CC: qemu-bl...@nongnu.org
> CC: xen-devel@lists.xenproject.org
>
>  include/qapi/error.h  |   3 +
>  scripts/coccinelle/auto-propagated-errp.cocci | 158 ++
>  2 files changed, 161 insertions(+)
>  create mode 100644 scripts/coccinelle/auto-propagated-errp.cocci
>
> diff --git a/include/qapi/error.h b/include/qapi/error.h
> index b9452d4806..79f8e95214 100644
> --- a/include/qapi/error.h
> +++ b/include/qapi/error.h
> @@ -141,6 +141,9 @@
>   * ...
>   * }
>   *
> + * For mass conversion use script
> + *   scripts/coccinelle/auto-propagated-errp.cocci
> + *
>   *
>   * Receive and accumulate multiple errors (first one wins):
>   * Error *err = NULL, *local_err = NULL;

Extra blank line.

> diff --git a/scripts/coccinelle/auto-propagated-errp.cocci 
> b/scripts/coccinelle/auto-propagated-errp.cocci
> new file mode 100644
> index 00..fb03c871cb
> --- /dev/null
> +++ b/scripts/coccinelle/auto-propagated-errp.cocci
> @@ -0,0 +1,158 @@
> +// Use ERRP_AUTO_PROPAGATE (see include/qapi/error.h)
> +//
> +// Copyright (c) 2020 Virtuozzo International GmbH.
> +//
> +// This program is free software; you can redistribute it and/or modify
> +// it under the terms of the GNU General Public License as published by
> +// the Free Software Foundation; either version 2 of the License, or
> +// (at your option) any later version.
> +//
> +// This program is distributed in the hope that it will be useful,
> +// but WITHOUT ANY WARRANTY; without even the implied warranty of
> +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +// GNU General Public License for more details.
> +//
> +// You should have received a copy of the GNU General Public License
> +// along with this program.  If not, see .
> +//
> +// Usage example:
> +// spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \
> +//  --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff \
> +//  blockdev-nbd.c qemu-nbd.c {block/nbd*,nbd/*,include/block/nbd*}.[hc]
> +
> +@rule0@
> +// Add invocation to errp-functions where necessary
> +// We should skip functions with "Error *const *errp"
> +// parameter, but how to do it with coccinelle?
> +// I don't know, so, I skip them by function name regex.
> +// It's safe: if we did not skip some functions with
> +// "Error *const *errp", ERRP_AUTO_PROPAGATE invocation
> +// will fail to compile, because of const violation.

Not skipping a function we should skip fails to compile.

What about skipping a function we should not skip?

> +identifier fn !~ "error_append_.*_hint";
> +identifier local_err, ERRP;

A few of our coccinelle scripts use ALL_CAPS for meta-variables.  Most
don't.  Either is fine with me.  Mixing the two styles feels a bit
confusing, though.

> +@@
> +
> + fn(..., Error **ERRP, ...)
> + {
> ++   ERRP_AUTO_PROPAGATE();
> +<+...
> +when != ERRP_AUTO_PROPAGATE();
> +(
> +error_append_hint(ERRP, ...);
> +|
> +error_prepend(ERRP, ...);
> +|
> +Error *local_err = NULL;
> +)
> +...+>
> + }

Misses error_vprepend().  Currently harmless, but as long as we commit
the script, we better make it as robust as we reasonably can.

The previous patch explains this Coccinelle script's intent:

  To achieve these goals, later patches will add invocations
  of this macro at the start of functions with either use
  error_prepend/error_append_hint (solving 1) or which use
  local_err+error_propagate to check errors, switching those
  functions to use *errp instead (solving 2 and 3).

This rule matches "use error_prepend/error_append_hint" directly.  It
appears to use presence of a local Error * variable as proxy for "use
local_err+error_propagate to check errors".  Hmm.

We obviously have such a variable when we use "local_err+error_propagate
to check errors".  But we could also have such variables without use of
error_propagate().  In fact, error.h documents such use:

 * Call a function and receive an error from it:
 * Error *err = NULL;
 * foo(arg, );
 * if (err) {
 * handle the error...
 * }

where "handle the error" frees it.

I figure such uses typically occur in functions without 

[Xen-devel] [linux-4.14 test] 147418: regressions - FAIL

2020-02-23 Thread osstest service owner
flight 147418 linux-4.14 real [real]
http://logs.test-lab.xenproject.org/osstest/logs/147418/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 test-armhf-armhf-xl-credit2   7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-xl   7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-xl-credit1   7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-xl-vhd   7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-xl-multivcpu  7 xen-bootfail REGR. vs. 142849
 test-armhf-armhf-libvirt-raw  7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-examine  8 reboot   fail REGR. vs. 142849
 test-amd64-amd64-qemuu-nested-intel 17 debian-hvm-install/l1/l2 fail REGR. vs. 
142849
 test-armhf-armhf-xl-arndale   7 xen-boot fail REGR. vs. 142849
 test-armhf-armhf-libvirt  7 xen-boot fail REGR. vs. 142849

Tests which are failing intermittently (not blocking):
 test-amd64-amd64-xl-qemut-debianhvm-amd64 15 guest-saverestore.2 fail in 
147334 pass in 147418
 test-amd64-i386-xl-qemuu-dmrestrict-amd64-dmrestrict 12 
guest-start/debianhvm.repeat fail pass in 147334
 test-amd64-i386-xl-qemuu-ovmf-amd64 10 debian-hvm-install  fail pass in 147334
 test-amd64-amd64-i386-pvgrub 10 debian-di-install  fail pass in 147334

Tests which did not succeed, but are not blocking:
 test-amd64-amd64-xl-rtds 18 guest-localmigrate/x10   fail  like 142849
 test-armhf-armhf-xl-rtds 16 guest-start/debian.repeatfail  like 142849
 test-amd64-i386-xl-pvshim12 guest-start  fail   never pass
 test-amd64-i386-libvirt-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-seattle  14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt 13 migrate-support-checkfail   never pass
 test-amd64-amd64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt  13 migrate-support-checkfail   never pass
 test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm 11 migrate-support-check 
fail never pass
 test-amd64-amd64-qemuu-nested-amd 17 debian-hvm-install/l1/l2  fail never pass
 test-arm64-arm64-xl-xsm  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-xsm  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit2  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-credit1  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 13 migrate-support-checkfail   never pass
 test-arm64-arm64-libvirt-xsm 14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl  13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl  14 saverestore-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 13 migrate-support-checkfail   never pass
 test-arm64-arm64-xl-thunderx 14 saverestore-support-checkfail   never pass
 test-amd64-amd64-libvirt-vhd 12 migrate-support-checkfail   never pass
 test-amd64-amd64-xl-qemut-win7-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-win7-amd64 17 guest-stop  fail never pass
 test-amd64-i386-xl-qemuu-win7-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemuu-ws16-amd64 17 guest-stop fail never pass
 test-amd64-amd64-xl-qemuu-win7-amd64 17 guest-stop fail never pass
 test-amd64-i386-xl-qemut-ws16-amd64 17 guest-stop  fail never pass
 test-armhf-armhf-xl-cubietruck 13 migrate-support-checkfail never pass
 test-armhf-armhf-xl-cubietruck 14 saverestore-support-checkfail never pass
 test-armhf-armhf-xl-rtds 13 migrate-support-checkfail   never pass
 test-armhf-armhf-xl-rtds 14 saverestore-support-checkfail   never pass
 test-amd64-i386-xl-qemuu-ws16-amd64 17 guest-stop  fail never pass
 test-amd64-amd64-xl-qemut-ws16-amd64 17 guest-stop fail never pass

version targeted for testing:
 linux98db2bf27b9ed2d5ed0b6c9c8a4bfcb127a19796
baseline version:
 linuxb98aebd298246df37b472c52a2ee1023256d02e3

Last test of basis   142849  2019-10-17 21:11:16 Z  128 days
Failing since143327  2019-10-29 08:49:30 Z  116 days   15 attempts
Testing same since   147094  2020-02-15 17:36:50 Z7 days5 attempts


1438 people touched revisions under test,
not listing them all

jobs:
 

[Xen-devel] [PATCH 1/1] efi: capitalize enum efi_secureboot_mode labels

2020-02-23 Thread Heinrich Schuchardt
According to the "Linux kernel coding style" labels in enums are
capitalized.

Signed-off-by: Heinrich Schuchardt 
---
The patch is applicable to the efi/next git branch.
---
 arch/x86/kernel/ima_arch.c| 14 +++---
 arch/x86/kernel/setup.c   |  4 ++--
 arch/x86/xen/efi.c| 10 +-
 drivers/firmware/efi/libstub/arm-stub.c   |  2 +-
 drivers/firmware/efi/libstub/secureboot.c | 10 +-
 drivers/firmware/efi/libstub/x86-stub.c   |  2 +-
 include/linux/efi.h   |  8 
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/arch/x86/kernel/ima_arch.c b/arch/x86/kernel/ima_arch.c
index cb6ed616a543..4205baaae450 100644
--- a/arch/x86/kernel/ima_arch.c
+++ b/arch/x86/kernel/ima_arch.c
@@ -21,7 +21,7 @@ static enum efi_secureboot_mode get_sb_mode(void)

if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE)) {
pr_info("ima: secureboot mode unknown, no efi\n");
-   return efi_secureboot_mode_unknown;
+   return EFI_SECUREBOOT_MODE_UNKNOWN;
}

/* Get variable contents into buffer */
@@ -29,12 +29,12 @@ static enum efi_secureboot_mode get_sb_mode(void)
  NULL, , );
if (status == EFI_NOT_FOUND) {
pr_info("ima: secureboot mode disabled\n");
-   return efi_secureboot_mode_disabled;
+   return EFI_SECUREBOOT_MODE_DISABLED;
}

if (status != EFI_SUCCESS) {
pr_info("ima: secureboot mode unknown\n");
-   return efi_secureboot_mode_unknown;
+   return EFI_SECUREBOOT_MODE_UNKNOWN;
}

size = sizeof(setupmode);
@@ -46,11 +46,11 @@ static enum efi_secureboot_mode get_sb_mode(void)

if (secboot == 0 || setupmode == 1) {
pr_info("ima: secureboot mode disabled\n");
-   return efi_secureboot_mode_disabled;
+   return EFI_SECUREBOOT_MODE_DISABLED;
}

pr_info("ima: secureboot mode enabled\n");
-   return efi_secureboot_mode_enabled;
+   return EFI_SECUREBOOT_MODE_ENABLED;
 }

 bool arch_ima_get_secureboot(void)
@@ -61,12 +61,12 @@ bool arch_ima_get_secureboot(void)
if (!initialized && efi_enabled(EFI_BOOT)) {
sb_mode = boot_params.secure_boot;

-   if (sb_mode == efi_secureboot_mode_unset)
+   if (sb_mode == EFI_SECUREBOOT_MODE_UNSET)
sb_mode = get_sb_mode();
initialized = true;
}

-   if (sb_mode == efi_secureboot_mode_enabled)
+   if (sb_mode == EFI_SECUREBOOT_MODE_ENABLED)
return true;
else
return false;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a74262c71484..76a7b66ef0e6 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1126,10 +1126,10 @@ void __init setup_arch(char **cmdline_p)

if (efi_enabled(EFI_BOOT)) {
switch (boot_params.secure_boot) {
-   case efi_secureboot_mode_disabled:
+   case EFI_SECUREBOOT_MODE_DISABLED:
pr_info("Secure boot disabled\n");
break;
-   case efi_secureboot_mode_enabled:
+   case EFI_SECUREBOOT_MODE_ENABLED:
pr_info("Secure boot enabled\n");
break;
default:
diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c
index 1abe455d926a..bb715e3c9474 100644
--- a/arch/x86/xen/efi.c
+++ b/arch/x86/xen/efi.c
@@ -110,7 +110,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void)
  NULL, , );

if (status == EFI_NOT_FOUND)
-   return efi_secureboot_mode_disabled;
+   return EFI_SECUREBOOT_MODE_DISABLED;

if (status != EFI_SUCCESS)
goto out_efi_err;
@@ -123,7 +123,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void)
goto out_efi_err;

if (secboot == 0 || setupmode == 1)
-   return efi_secureboot_mode_disabled;
+   return EFI_SECUREBOOT_MODE_DISABLED;

/* See if a user has put the shim into insecure mode. */
size = sizeof(moksbstate);
@@ -135,15 +135,15 @@ static enum efi_secureboot_mode 
xen_efi_get_secureboot(void)
goto secure_boot_enabled;

if (moksbstate == 1)
-   return efi_secureboot_mode_disabled;
+   return EFI_SECUREBOOT_MODE_DISABLED;

  secure_boot_enabled:
pr_info("UEFI Secure Boot is enabled.\n");
-   return efi_secureboot_mode_enabled;
+   return EFI_SECUREBOOT_MODE_ENABLED;

  out_efi_err:
pr_err("Could not determine UEFI Secure Boot status.\n");
-   return efi_secureboot_mode_unknown;
+   return EFI_SECUREBOOT_MODE_UNKNOWN;
 }

 void __init xen_efi_init(struct boot_params *boot_params)